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

glr: rename lex params

Browse Source 
* data/glr.c (b4_lex_param): Rename as...
(b4_lex_formals): this, for consistency.
Provide arguments a name.
(LEX): Adjust.
This commit is contained in:
Akim Demaille
2012-12-19 10:48:09 +01:00
parent ea45ade792
commit ca90437a61
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/glr.c
View File

@@ -55,13 +55,12 @@ m4_define([b4_user_formals],
[m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])]) [m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])])
# b4_lex_param # b4_lex_formals
# ------------ # --------------
# Accumule in b4_lex_param all the yylex arguments. # All the yylex formal arguments.
# Yes, this is quite ugly... m4_define([b4_lex_formals],
m4_define([b4_lex_param], m4_dquote(b4_pure_if([[[[YYSTYPE *yylvalp]], [[&yylval]]][]dnl
m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[&yylval]]][]dnl b4_locations_if([, [[YYLTYPE *yyllocp], [&yylloc]]])])dnl
b4_locations_if([, [[YYLTYPE *], [&yylloc]]])])dnl
m4_ifdef([b4_lex_param], [, ]b4_lex_param))) m4_ifdef([b4_lex_param], [, ]b4_lex_param)))
@@ -408,7 +407,9 @@ dnl We probably ought to introduce a type for confl.
]b4_yy_location_print_define[ ]b4_yy_location_print_define[
/* YYLEX -- calling `yylex' with the right arguments. */ /* YYLEX -- calling `yylex' with the right arguments. */
#define YYLEX ]b4_function_call([yylex], [int], b4_lex_param)[ #ifndef YYLEX
# define YYLEX ]b4_function_call([yylex], [int], b4_lex_formals)[
#endif
]b4_pure_if( ]b4_pure_if(
[ [