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

style: rename b4_lex as b4_yylex

Browse Source 
For consistency with b4_yyerror_formals, etc.

* data/skeletons/bison.m4, data/skeletons/c.m4, data/skeletons/d.m4,
* data/skeletons/glr.c, data/skeletons/glr2.cc,
* data/skeletons/java.m4, data/skeletons/lalr1.cc,
* data/skeletons/lalr1.d, data/skeletons/lalr1.java,
* data/skeletons/yacc.c
(b4_lex, b4_lex_formals): Rename as...
(b4_yylex, b4_yylex_formals): these.
This commit is contained in:
Akim Demaille
2021-08-08 08:53:11 +02:00
parent 3c5f73fe51
commit b2a00ed5dd
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/skeletons/glr2.cc
View File

@@ -173,10 +173,10 @@ m4_define([b4_call_merger],
[yy0.b4_symbol($3, slot) = $2 (yy0, yy1);])],
[yy0 = $2 (yy0, yy1);])])])
# b4_lex
# ------
# b4_yylex
# --------
# Call yylex.
m4_define([b4_lex],
m4_define([b4_yylex],
[b4_token_ctor_if(
[b4_function_call([yylex],
[symbol_type], m4_ifdef([b4_lex_param], b4_lex_param))],
@@ -3102,14 +3102,14 @@ private:
#endif // YY_EXCEPTIONS
{]b4_token_ctor_if([[
typedef ]b4_namespace_ref[::]b4_parser_class[::symbol_type symbol_type;
symbol_type yylookahead = ]b4_lex[;
symbol_type yylookahead = ]b4_yylex[;
this->yytoken = yylookahead.kind ();]b4_variant_if([[
]b4_symbol_variant([this->yytoken],
[this->yylval], [move], [yylookahead.value])], [[
this->yylval = yylookahead.value;]])[]b4_locations_if([
this->yylloc = yylookahead.location;
yylookahead.kind_ = symbol_kind::S_YYEMPTY;])[]], [[
yychar = ]b4_lex[;]])[
yychar = ]b4_yylex[;]])[
}
#if YY_EXCEPTIONS
}