[trunk]: yyerror-verbose-final.patch

[Marc Autret]

Hi,

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.295
diff -u -r1.295 ChangeLog
--- ChangeLog   2001/11/23 14:56:30     1.295
+++ ChangeLog   2001/11/25 12:19:54
@@ -1,3 +1,11 @@
+2001-11-25  Marc Autret  <address@hidden>
+
+       * doc/bison.texinfo (Error Reporting): Update explainations about
+       YYERROR_VERBOSE.
+       (Table of Symbols): Likewise.
+       * tests/calc.at [_AT_DATA_CALC_Y]: Define YYERROR_VERBOSE to 1.
+       * src/bison.simple [YYERROR_VERBOSE]: Return to normal usage.
+
 2001-11-23  Akim Demaille  <address@hidden>
 
        * lib/alloca.c: Update, from fileutils.
Index: doc/bison.texinfo
===================================================================
RCS file: /cvsroot/bison/bison/doc/bison.texinfo,v
retrieving revision 1.43
diff -u -r1.43 bison.texinfo
--- doc/bison.texinfo   2001/11/12 09:36:31     1.43
+++ doc/bison.texinfo   2001/11/25 12:20:03
@@ -3740,12 +3740,11 @@
 @address@hidden"parse error"}}.
 
 @findex YYERROR_VERBOSE
-If you define the macro @code{YYERROR_VERBOSE} in the Bison declarations
-section (@pxref{Bison Declarations, ,The Bison Declarations Section}),
-then Bison provides a more verbose and specific error message string
-instead of just plain @address@hidden"parse error"}}.  It doesn't matter what
-definition you use for @code{YYERROR_VERBOSE}, just whether you define
-it.
+If you define the macro @code{YYERROR_VERBOSE} to 1 in the prologue
+section (@pxref{Prologue, , The prologue}), then Bison provides a more 
+verbose and specific error message string instead of just plain 
address@hidden@code{"parse error"}}. Whatever you do with 
@code{YYERROR_VERBOSE},
+be sure to give it a value.
 
 The parser can detect one other kind of error: stack overflow.  This
 happens when the input contains constructions that are very deeply
@@ -5292,7 +5291,7 @@
 @code{yyparse} return 1.  @xref{Error Recovery}.
 
 @item YYERROR_VERBOSE
-Macro that you define with @code{#define} in the Bison declarations
+Macro that you define to 1 with @code{#define} in the prologue
 section to request verbose, specific error message strings when
 @code{yyerror} is called.
 
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.75
diff -u -r1.75 bison.simple
--- src/bison.simple    2001/11/22 22:00:21     1.75
+++ src/bison.simple    2001/11/25 12:20:06
@@ -151,9 +151,6 @@
 
 #ifndef YYERROR_VERBOSE
 # define YYERROR_VERBOSE %%verbose
-#else
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
 #endif
 
 /* Tokens.  */
Index: tests/calc.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/calc.at,v
retrieving revision 1.12
diff -u -r1.12 calc.at
--- tests/calc.at       2001/11/19 10:27:52     1.12
+++ tests/calc.at       2001/11/25 12:20:06
@@ -258,7 +258,7 @@
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
                  [m4_bmatch([$1], [--yyerror-verbose],
-                            [[#define YYERROR_VERBOSE]])])])
+                            [[#define YYERROR_VERBOSE 1]])])])
 
 
 


-- 
Marc Autret