* src/lalr.c (state_lookahead_tokens_count): Correct comment.

(cherry picked from commit 2de160e12ea0b0313a3a4f2120b30a3eeaad0c76)

diff --git a/ChangeLog b/ChangeLog
index e6388ea10d7b22639c978a760cb154fe07809710..01870f6d6b952734bbe10ca9916134e3a304c2c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-24  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * src/lalr.c (state_lookahead_tokens_count): Correct comment.
+

 2009-07-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Some M4 cleanup in the testsuite.
 2009-07-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Some M4 cleanup in the testsuite.

diff --git a/src/lalr.c b/src/lalr.c
index 26030866e407ac18e2da381cfb9523ff468fcd9b..fbd2800f0529905c30cd990bf30480c1e1fb75ed 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -344,10 +344,11 @@ state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept)
   /* We need a lookahead either to distinguish different reductions
      (i.e., there are two or more), or to distinguish a reduction from a
      shift.  Otherwise, it is straightforward, and the state is
   /* We need a lookahead either to distinguish different reductions
      (i.e., there are two or more), or to distinguish a reduction from a
      shift.  Otherwise, it is straightforward, and the state is

-     `consistent'.  However, treat only the accepting state as
-     consistent (because there is never a lookahead token that makes
-     sense there, and so no lookahead token should be read) if the user
-     has otherwise disabled default reductions.  */
+     `consistent'.  However, do not treat a state with any reductions as
+     consistent unless it is the accepting state (because there is never
+     a lookahead token that makes sense there, and so no lookahead token
+     should be read) if the user has otherwise disabled default
+     reductions.  */

   if (rp->num > 1
       || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0))
       || (rp->num == 1 && rp->rules[0]->number != 0
   if (rp->num > 1
       || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0))
       || (rp->num == 1 && rp->rules[0]->number != 0