* data/glr.c (yyFail): Always set yyerrflag. Corrects regression

 on input.at test.

diff --git a/ChangeLog b/ChangeLog
index 35b90a04cacd0e87bccb9b338bc8f6bd7cd3f260..4c63d4ee45079456eca40c54d716182b0ce9eba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-14  Paul Hilfinger  <Hilfinger@CS.Berkeley.EDU>
+
+       * data/glr.c (yyFail): Always set yyerrflag.  Corrects regression
+       on input.at test.
+

 2002-11-14  Paul Eggert  <eggert@twinsun.com>
 
        Fix bugs reported by Nelson H. F. Beebe in
 2002-11-14  Paul Eggert  <eggert@twinsun.com>
 
        Fix bugs reported by Nelson H. F. Beebe in

diff --git a/data/glr.c b/data/glr.c
index 0bb05835e47a78805d6d81e1b477105af9fd44e9..acc30aaf89c86255e103f98f4c945c43302015b6 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -594,12 +594,12 @@ static void yyfreeGLRStack (yyGLRStack* yystack);
 static void
 yyFail (yyGLRStack* yystack]b4_pure_formals[, const char* yyformat, ...)
 {
 static void
 yyFail (yyGLRStack* yystack]b4_pure_formals[, const char* yyformat, ...)
 {

+  yystack->yyerrflag = 1;

   if (yyformat != NULL)
     {
       char yymsg[256];
       va_list yyap;
       va_start (yyap, yyformat);
   if (yyformat != NULL)
     {
       char yymsg[256];
       va_list yyap;
       va_start (yyap, yyformat);

-      yystack->yyerrflag = 1;

       vsprintf (yymsg, yyformat, yyap);
       yyerror (]b4_yyerror_args[yymsg);
     }
       vsprintf (yymsg, yyformat, yyap);
       yyerror (]b4_yyerror_args[yymsg);
     }