* data/yacc.cc, data/glr.cc (yydestruct): Accept an additional

argument, an informative message.
Call YY_SYMBOL_PRINT.
Adjust all callers: integrate the associated YY_SYMBOL_PRINT.
* data/lalr1.cc (destruct_): Likewise.
In addition, no longer depend on b4_yysymprint_generate and
b4_yydestruct_generate to generate these functions, do it "by
hand".

diff --git a/ChangeLog b/ChangeLog
index 09e7d27c3aaea00e7102e724b43d985980fb673e..ef27121c5700e96fc4b04d304a011a71c3f53b8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-06  Akim Demaille  <akim@epita.fr>
+
+       * data/yacc.cc, data/glr.cc (yydestruct): Accept an additional
+       argument, an informative message.
+       Call YY_SYMBOL_PRINT.
+       Adjust all callers: integrate the associated YY_SYMBOL_PRINT.
+       * data/lalr1.cc (destruct_): Likewise.
+       In addition, no longer depend on b4_yysymprint_generate and
+       b4_yydestruct_generate to generate these functions, do it "by
+       hand".
+

 2004-09-03  Akim Demaille  <akim@epita.fr>
 
        * data/glr.c, data/lalr1.cc, data/yacc.c: When YYABORT was
 2004-09-03  Akim Demaille  <akim@epita.fr>
 
        * data/glr.c, data/lalr1.cc, data/yacc.c: When YYABORT was

