Output yylloc macro defn in glr.c even if locations are not being generated.

diff --git a/ChangeLog b/ChangeLog
index b424d57f9ee56e222966df4972510286720f2b75..5d7cab01e4672eb5847f4ad0e79ef56ec09ae4f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 

+       * data/glr.c (yylloc): Output this macro even if locations are not
+       being generated, as the GLR parser needs it even in that case.
+       Problem reported by Troy A. Johnson
+       <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=195946>.
+

        * configure.ac (AC_INIT): Update to 1.875e.
 
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>
        * configure.ac (AC_INIT): Update to 1.875e.
 
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/data/glr.c b/data/glr.c
index a77a98570387b8c232897547a075bf34e8fc7172..b7e5c82d9353fc93dddf77a058c624e88a8a01b0 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -158,7 +158,7 @@ m4_if(b4_prefix[], [yy], [],
 #define yychar  b4_prefix[]char
 #define yydebug b4_prefix[]debug
 #define yynerrs b4_prefix[]nerrs
 #define yychar  b4_prefix[]char
 #define yydebug b4_prefix[]debug
 #define yynerrs b4_prefix[]nerrs

-b4_location_if([#define yylloc b4_prefix[]lloc])])
+#define yylloc b4_prefix[]lloc])

 
 b4_token_defines(b4_tokens)
 
 
 b4_token_defines(b4_tokens)