Re: FYI: [MAIN] tests-yyerror-verbose.patch

[Pascal Bart]

Hello,

        IMHO, this patch is better, I don't know why Robert do this, but
that doesn't follow documentation, and that's add obsolete code.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.205
diff -u -r1.205 ChangeLog
--- ChangeLog   2001/09/01 01:20:54     1.205
+++ ChangeLog   2001/09/01 08:49:51
@@ -1,3 +1,10 @@
+2001-09-01  Pascal Bart  <address@hidden>
+
+       * src/output.c (prepare): Remove `verbose' muscle.
+       * src/macrotab.c (macro_init): Likewise.
+       * src/bison.simple [YYERROR_VERBOSE]: Delete definition.
+       (yytname): Change the condition pre-processor directive.
+
 2001-09-01  Marc Autret  <address@hidden>

        * tests/calc.at (exp): Now, YYERROR_VERBOSE need to be set
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.63
diff -u -r1.63 bison.simple
--- src/bison.simple    2001/08/31 18:30:21     1.63
+++ src/bison.simple    2001/09/01 08:49:52
@@ -124,10 +124,6 @@
 # define YYLTYPE %%ltype
 #endif

-#ifndef YYERROR_VERBOSE
-# define YYERROR_VERBOSE %%verbose
-#endif
-
 /* Tokens.  */
 %%tokendef

@@ -169,7 +165,7 @@
 };
 #endif

-#if YYDEBUG || YYERROR_VERBOSE
+#if YYDEBUG || defined (YYERROR_VERBOSE)
 /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
 static const char *const yytname[] =
 {
@@ -808,7 +804,7 @@
     {
       ++yynerrs;

-#if YYERROR_VERBOSE
+#if defined (YYERROR_VERBOSE)
       yyn = yypact[yystate];

       if (yyn > YYFLAG && yyn < YYLAST)
Index: src/macrotab.c
===================================================================
RCS file: /cvsroot/bison/bison/src/macrotab.c,v
retrieving revision 1.7
diff -u -r1.7 macrotab.c
--- src/macrotab.c      2001/08/31 18:51:06     1.7
+++ src/macrotab.c      2001/09/01 08:49:52
@@ -85,7 +85,6 @@
   macro_insert ("final", "0");
   macro_insert ("maxtok", "0");
   macro_insert ("ntbase", "0");
-  macro_insert ("verbose", "0");
   macro_insert ("prefix", "yy");

   /* No parser macros.  */
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.54
diff -u -r1.54 output.c
--- src/output.c        2001/08/31 18:51:06     1.54
+++ src/output.c        2001/09/01 08:49:52
@@ -1065,7 +1065,6 @@
   MACRO_INSERT_INT ("final", final_state);
   MACRO_INSERT_INT ("maxtok", max_user_token_number);
   MACRO_INSERT_INT ("ntbase", ntokens);
-  MACRO_INSERT_INT ("verbose", 0);

   MACRO_INSERT_INT ("nnts", nvars);
   MACRO_INSERT_INT ("nrules", nrules);

Pascal Bart (address@hidden)