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

Use #define to handle the %name-prefix.

Browse Source 
* data/glr.c, data/yacc.c: Comment changes.
* data/lalr1.cc (yylex): Use #define to select the name of yylex,
so that one can refer to yylex in the parser file, and have it
renamed, as is the case with other skeletons.
This commit is contained in:
Akim Demaille
2004-12-16 09:06:08 +00:00
parent 617a8f1227
commit c5b95ccf6b
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2004-12-16 Akim Demaille <akim@epita.fr>
Use #define to handle the %name-prefix.
* data/glr.c, data/yacc.c: Comment changes.
* data/lalr1.cc (yylex): Use #define to select the name of yylex,
so that one can refer to yylex in the parser file, and have it
renamed, as is the case with other skeletons.
2004-12-16 Akim Demaille <akim@epita.fr>
Move lalr1.cc internals into yy*.

3
data/glr.c
View File

@@ -149,8 +149,7 @@ b4_copyright([Skeleton parser for GLR parsing with Bison], [2002, 2003, 2004])
]b4_identification
m4_if(b4_prefix[], [yy], [],
[/* If NAME_PREFIX is specified substitute the variables and functions
names. */
[/* Substitute the variable and function names. */
#define yyparse b4_prefix[]parse
#define yylex b4_prefix[]lex
#define yyerror b4_prefix[]error

13
data/lalr1.cc
View File

@@ -373,8 +373,13 @@ namespace yy
@output @output_parser_name@
b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
[2002, 2003, 2004])
m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
m4_if(b4_prefix[], [yy], [],
[
// Take the name prefix into account.
#define yylex b4_prefix[]lex])
m4_if(b4_defines_flag, 0, [],
[
#include @output_header_name@])[
/* A pseudo ostream that takes yydebug_ into account. */
# define YYCDEBUG \
@@ -786,9 +791,9 @@ yy::]b4_parser_class_name[::yylex_ ()
{
YYCDEBUG << "Reading a token: ";
#if YYLSP_NEEDED
yylooka_ = ]m4_default(b4_prefix, [yy])[lex (&value, &location);
yylooka_ = yylex (&value, &location);
#else
yylooka_ = ]m4_default(b4_prefix, [yy])[lex (&value);
yylooka_ = yylex (&value);
#endif
}

3
data/yacc.c
View File

@@ -153,8 +153,7 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
]b4_identification
m4_if(b4_prefix[], [yy], [],
[/* If NAME_PREFIX is specified substitute the variables and functions
names. */
[/* Substitute the variable and function names. */
#define yyparse b4_prefix[]parse
#define yylex b4_prefix[]lex
#define yyerror b4_prefix[]error