diff --git a/data/c.m4 b/data/c.m4
index c651f62c1c012be00e1d1851ab7734b13366bc1a..1d81b54a3902c96dbfbf0315bb3aaa06debd54b6 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -352,6 +352,7 @@ m4_define([b4_yydestruct_generate],
 
 ]$1([yydestruct],
     [static void],
 
 ]$1([yydestruct],
     [static void],

+    [[const char *yymsg],    [yymsg]],

     [[int yytype],           [yytype]],
     [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
     [[YYLTYPE *yylocationp], [yylocationp]]]))[
     [[int yytype],           [yytype]],
     [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
     [[YYLTYPE *yylocationp], [yylocationp]]]))[


@@ -360,6 +361,10 @@ m4_define([b4_yydestruct_generate],
   (void) yyvaluep;
 ]b4_location_if([  (void) yylocationp;
 ])[
   (void) yyvaluep;
 ]b4_location_if([  (void) yylocationp;
 ])[

+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+

   switch (yytype)
     {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
   switch (yytype)
     {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[

diff --git a/data/glr.c b/data/glr.c
index fbbd993babf9866bec2951e5257bf7aec19dc14e..49916b06ee92379b260ab26c6594d9e497d184fc 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1698,10 +1698,8 @@ yyrecoverSyntaxError (yyGLRStack* yystack,
            while (yystack->yytops.yystates[0] != NULL)
              {
                yyGLRState *yys = yystack->yytops.yystates[0];
            while (yystack->yytops.yystates[0] != NULL)
              {
                yyGLRState *yys = yystack->yytops.yystates[0];

-               YY_SYMBOL_PRINT ("Error: popping",
-                                yystos[yys->yylrState],
-                                &yys->yysemantics.yysval, &yys->yyloc);
-               yydestruct (yystos[yys->yylrState],
+               yydestruct ("Error: popping",
+                            yystos[yys->yylrState],

                            &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
                yystack->yytops.yystates[0] = yys->yypred;
                yystack->yynextFree -= 1;
                            &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
                yystack->yytops.yystates[0] = yys->yypred;
                yystack->yynextFree -= 1;


@@ -1710,10 +1708,8 @@ yyrecoverSyntaxError (yyGLRStack* yystack,
            yyFail (yystack][]b4_lpure_args[, NULL);
          }
        if (*yytokenp != YYEMPTY)
            yyFail (yystack][]b4_lpure_args[, NULL);
          }
        if (*yytokenp != YYEMPTY)

-         {
-           YY_SYMBOL_PRINT ("Error: discarding", *yytokenp, yylvalp, yyllocp);
-           yydestruct (*yytokenp, yylvalp]b4_location_if([, yyllocp])[);
-         }
+         yydestruct ("Error: discarding",
+                      *yytokenp, yylvalp]b4_location_if([, yyllocp])[);

        YYDPRINTF ((stderr, "Reading a token: "));
        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);
        YYDPRINTF ((stderr, "Reading a token: "));
        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);


@@ -1760,10 +1756,8 @@ yyrecoverSyntaxError (yyGLRStack* yystack,
              break;
            }
        }
              break;
            }
        }

-      YY_SYMBOL_PRINT ("Error: popping",
-                      yystos[yys->yylrState],
-                      &yys->yysemantics.yysval, &yys->yyloc);
-      yydestruct (yystos[yys->yylrState],
+      yydestruct ("Error: popping",
+                 yystos[yys->yylrState],

                  &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
       yystack->yytops.yystates[0] = yys->yypred;
       yystack->yynextFree -= 1;
                  &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
       yystack->yytops.yystates[0] = yys->yypred;
       yystack->yynextFree -= 1;


@@ -1918,11 +1912,8 @@ yyrecoverSyntaxError (yyGLRStack* yystack,
  yyDone:
   /* On YYABORT, free the lookahead. */
   if (yystack.yyerrflag == 1 && yytoken != YYEMPTY)
  yyDone:
   /* On YYABORT, free the lookahead. */
   if (yystack.yyerrflag == 1 && yytoken != YYEMPTY)

-    {
-      YY_SYMBOL_PRINT ("Error: discarding lookahead",
-                       yytoken, yylvalp, yyllocp);
-      yydestruct (yytoken, yylvalp]b4_location_if([, yyllocp])[);
-    }
+    yydestruct ("Error: discarding lookahead",
+                yytoken, yylvalp]b4_location_if([, yyllocp])[);

 
   yyfreeGLRStack (&yystack);
   return yystack.yyerrflag;
 
   yyfreeGLRStack (&yystack);
   return yystack.yyerrflag;

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e13965c6466d8a927532b40412426a782a1e321e..57cabda68afadadb02402ca2182dd8e902736b30 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -115,42 +115,6 @@ m4_define([b4_cc_var_decl],
          [    $1;])
 
 
          [    $1;])
 
 

-# b4_yysymprint_generate(FUNCTION-DECLARATOR)
-# -------------------------------------------
-# Generate the "symprint_" member function.
-m4_define([b4_yysymprint_generate],
-[[/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-]void
-yy::b4_parser_class_name::symprint_ (int yytype, const SemanticType *yyvaluep, const LocationType *yylocationp)[
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-  (void) yylocationp;
-
-  cdebug_ << (yytype < ntokens_ ? "token" : "nterm")
-         << ' ' << name_[yytype] << " (";
-  switch (yytype)
-    {
-]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
-[      default:
-        break;
-    }
-  cdebug_ << ')';
-}
-]])
-
-
-# b4_cxx_destruct_def(IGNORED-ARGUMENTS)
-# --------------------------------------
-# Declare the destruct_ method.
-m4_define([b4_cxx_destruct_def],
-[void
-yy::b4_parser_class_name::destruct_ (int yytype, SemanticType *yyvaluep, LocationType *yylocationp)[]dnl
-])
-

 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()


@@ -316,8 +280,9 @@ namespace yy
 
     /* Even more tables.  */
     inline TokenNumberType translate_ (int token);
 
     /* Even more tables.  */
     inline TokenNumberType translate_ (int token);

-    inline void destruct_ (int yytype, SemanticType *yyvaluep,
-                          LocationType *yylocationp);
+    inline void destruct_ (const char *yymsg,
+                           int yytype,
+                           SemanticType *yyvaluep, LocationType *yylocationp);

 
     /* Constants.  */
     static const int eof_;
 
     /* Constants.  */
     static const int eof_;


@@ -419,9 +384,49 @@ do {                                       \
 #define YYERROR                goto yyerrorlab
 
 #if YYDEBUG
 #define YYERROR                goto yyerrorlab
 
 #if YYDEBUG

-]b4_yysymprint_generate([b4_cxx_symprint_def])[
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+void
+yy::]b4_parser_class_name[::symprint_ (int yytype,
+                         const SemanticType *yyvaluep, const LocationType *yylocationp)
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  cdebug_ << (yytype < ntokens_ ? "token" : "nterm")
+         << ' ' << name_[yytype] << " (";
+  switch (yytype)
+    {
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+[      default:
+        break;
+    }
+  cdebug_ << ')';
+}

 #endif /* ! YYDEBUG */
 #endif /* ! YYDEBUG */

-]b4_yydestruct_generate([b4_cxx_destruct_def])[
+
+void
+yy::]b4_parser_class_name[::destruct_ (const char *yymsg,
+                         int yytype, SemanticType *yyvaluep, LocationType *yylocationp)
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
+      default:
+        break;
+    }
+}

 
 int
 yy::]b4_parser_class_name[::parse ()
 
 int
 yy::]b4_parser_class_name[::parse ()


@@ -614,19 +619,15 @@ yyerrlab:
                  location_stack_.pop ();
                 if (state_stack_.height () == 1)
                   YYABORT;
                  location_stack_.pop ();
                 if (state_stack_.height () == 1)
                   YYABORT;

-                 YY_SYMBOL_PRINT ("Error: popping",
-                                  stos_[state_stack_[0]],
-                                  &semantic_stack_[0],
-                                 &location_stack_[0]);
-                 destruct_ (stos_[state_stack_[0]],
+                 destruct_ ("Error: popping",
+                            stos_[state_stack_[0]],

                             &semantic_stack_[0],
                             &location_stack_[0]);
               }
         }
       else
         {
                             &semantic_stack_[0],
                             &location_stack_[0]);
               }
         }
       else
         {

-          YY_SYMBOL_PRINT ("Error: discarding", ilooka_, &value, &location);
-          destruct_ (ilooka_, &value, &location);
+          destruct_ ("Error: discarding", ilooka_, &value, &location);

           looka_ = empty_;
         }
     }
           looka_ = empty_;
         }
     }


