Output token definitions before the first part of user declarations.

diff --git a/data/glr.c b/data/glr.c
index 6824d2b..0868f02 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -136,10 +136,10 @@ b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 
-/* Copy the first part of user declarations.  */
-b4_pre_prologue
+b4_token_defines(b4_tokens)
 
-b4_token_defines(b4_tokens)[
+/* Copy the first part of user declarations.  */
+b4_pre_prologue[
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 5f1490a..2e4d47d 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -104,15 +104,14 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 /* Using locations.  */
 #define YYLSP_NEEDED b4_locations_flag
 
+b4_token_defines(b4_tokens)
+
 /* Copy the first part of user declarations.  */
 b4_pre_prologue
 
 /* Line __line__ of __file__.  */
 #line __oline__ "__ofile__"
 
-/* Tokens.  */
-b4_token_defines(b4_tokens)
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG b4_debug

diff --git a/data/yacc.c b/data/yacc.c
index aa6cdf6..31ee843 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -166,11 +166,11 @@ m4_if(b4_prefix[], [yy], [],
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 
+b4_token_defines(b4_tokens)
+
 /* Copy the first part of user declarations.  */
 b4_pre_prologue
 
-b4_token_defines(b4_tokens)
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG b4_debug