* NEWS: Add entry for recent .output file lookahead set fix.

* doc/bison.texinfo (Understanding): Remove a bogus lookahead set in
the example .output text.
* tests/regression.at (Extra lookahead sets in report): Improve wording
of comments.

diff --git a/ChangeLog b/ChangeLog
index 3aae3d6a8df12d92c0f8dd22d03b88de41688d8f..c2826cb84319f9312590b14588c64471d0ca4b9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-19  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * NEWS: Add entry for recent .output file lookahead set fix.
+       * doc/bison.texinfo (Understanding): Remove a bogus lookahead set in
+       the example .output text.
+       * tests/regression.at (Extra lookahead sets in report): Improve wording
+       of comments.
+

 2007-10-17  Wojciech Polak  <polak@gnu.org>
 
        * src/print-xml.c (print_grammar): Renamed
 2007-10-17  Wojciech Polak  <polak@gnu.org>
 
        * src/print-xml.c (print_grammar): Renamed

diff --git a/NEWS b/NEWS
index 0e4061aab57d2f191120d123592f063f89a338eb..bf260476b0253dd1cc70431f1a5680e021625695 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,15 @@ Changes in version 2.3a+ (????-??-??):
     3. For any rule used only in such states, Bison now reports the rule as
        "never reduced because of conflicts".
 
     3. For any rule used only in such states, Bison now reports the rule as
        "never reduced because of conflicts".
 

+* When instructed to generate a `.output' file including lookahead sets
+  (using `--report=lookahead', for example), Bison now prints each reduction's
+  lookahead set only next to the associated state's one item that (1) is
+  associated with the same rule as the reduction and (2) has its dot at the end
+  of its RHS.  Previously, Bison also erroneously printed the lookahead set
+  next to all of the state's other items associated with the same rule.  This
+  bug affected only the `.output' file and not the generated parser source
+  code.
+

 * The -g and --graph options now output graphs in Graphviz DOT format,
   not VCG format.
 
 * The -g and --graph options now output graphs in Graphviz DOT format,
   not VCG format.
 

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 4b49c8113370810f784ad85fe73423cd774b9aed..74feb9fbbe00122ecec3be6d7bb8d96bf6d4268d 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7387,7 +7387,7 @@ with some set of possible lookahead tokens.  When run with
 @example
 state 8
 
 @example
 state 8
 

-    exp  ->  exp . '+' exp  [$, '+', '-', '/']   (rule 1)
+    exp  ->  exp . '+' exp   (rule 1)

     exp  ->  exp '+' exp .  [$, '+', '-', '/']   (rule 1)
     exp  ->  exp . '-' exp   (rule 2)
     exp  ->  exp . '*' exp   (rule 3)
     exp  ->  exp '+' exp .  [$, '+', '-', '/']   (rule 1)
     exp  ->  exp . '-' exp   (rule 2)
     exp  ->  exp . '*' exp   (rule 3)

diff --git a/tests/regression.at b/tests/regression.at
index e0ab69355d5d150b78b794dc1a676e5d3f5a76f4..3b3272f37009eb932dbdfc539584b0324fa21609 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1149,11 +1149,12 @@ AT_CLEANUP
 
 AT_SETUP([[Extra lookahead sets in report]])
 
 
 AT_SETUP([[Extra lookahead sets in report]])
 

-# Within a single state, Bison used to print a reduction's lookahead set next
-# to all items of the associated rule.  Instead, it should only print it next
-# to the item that is of the associated rule and whose dot is at the end of the
-# RHS.  Printing it next to items whose dot is not at the end of the RHS is
-# sometimes redundant and, as in this test case, is sometimes incorrect.
+# Bison prints each reduction's lookahead set only next to the associated
+# state's one item that (1) is associated with the same rule as the reduction
+# and (2) has its dot at the end of its RHS.  Previously, Bison also
+# erroneously printed the lookahead set next to all of the state's other items
+# associated with the same rule.  This bug affected only the `.output' file and
+# not the generated parser source code.

 
 AT_DATA([[input.y]],
 [[%%
 
 AT_DATA([[input.y]],
 [[%%