* data/glr.cc (YYERROR_VERBOSE, YYTOKEN_TABLE): Remove.

diff --git a/ChangeLog b/ChangeLog
index 0e17efaad142da2b331a6689d963138b68c1e4ac..c12f0903236df700bd9103f7b685a553bfe77761 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * data/glr.cc (YYERROR_VERBOSE, YYTOKEN_TABLE): Remove.
+       We don't need them in glr.cc, and glr.c defines them.
+       Defining YYERROR_VERBOSE to 0 here breaks glr.c, since glr.c
+       assumes that defining it to anything is the same as defining
+       it to 1.  Problem reported by Paolo Bonzini.
+

 2006-09-12  Paolo Bonzini  <bonzini@gnu.org>  (tiny change)
 
        * data/c.m4 (b4_null, b4_case): Define.
 2006-09-12  Paolo Bonzini  <bonzini@gnu.org>  (tiny change)
 
        * data/c.m4 (b4_null, b4_case): Define.

diff --git a/data/glr.cc b/data/glr.cc
index a3cafe8e0a05d27197e1ffb4d264d1306bc5a685..21b03f27eb126960b3c38d75dc86367ea6373812 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -244,19 +244,6 @@ namespace ]b4_namespace[
 # define YYDEBUG ]b4_debug_flag[
 #endif
 
 # define YYDEBUG ]b4_debug_flag[
 #endif
 

-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE ]b4_error_verbose_flag[
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE ]b4_token_table[
-#endif
-

 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */