summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny@clemson.edu>2011-03-06 22:27:28 -0500
committerJoel E. Denny <jdenny@clemson.edu>2011-03-06 23:31:21 -0500
commit02803d55cd78f1fe9516f20efd3f094e35577ddf (patch)
tree965e44c69ff0a26ebd4e96a2cf4b9eaf34848a7a
parent1a33f4f60872281c70c2aea3f8529d8660609609 (diff)
downloadbison-02803d55cd78f1fe9516f20efd3f094e35577ddf.tar.gz
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)
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--data/lalr1.java2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c0f22b52..db5fb256 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
* NEWS (2.5): Document.
* data/lalr1.java (YYParser::YYStack::pop): Fix off-by-one error
diff --git a/NEWS b/NEWS
index 144aae85..ed2b23f9 100644
--- 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 79c15f1f..7a0ace41 100644
--- 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]);