* data/lalr1.cc (Parser::reduce_print_): New.

Use it.

diff --git a/ChangeLog b/ChangeLog
index 2596b4b3819c20276ce82379953c8e9f015d8074..a59c0ca370ce0b33f3d989890bfcbc2f4be246bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Akim Demaille  <akim@epita.fr>
+
+       * data/lalr1.cc (Parser::reduce_print_): New.
+       Use it.
+

 2003-08-25  Akim Demaille  <akim@epita.fr>
 
        Have lalr1.cc catch with Paul Eggert's patch to fix the infinite
 2003-08-25  Akim Demaille  <akim@epita.fr>
 
        Have lalr1.cc catch with Paul Eggert's patch to fix the infinite

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 1d7b24318d00a96430750ec97153b153ac1ed87b..cb1274d6dd1ec873e749892e9939e325f009842e 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -263,6 +263,7 @@ namespace yy
     static const ]b4_int_type_for([b4_rline])[ rline_[];
     static const ]b4_int_type_for([b4_stos])[ stos_[];
     static const ]b4_int_type_for([b4_toknum])[ token_number_[];
     static const ]b4_int_type_for([b4_rline])[ rline_[];
     static const ]b4_int_type_for([b4_stos])[ stos_[];
     static const ]b4_int_type_for([b4_toknum])[ token_number_[];

+    virtual void reduce_print_ (int yyrule);

 #endif
 
     /* Even more tables.  */
 #endif
 
     /* Even more tables.  */


@@ -322,8 +323,14 @@ m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
 /* Enable debugging if requested.  */
 #if YYDEBUG
 # define YYCDEBUG    if (debug_) cdebug_
 /* Enable debugging if requested.  */
 #if YYDEBUG
 # define YYCDEBUG    if (debug_) cdebug_

+# define YY_REDUCE_PRINT(Rule)         \
+do {                                   \
+  if (debug_)                          \
+    reduce_print_ (Rule);              \
+} while (0)

 #else /* !YYDEBUG */
 # define YYCDEBUG    if (0) cdebug_
 #else /* !YYDEBUG */
 # define YYCDEBUG    if (0) cdebug_

+# define YY_REDUCE_PRINT(Rule)

 #endif /* !YYDEBUG */
 
 #define YYACCEPT       goto yyacceptlab
 #endif /* !YYDEBUG */
 
 #define YYACCEPT       goto yyacceptlab


@@ -472,28 +479,12 @@ yy::]b4_parser_class_name[::parse ()
       yyloc = location_stack_[0];
     }
 
       yyloc = location_stack_[0];
     }
 

-#if YYDEBUG
-  if (debug_)
-    {
-      // Short files will use "unsigned char" for line numbers,
-      // in which case they will be output as character litterals
-      // by "<<".
-      unsigned yylno = rline_[n_];
-      YYCDEBUG << "Reducing via rule " << n_ - 1
-               << " (line " << yylno << "), ";
-      for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
-          0 <= rhs_[i]; ++i)
-       YYCDEBUG << name_[rhs_[i]] << ' ';
-      YYCDEBUG << "-> " << name_[r1_[n_]] << std::endl;
-    }
-#endif
-

   if (len_)
     {
       Slice< LocationType, LocationStack > slice (location_stack_, len_);
       YYLLOC_DEFAULT (yyloc, slice, len_);
     }
   if (len_)
     {
       Slice< LocationType, LocationStack > slice (location_stack_, len_);
       YYLLOC_DEFAULT (yyloc, slice, len_);
     }

-
+  YY_REDUCE_PRINT (n_);

   switch (n_)
     {
       ]b4_actions[
   switch (n_)
     {
       ]b4_actions[


@@ -715,6 +706,7 @@ yy::]b4_parser_class_name[::lex_ ()
 #endif
 }
 
 #endif
 }
 

+

 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;


@@ -828,7 +820,22 @@ yy::]b4_parser_class_name[::rline_[] =
 {
   ]b4_rline[
 };
 {
   ]b4_rline[
 };

-#endif
+
+/** Report that the YYRULE is going to be reduced.  */
+
+void
+yy::]b4_parser_class_name[::reduce_print_ (int yyrule)
+{
+  int yyi;
+  unsigned int yylno = rline_[yyrule];
+  /* Print the symbols being reduced, and their result.  */
+  cdebug_ << "Reducing via rule " << n_ - 1 << " (line " << yylno << "), ";
+  for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
+       0 <= rhs_[i]; ++i)
+    cdebug_ << name_[rhs_[i]] << ' ';
+  cdebug_ << "-> " << name_[r1_[n_]] << std::endl;
+}
+#endif // YYDEBUG

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 yy::]b4_parser_class_name[::TokenNumberType
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 yy::]b4_parser_class_name[::TokenNumberType

diff --git a/data/yacc.c b/data/yacc.c
index 92c0ddec42627308fd020cb5c8d37d7b6e777aa3..845077eb9a2f51dde35b3b2f9c651bc64c702d25 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -556,7 +556,7 @@ do {                                                                \
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |

-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |

 `------------------------------------------------------------------*/
 
 ]b4_c_function_def([yy_stack_print], [static void],
 `------------------------------------------------------------------*/
 
 ]b4_c_function_def([yy_stack_print], [static void],