* data/lalr1.cc, data/yacc.c, data/glr.c, data/c.m4

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index e1671325203d9d4af503067f9187bc8096e29f9d..bc16ba1a4b6754106b7bff0b6885a5e4ad63b18a 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -577,14 +577,14 @@ do {                                              \
     YYFPRINTF Args;                            \
 } while (YYID (0))
 
     YYFPRINTF Args;                            \
 } while (YYID (0))
 

-]b4_yysymprint_generate([b4_c_ansi_function_def])[
+]b4_yy_symbol_print_generate([b4_c_ansi_function_def])[

 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                     \
 do {                                                                       \
   if (yydebug)                                                             \
     {                                                                      \
       YYFPRINTF (stderr, "%s ", Title);                                            \
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                     \
 do {                                                                       \
   if (yydebug)                                                             \
     {                                                                      \
       YYFPRINTF (stderr, "%s ", Title);                                            \

-      yysymprint (stderr,                                                  \
+      yy_symbol_print (stderr,                                             \

                  Type, Value]b4_location_if([, Location])[]b4_user_args[); \
       YYFPRINTF (stderr, "\n");                                                    \
     }                                                                      \
                  Type, Value]b4_location_if([, Location])[]b4_user_args[); \
       YYFPRINTF (stderr, "\n");                                                    \
     }                                                                      \


@@ -976,7 +976,7 @@ yydestroyGLRState (char const *yymsg, yyGLRState *yys]b4_user_formals[)
       if (yydebug)
        {
          YYFPRINTF (stderr, "%s unresolved ", yymsg);
       if (yydebug)
        {
          YYFPRINTF (stderr, "%s unresolved ", yymsg);

-         yysymprint (stderr, yystos[yys->yylrState],
+         yy_symbol_print (stderr, yystos[yys->yylrState],

                      &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[]b4_user_args[);
          YYFPRINTF (stderr, "\n");
        }
                      &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[]b4_user_args[);
          YYFPRINTF (stderr, "\n");
        }


@@ -1407,10 +1407,10 @@ yy_reduce_print (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       fprintf (stderr, "   $%d = ", yyi + 1);
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       fprintf (stderr, "   $%d = ", yyi + 1);

-      yysymprint (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                 &]b4_rhs_value(yynrhs, yyi + 1)[
-                 ]b4_location_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
-                 b4_user_args[);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+                      &]b4_rhs_value(yynrhs, yyi + 1)[
+                      ]b4_location_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
+                      b4_user_args[);

       fprintf (stderr, "\n");
     }
 }
       fprintf (stderr, "\n");
     }
 }


@@ -2444,11 +2444,6 @@ m4_if(b4_defines_flag, 0, [],
 b4_copyright([Skeleton parser for GLR parsing with Bison],
             [2002, 2003, 2004, 2005])[
 
 b4_copyright([Skeleton parser for GLR parsing with Bison],
             [2002, 2003, 2004, 2005])[
 

-/* As a special exception, when this parser skeleton is copied by
-   Bison into a Bison output file, you may use that output file
-   without restriction.  This special exception was added by the Free
-   Software Foundation for C GLR parsers in version 2.2 of Bison.  */
-

 /* C GLR parser skeleton written by Paul Hilfinger.  */
 ]
 
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 ]