* 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.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index be0a65a..c8c702a 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -133,7 +133,7 @@ namespace yy
   class location;
 }
 
-]b4_token_defines(b4_tokens)[
+]b4_token_enums(b4_tokens)[
 
 /* Copy the first part of user declarations.  */
 ]b4_pre_prologue[