Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

lalr: clarify the count of lookaheads

Browse Source 
* src/lalr.c (state_lookahead_tokens_count): Remove wierd `+=` that is
actually an `=`.
This commit is contained in:
Akim Demaille
2019-02-27 19:15:28 +01:00
parent e062b9f70d
commit d57751d2fb
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lalr.c
View File

@@ -352,9 +352,8 @@ compute_lookahead_tokens (void)
static int static int
state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept) state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept)
{ {
int n_lookahead_tokens = 0; const reductions *rp = s->reductions;
reductions *rp = s->reductions; const transitions *sp = s->transitions;
transitions *sp = s->transitions;
/* Transitions are only disabled during conflict resolution, and that /* Transitions are only disabled during conflict resolution, and that
hasn't happened yet, so there should be no need to check that hasn't happened yet, so there should be no need to check that
@@ -371,15 +370,13 @@ state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept)
a lookahead token that makes sense there, and so no lookahead token a lookahead token that makes sense there, and so no lookahead token
should be read) if the user has otherwise disabled default should be read) if the user has otherwise disabled default
reductions. */ reductions. */
if (rp->num > 1 s->consistent =
!(rp->num > 1
|| (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0)) || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0))
|| (rp->num == 1 && rp->rules[0]->number != 0 || (rp->num == 1 && rp->rules[0]->number != 0
&& default_reduction_only_for_accept)) && default_reduction_only_for_accept));
n_lookahead_tokens += rp->num;
else
s->consistent = true;
return n_lookahead_tokens; return s->consistent ? 0 : rp->num;
} }