* data/c.m4 (b4_token_enums): New.

(b4_token_defines): Rename as...
(b4_token_enums_defines): this.
(b4_token_defines): New, output only the #defines.
* data/yacc.c, data/glr.c: Adjust.
* data/lalr1.cc: Use b4_token_enums instead of b4_token_enums_defines.
* data/c.m4 (b4_yydestruct_generate, b4_yysymprint_generate): Define
as default values.
This commit is contained in:
Akim Demaille
2005-09-16 19:26:40 +00:00
parent 3a73c9ae44
commit cf147260d2
8 changed files with 171 additions and 105 deletions

View File

@@ -154,7 +154,7 @@ m4_if(b4_prefix[], [yy], [],
#define yynerrs b4_prefix[]nerrs
#define yylloc b4_prefix[]lloc])
b4_token_defines(b4_tokens)
b4_token_enums_defines(b4_tokens)
/* Copy the first part of user declarations. */
b4_pre_prologue[
@@ -2321,7 +2321,7 @@ m4_if(b4_defines_flag, 0, [],
b4_copyright([Skeleton parser for GLR parsing with Bison],
[2002, 2003, 2004, 2005])
b4_token_defines(b4_tokens)
b4_token_enums_defines(b4_tokens)
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
m4_ifdef([b4_stype],