From 25f66e1a6aec208a99763911e156ea203a8a66b9 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 25 Aug 2003 08:39:34 +0000
Subject: [PATCH] * data/lalr1.cc (Parser::stack_print_, YY_STACK_PRINT): New.
 Use them.

---
 ChangeLog     |  5 +++++
 data/lalr1.cc | 42 +++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a59c0ca3..37211c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Akim Demaille  <akim@epita.fr>
+
+	* data/lalr1.cc (Parser::stack_print_, YY_STACK_PRINT): New.
+	Use them.
+
 2003-08-25  Akim Demaille  <akim@epita.fr>
 
 	* data/lalr1.cc (Parser::reduce_print_): New.
diff --git a/data/lalr1.cc b/data/lalr1.cc
index cb1274d6..d92bfd12 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -264,6 +264,7 @@ namespace yy
     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);
+    virtual void stack_print_ ();
 #endif
 
     /* Even more tables.  */
@@ -328,9 +329,15 @@ do {					\
   if (debug_)				\
     reduce_print_ (Rule);		\
 } while (0)
+# define YY_STACK_PRINT()		\
+do {					\
+  if (debug_)				\
+    stack_print_ ();			\
+} while (0)
 #else /* !YYDEBUG */
 # define YYCDEBUG    if (0) cdebug_
 # define YY_REDUCE_PRINT(Rule)
+# define YY_STACK_PRINT()
 #endif /* !YYDEBUG */
 
 #define YYACCEPT	goto yyacceptlab
@@ -497,16 +504,7 @@ b4_syncline([@oline@], [@ofile@])[
   semantic_stack_.pop (len_);
   location_stack_.pop (len_);
 
-#if YYDEBUG
-  if (debug_)
-    {
-      YYCDEBUG << "state stack now";
-      for (StateStack::ConstIterator i = state_stack_.begin ();
-	   i != state_stack_.end (); ++i)
-	YYCDEBUG << ' ' << *i;
-      YYCDEBUG << std::endl;
-    }
-#endif
+  YY_STACK_PRINT ();
 
   semantic_stack_.push (yyval);
   location_stack_.push (yyloc);
@@ -663,17 +661,7 @@ yyerrlab1:
       semantic_stack_.pop ();
       location_stack_.pop ();
       state_ = state_stack_[0];
-
-#if YYDEBUG
-      if (debug_)
-	{
-	  YYCDEBUG << "Error: state stack now";
-	  for (StateStack::ConstIterator i = state_stack_.begin ();
-	       i != state_stack_.end (); ++i)
-	    YYCDEBUG << ' ' << *i;
-	  YYCDEBUG << std::endl;
-	}
-#endif
+      YY_STACK_PRINT ();
     }
 
   if (n_ == final_)
@@ -821,6 +809,18 @@ yy::]b4_parser_class_name[::rline_[] =
   ]b4_rline[
 };
 
+/** Print the state stack from its BOTTOM up to its TOP (included).  */
+
+void
+yy::]b4_parser_class_name[::stack_print_ ()
+{
+  cdebug_ << "state stack now";
+  for (StateStack::ConstIterator i = state_stack_.begin ();
+       i != state_stack_.end (); ++i)
+    cdebug_ << ' ' << *i;
+  cdebug_ << std::endl;
+}
+
 /** Report that the YYRULE is going to be reduced.  */
 
 void
-- 
2.45.2