From 8850be4b1ca69c2d4269f4127fda58a1e0a00447 Mon Sep 17 00:00:00 2001
From: Marc Autret <autret_m@epita.fr>
Date: Wed, 28 Nov 2001 19:54:36 +0000
Subject: [PATCH] * src/bison.simple: Fix debug. [YYERROR_VERBOSE]:
 Re-integrate as an internal macro.

---
 ChangeLog        |  5 +++++
 src/bison.simple | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1973f8f4..4480e466 100644
--- 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.
diff --git a/src/bison.simple b/src/bison.simple
index 455c9d87..872ee38b 100644
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -149,6 +149,12 @@ typedef struct yyltype
 # define YYLTYPE %%ltype
 #endif
 
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+#endif
+
+#define YYERROR_VERBOSE %%error_verbose
+
 /* Tokens.  */
 %%tokendef
 
@@ -190,7 +196,7 @@ static const short yyrline[] =
 };
 #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 @@ yyerrlab:
     {
       ++yynerrs;
 
-#if %%error_verbose
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)
@@ -862,7 +868,7 @@ yyerrlab:
 	    yyerror ("parse error; also virtual memory exhausted");
         }
       else
-#endif /* %%ERROR_VERBOSE */
+#endif /* YYERROR_VERBOSE */
         yyerror ("parse error");
     }
   goto yyerrlab1;
-- 
2.45.2