FYI [trunk]: yyerror-verbose-re-integrate.patch

[Marc Autret]

Here, I protect YYERROR_VERBOSE definition to avoid interferences.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.320
diff -u -r1.320 ChangeLog
--- ChangeLog   2001/11/28 14:59:52     1.320
+++ ChangeLog   2001/11/28 19:16:20
@@ -1,3 +1,8 @@
+2001-11-28  Marc Autret  <address@hidden>
+
+       * src/bison.simple: Fix debug.
+       [YYERROR_VERBOSE]: Re-integrate as an internal macro.
+
 2001-11-28  Akim Demaille  <address@hidden>
 
        * src/LR0.c (shifts_new): New.
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.77
diff -u -r1.77 bison.simple
--- src/bison.simple    2001/11/27 23:19:14     1.77
+++ src/bison.simple    2001/11/28 19:16:29
@@ -149,6 +149,12 @@
 # define YYLTYPE %%ltype
 #endif
 
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+#endif
+
+#define YYERROR_VERBOSE %%error_verbose
+
 /* Tokens.  */
 %%tokendef
 
@@ -190,7 +196,7 @@
 };
 #endif
 
-#if %%error_verbose
+#if YYDEBUG || YYERROR_VERBOSE
 /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
 static const char *const yytname[] =
 {
@@ -819,7 +825,7 @@
     {
       ++yynerrs;
 
-#if %%error_verbose
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)
@@ -862,7 +868,7 @@
            yyerror ("parse error; also virtual memory exhausted");
         }
       else
-#endif /* %%ERROR_VERBOSE */
+#endif /* YYERROR_VERBOSE */
         yyerror ("parse error");
     }
   goto yyerrlab1;


-- 
Marc Autret