From: Joel E. Denny Date: Fri, 24 Jul 2009 13:59:42 +0000 (-0400) Subject: * src/lalr.c (state_lookahead_tokens_count): Correct comment. X-Git-Tag: v2.7.90~841 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/e459fb0e3ce6227005e6e3c40b0860685df6d3a9?ds=sidebyside * src/lalr.c (state_lookahead_tokens_count): Correct comment. (cherry picked from commit 2de160e12ea0b0313a3a4f2120b30a3eeaad0c76) --- diff --git a/ChangeLog b/ChangeLog index e6388ea1..01870f6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-24 Joel E. Denny + + * src/lalr.c (state_lookahead_tokens_count): Correct comment. + 2009-07-22 Joel E. Denny Some M4 cleanup in the testsuite. diff --git a/src/lalr.c b/src/lalr.c index 26030866..fbd2800f 100644 --- 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 - `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