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

lalr1.cc: style changes

Browse Source 
* data/skeletons/lalr1.cc: Formatting changes.
Use more `const`, as in glr2.cc.
This commit is contained in:
Akim Demaille
2021-08-11 17:56:34 +02:00
parent c2ba260487
commit 07cdeda9f8
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
data/skeletons/lalr1.cc
View File

@@ -306,11 +306,11 @@ m4_define([b4_shared_declarations],
/// Stored state numbers (used for stacks). /// Stored state numbers (used for stacks).
typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ state_type; typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ state_type;
]b4_parse_error_bmatch( ]b4_parse_error_bmatch(
[custom], [[ [custom], [[
/// Report a syntax error /// Report a syntax error
/// \param yyctx the context in which the error occurred. /// \param yyctx the context in which the error occurred.
void report_syntax_error (const context& yyctx) const;]], void report_syntax_error (const context& yyctx) const;]],
[detailed\|verbose], [[ [detailed\|verbose], [[
/// The arguments of the error message. /// The arguments of the error message.
int yy_syntax_error_arguments_ (const context& yyctx, int yy_syntax_error_arguments_ (const context& yyctx,
symbol_kind_type yyarg[], int yyargn) const; symbol_kind_type yyarg[], int yyargn) const;
@@ -1317,16 +1317,16 @@ b4_dollar_popdef])[]dnl
yyarg[yycount++] = yysym; yyarg[yycount++] = yysym;
} }
}]], [[ }]], [[
int yyn = yypact_[+yyparser_.yystack_[0].state]; const int yyn = yypact_[+yyparser_.yystack_[0].state];
if (!yy_pact_value_is_default_ (yyn)) if (!yy_pact_value_is_default_ (yyn))
{ {
/* Start YYX at -YYN if negative to avoid negative indexes in /* Start YYX at -YYN if negative to avoid negative indexes in
YYCHECK. In other words, skip the first -YYN actions for YYCHECK. In other words, skip the first -YYN actions for
this state because they are default actions. */ this state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0; const int yyxbegin = yyn < 0 ? -yyn : 0;
// Stay within bounds of both yycheck and yytname. // Stay within bounds of both yycheck and yytname.
int yychecklim = yylast_ - yyn + 1; const int yychecklim = yylast_ - yyn + 1;
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; const int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
for (int yyx = yyxbegin; yyx < yyxend; ++yyx) for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
if (yycheck_[yyx + yyn] == yyx && yyx != ]b4_symbol(error, kind)[ if (yycheck_[yyx + yyn] == yyx && yyx != ]b4_symbol(error, kind)[
&& !yy_table_value_is_error_ (yytable_[yyx + yyn])) && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
@@ -1345,7 +1345,9 @@ b4_dollar_popdef])[]dnl
return yycount; return yycount;
} }
]])b4_lac_if([[ ]])[
]b4_lac_if([[
bool bool
]b4_parser_class[::yy_lac_check_ (symbol_kind_type yytoken) const ]b4_parser_class[::yy_lac_check_ (symbol_kind_type yytoken) const
{ {
@@ -1484,8 +1486,9 @@ b4_dollar_popdef])[]dnl
<< event << '\n'; << event << '\n';
yy_lac_established_ = false; yy_lac_established_ = false;
} }
}]])b4_parse_error_bmatch([detailed\|verbose], [[ }]])[
]b4_parse_error_bmatch([detailed\|verbose], [[
int int
]b4_parser_class[::yy_syntax_error_arguments_ (const context& yyctx, ]b4_parser_class[::yy_syntax_error_arguments_ (const context& yyctx,
symbol_kind_type yyarg[], int yyargn) const symbol_kind_type yyarg[], int yyargn) const