java: fix parser tracing bug.

* NEWS (2.5): Document.
* data/lalr1.java (YYParser::YYStack::print): Don't skip top
element.
(cherry picked from commit f0e2c228a085196742250b3f394bb5ed55ac4d7c)

diff --git a/ChangeLog b/ChangeLog
index c0f22b5280a58b90899a1725d9822f3f4abaa151..db5fb25678b70472464ca527d07b2964f8344568 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-06  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       java: fix parser tracing bug.
+       * NEWS (2.5): Document.
+       * data/lalr1.java (YYParser::YYStack::print): Don't skip top
+       element.
+
 2011-03-06  Joel E. Denny  <joeldenny@joeldenny.org>
 
        java: finish fixing parser stack popping bug.

diff --git a/NEWS b/NEWS
index 144aae850c583423d5bc718e0f46891f531e72dd..ed2b23f9dd4905577b5e3770c382a7841a5eb5a7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -357,6 +357,8 @@ Bison News
 *** The top element of each of the value stack and location stack is now
     cleared when popped so that it can be garbage collected.
 
+*** Parser traces now print the top element of the stack.
+
 * Changes in version 2.4.3 (2010-08-05):
 
 ** Bison now obeys -Werror and --warnings=error for warnings about

diff --git a/data/lalr1.java b/data/lalr1.java
index 79c15f1f53c96351e2d2897d38853dcfb5be365c..7a0ace41449604f523068e99d056c7b7a14addbb 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -326,7 +326,7 @@ b4_lexer_if([[
     {
       out.print ("Stack now");
 
-      for (int i = 0; i < height; i++)
+      for (int i = 0; i <= height; i++)
         {
           out.print (' ');
           out.print (stateStack[i]);