* src/bison.simple: Fix debug.

[YYERROR_VERBOSE]: Re-integrate as an internal macro.

diff --git a/ChangeLog b/ChangeLog
index 1973f8f47187197f83874025cb702611a1519670..4480e46628628a071a0403bd42f2970355b3decc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-28  Marc Autret  <autret_m@epita.fr>
+
+       * src/bison.simple: Fix debug.
+       [YYERROR_VERBOSE]: Re-integrate as an internal macro.
+

 2001-11-28  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.c (shifts_new): New.
 2001-11-28  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.c (shifts_new): New.

diff --git a/src/bison.simple b/src/bison.simple
index 455c9d87319eb0f4c343d4672ac0b9b9ca0c230d..872ee38b6d3c527cdfefa62626c9151075dfe32b 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -149,6 +149,12 @@ typedef struct yyltype
 # define YYLTYPE %%ltype
 #endif
 
 # define YYLTYPE %%ltype
 #endif
 

+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+#endif
+
+#define YYERROR_VERBOSE %%error_verbose
+

 /* Tokens.  */
 %%tokendef
 
 /* Tokens.  */
 %%tokendef
 


@@ -190,7 +196,7 @@ static const short yyrline[] =
 };
 #endif
 
 };
 #endif
 

-#if %%error_verbose
+#if YYDEBUG || YYERROR_VERBOSE

 /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
 static const char *const yytname[] =
 {
 /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
 static const char *const yytname[] =
 {


@@ -819,7 +825,7 @@ yyerrlab:
     {
       ++yynerrs;
 
     {
       ++yynerrs;
 

-#if %%error_verbose
+#if YYERROR_VERBOSE

       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)
       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)


@@ -862,7 +868,7 @@ yyerrlab:
            yyerror ("parse error; also virtual memory exhausted");
         }
       else
            yyerror ("parse error; also virtual memory exhausted");
         }
       else

-#endif /* %%ERROR_VERBOSE */
+#endif /* YYERROR_VERBOSE */

         yyerror ("parse error");
     }
   goto yyerrlab1;
         yyerror ("parse error");
     }
   goto yyerrlab1;