Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: c++: formatting changes

Browse Source 
* data/skeletons/variant.hh, data/skeletons/glr2.cc: Fix space before
paren issue.
This commit is contained in:
Akim Demaille
2021-08-29 16:39:27 +02:00
parent a7ded4284e
commit 075a879052
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/skeletons/glr2.cc
View File

@@ -2162,7 +2162,7 @@ b4_dollar_popdef])[]dnl
reductions on all stacks) helps prevent double destructor calls reductions on all stacks) helps prevent double destructor calls
on yylval in the event of memory exhaustion. */ on yylval in the event of memory exhaustion. */
for (state_set_index yys = create_state_set_index(0); yys.uget() < this->yystateStack.numTops(); ++yys) for (state_set_index yys = create_state_set_index (0); yys.uget () < this->yystateStack.numTops (); ++yys)
YYCHK1 (this->yyprocessOneStack (yys, yyposn]b4_locations_if([, &this->yylloc])[)); YYCHK1 (this->yyprocessOneStack (yys, yyposn]b4_locations_if([, &this->yylloc])[));
this->yystateStack.yytops.yyremoveDeletes (); this->yystateStack.yytops.yyremoveDeletes ();
if (this->yystateStack.yytops.size() == 0) if (this->yystateStack.yytops.size() == 0)
@@ -2172,7 +2172,7 @@ b4_dollar_popdef])[]dnl
this->yyFail (]b4_locations_if([&this->yylloc, ])[YY_("syntax error")); this->yyFail (]b4_locations_if([&this->yylloc, ])[YY_("syntax error"));
YYCHK1 (this->yyresolveStack ()); YYCHK1 (this->yyresolveStack ());
YYCDEBUG << "Returning to deterministic operation.\n";]b4_locations_if([[ YYCDEBUG << "Returning to deterministic operation.\n";]b4_locations_if([[
this->yyerror_range[1].getState().yyloc = this->yylloc;]])[ this->yyerror_range[1].getState ().yyloc = this->yylloc;]])[
this->yyreportSyntaxError (); this->yyreportSyntaxError ();
goto yyuser_error; goto yyuser_error;
} }
@@ -2185,12 +2185,11 @@ b4_dollar_popdef])[]dnl
yysymbol_kind_t yytoken_to_shift = this->yytoken; yysymbol_kind_t yytoken_to_shift = this->yytoken;
this->yytoken = ]b4_symbol(empty, kind)[; this->yytoken = ]b4_symbol(empty, kind)[;
yyposn += 1; yyposn += 1;
for (state_set_index yys = create_state_set_index(0); yys.uget() < this->yystateStack.numTops(); ++yys) for (state_set_index yys = create_state_set_index (0); yys.uget () < this->yystateStack.numTops (); ++yys)
{ {
const state_num yystate = this->topState(yys)->yylrState; const state_num yystate = this->topState (yys)->yylrState;
const short* yyconflicts; const short* yyconflicts;
const int yyaction const int yyaction = yygetLRActions (yystate, yytoken_to_shift, yyconflicts);
= yygetLRActions (yystate, yytoken_to_shift, yyconflicts);
/* Note that yyconflicts were handled by yyprocessOneStack. */ /* Note that yyconflicts were handled by yyprocessOneStack. */
YYCDEBUG << "On stack " << yys.get() << ", "; YYCDEBUG << "On stack " << yys.get() << ", ";
YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, this->yylval, this->yylloc); YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, this->yylval, this->yylloc);
@@ -2203,7 +2202,7 @@ b4_dollar_popdef])[]dnl
// Value type destructor. // Value type destructor.
]b4_symbol_variant([[yytoken_to_shift]], [[this->yylval]], [[template destroy]])])[ ]b4_symbol_variant([[yytoken_to_shift]], [[this->yylval]], [[template destroy]])])[
if (this->yystateStack.yytops.size() == 1) if (this->yystateStack.yytops.size () == 1)
{ {
YYCHK1 (this->yyresolveStack ()); YYCHK1 (this->yyresolveStack ());
YYCDEBUG << "Returning to deterministic operation.\n"; YYCDEBUG << "Returning to deterministic operation.\n";

12
data/skeletons/variant.hh
View File

@@ -470,18 +470,18 @@ m4_define([_b4_symbol_constructor_define],
b4_symbol_if([$1], [has_type], b4_symbol_if([$1], [has_type],
[b4_symbol([$1], [type]) v]), [b4_symbol([$1], [type]) v]),
b4_locations_if([location_type l]))[) b4_locations_if([location_type l]))[)
: super_type(]b4_join([token_type (tok)], : super_type (]b4_join([token_type (tok)],
b4_symbol_if([$1], [has_type], [std::move (v)]), b4_symbol_if([$1], [has_type], [std::move (v)]),
b4_locations_if([std::move (l)]))[) b4_locations_if([std::move (l)]))[)
#else #else
symbol_type (]b4_join( symbol_type (]b4_join(
[int tok], [int tok],
b4_symbol_if([$1], [has_type], b4_symbol_if([$1], [has_type],
[const b4_symbol([$1], [type])& v]), [const b4_symbol([$1], [type])& v]),
b4_locations_if([const location_type& l]))[) b4_locations_if([const location_type& l]))[)
: super_type(]b4_join([token_type (tok)], : super_type (]b4_join([token_type (tok)],
b4_symbol_if([$1], [has_type], [v]), b4_symbol_if([$1], [has_type], [v]),
b4_locations_if([l]))[) b4_locations_if([l]))[)
#endif #endif
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
#if !defined _MSC_VER || defined __clang__ #if !defined _MSC_VER || defined __clang__