* data/glr.c (yyreturn): Use "Cleanup:" rather than "Error:"

in yydestruct diagnostic, since it might not be an error.
Problem reported by Joel Denny near end of
<http://lists.gnu.org/archive/html/help-bison/2005-07/msg00040.html>.
* data/lalr1cc (yyerturn): Likewise.
* data/yacc.c (yyreturn): Likewise.
* tests/calc.at (_AT_CHECK_CALC_ERROR): Adjust to the above change.

diff --git a/ChangeLog b/ChangeLog
index f102faa18654a55fb3113d561b078fbd600c15b8..979942100637203872ce1bca24bc7b46452038b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2005-08-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 2005-08-21  Paul Eggert  <eggert@cs.ucla.edu>
 

+       * data/glr.c (yyreturn): Use "Cleanup:" rather than "Error:"
+       in yydestruct diagnostic, since it might not be an error.
+       Problem reported by Joel Denny near end of
+       <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00040.html>.
+       * data/lalr1cc (yyerturn): Likewise.
+       * data/yacc.c (yyreturn): Likewise.
+       * tests/calc.at (_AT_CHECK_CALC_ERROR): Adjust to the above change.
+
+       * src/files.c: Remove obsolete FIXME comment.
+
+       * data/glr.c (YY_SYMBOL_PRINT): Append a newline, for consistency
+       with the other templates, and to fix bogus run-on messages such
+       as the one reported at the end of
+       <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00040.html>.
+       All callers changed to avoid the newline.
+       (yyprocessOneStack): Output two lines rather than one, to accommodate
+       the above change.  This changes the debug output format slightly.
+

        * data/glr.c (yyresolveValue): Fix redundant parse tree problem
        reported by Joel E. Denny in
        <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00004.html>
        * data/glr.c (yyresolveValue): Fix redundant parse tree problem
        reported by Joel E. Denny in
        <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00004.html>

diff --git a/data/glr.c b/data/glr.c
index b5b22fdc7cb54fc9d4e976dd263638b632dba24a..2d1cbc421dceebf66a7ac91086634b393ce40f1a 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -2169,7 +2169,7 @@ b4_syncline([@oline@], [@ofile@])])dnl
 
  yyreturn:
   if (yytoken != YYEOF && yytoken != YYEMPTY)
 
  yyreturn:
   if (yytoken != YYEOF && yytoken != YYEMPTY)

-    yydestruct ("Error: discarding lookahead",
+    yydestruct ("Cleanup: discarding lookahead",

                 yytoken, yylvalp]b4_location_if([, yyllocp])[);
 
   /* If the stack is well-formed, pop the stack until it is empty,
                 yytoken, yylvalp]b4_location_if([, yyllocp])[);
 
   /* If the stack is well-formed, pop the stack until it is empty,


@@ -2183,7 +2183,7 @@ b4_syncline([@oline@], [@ofile@])])dnl
          {
            yyGLRState *yys = yystates[0];
 ]b4_location_if([[       yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]]
          {
            yyGLRState *yys = yystates[0];
 ]b4_location_if([[       yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]]

-)[         yydestruct ("Error: popping",
+)[         yydestruct ("Cleanup: popping",

                        yystos[yys->yylrState],
                        &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
            yystates[0] = yys->yypred;
                        yystos[yys->yylrState],
                        &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
            yystates[0] = yys->yypred;

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7eddaf90afa17a6f1ab31bbf895dc8f0b130d017..a8e570cc8a82d219cf53c630c0dd20df105aacb0 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -879,11 +879,11 @@ yyabortlab:
 
 yyreturn:
   if (yylooka_ != yyeof_ && yylooka_ != yyempty_)
 
 yyreturn:
   if (yylooka_ != yyeof_ && yylooka_ != yyempty_)

-    yydestruct_ ("Error: discarding lookahead", yyilooka_, &yylval, &yylloc);
+    yydestruct_ ("Cleanup: discarding lookahead", yyilooka_, &yylval, &yylloc);

 
   while (yystate_stack_.height () != 1)
     {
 
   while (yystate_stack_.height () != 1)
     {

-      yydestruct_ ("Error: popping",
+      yydestruct_ ("Cleanup: popping",

                   yystos_[yystate_stack_[0]],
                   &yysemantic_stack_[0],
                   &yylocation_stack_[0]);
                   yystos_[yystate_stack_[0]],
                   &yysemantic_stack_[0],
                   &yylocation_stack_[0]);

diff --git a/data/yacc.c b/data/yacc.c
index 982747d418625ac2524375150e4caebe33a5aaf3..0ba3af8806f074edda554f0594a3e004e250bfc3 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1383,11 +1383,11 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEOF && yychar != YYEMPTY)
 
 yyreturn:
   if (yychar != YYEOF && yychar != YYEMPTY)

-     yydestruct ("Error: discarding lookahead",
+     yydestruct ("Cleanup: discarding lookahead",

                 yytoken, &yylval]b4_location_if([, &yylloc])[);
   while (yyssp != yyss)
     {
                 yytoken, &yylval]b4_location_if([, &yylloc])[);
   while (yyssp != yyss)
     {

-      yydestruct ("Error: popping",
+      yydestruct ("Cleanup: popping",

                  yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[);
       YYPOPSTACK;
     }
                  yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[);
       YYPOPSTACK;
     }

diff --git a/tests/calc.at b/tests/calc.at
index 69b919643ae393657c672ab7f04c484bbf0af104..c666dfd3c61e085c56d186c7fe8cd44761471615 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -405,6 +405,7 @@ sed '/^Starting/d
 /^Reducing/d
 /^Shifting/d
 /^state/d
 /^Reducing/d
 /^Shifting/d
 /^state/d

+/^Cleanup:/d

 /^Error:/d
 /^Next/d
 /^Discarding/d
 /^Error:/d
 /^Next/d
 /^Discarding/d