@@ -679,10 +680,8 @@ yyerrlab1:
       if (state_stack_.height () == 1)
        YYABORT;
 
       if (state_stack_.height () == 1)
        YYABORT;
 

-      YY_SYMBOL_PRINT ("Error: popping",
-                       stos_[state_],
-                       &semantic_stack_[0], &location_stack_[0]);
-      destruct_ (stos_[state_], &semantic_stack_[0], &location_stack_[0]);
+      destruct_ ("Error: popping",
+                 stos_[state_], &semantic_stack_[0], &location_stack_[0]);

       error_start_ = location_stack_[0].begin;
 
       state_stack_.pop ();
       error_start_ = location_stack_[0].begin;
 
       state_stack_.pop ();


@@ -715,8 +714,7 @@ yyacceptlab:
   /* Abort.  */
 yyabortlab:
   /* Free the lookahead. */
   /* Abort.  */
 yyabortlab:
   /* Free the lookahead. */

-  YY_SYMBOL_PRINT ("Error: discarding lookahead", ilooka_, &value, &location);
-  destruct_ (ilooka_, &value, &location);
+  destruct_ ("Error: discarding lookahead", ilooka_, &value, &location);

   looka_ = empty_;
   return 1;
 }
   looka_ = empty_;
   return 1;
 }

diff --git a/data/yacc.c b/data/yacc.c
index 3acb4453c50a57700a95f81e9c075f0d48fbbf55..42c7261680a01c7de2c36b63c0d87ceab8e24fcd 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1114,15 +1114,13 @@ yyerrlab:
                 YYPOPSTACK;
                 if (yyssp == yyss)
                   YYABORT;
                 YYPOPSTACK;
                 if (yyssp == yyss)
                   YYABORT;

-                YY_SYMBOL_PRINT ("Error: popping",
-                                 yystos[*yyssp], yyvsp, yylsp);
-                yydestruct (yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[);
+                yydestruct ("Error: popping",
+                             yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[);

               }
         }
       else
        {
               }
         }
       else
        {

-         YY_SYMBOL_PRINT ("Error: discarding", yytoken, &yylval, &yylloc);
-         yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[);
+         yydestruct ("Error: discarding", yytoken, &yylval]b4_location_if([, &yylloc])[);

          yychar = YYEMPTY;
 ]b4_location_if([        *++yylerrsp = yylloc;])[
        }
          yychar = YYEMPTY;
 ]b4_location_if([        *++yylerrsp = yylloc;])[
        }


@@ -1178,8 +1176,7 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-      YY_SYMBOL_PRINT ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp]b4_location_if([, yylsp])[);
+      yydestruct ("Error: popping", yystos[yystate], yyvsp]b4_location_if([, yylsp])[);

       YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
       YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);


@@ -1209,8 +1206,8 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:

-  YY_SYMBOL_PRINT ("Error: discarding lookahead", yytoken, &yylval, &yylloc);
-  yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[);
+  yydestruct ("Error: discarding lookahead",
+              yytoken, &yylval]b4_location_if([, &yylloc])[);

   yychar = YYEMPTY;
   yyresult = 1;
   goto yyreturn;
   yychar = YYEMPTY;
   yyresult = 1;
   goto yyreturn;