diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2020-07-12 15:16:51 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2020-07-14 06:48:48 +0200 |
| commit | 78f72a451651b3d677f73e5d6960a6b68a50612b (patch) | |
| tree | a3859243a373535b583760fae8d4f25721dd3e92 /src/tables.c | |
| parent | c04693d651b6cefc67337146e5911e3070bf9ef4 (diff) | |
| download | bison-78f72a451651b3d677f73e5d6960a6b68a50612b.tar.gz | |
style: s/lookahead_tokens/lookaheads/g
Currently we use both names. Let's stick to the short one.
* src/AnnotationList.c, src/conflicts.c, src/counterexample.c,
* src/getargs.c, src/getargs.h, src/graphviz.c, src/ielr.c,
* src/lalr.c, src/print-graph.c, src/print-xml.c, src/print.c,
* src/state-item.c, src/state.c, src/state.h, src/tables.c:
s/lookahead_token/lookahead/gi.
Diffstat (limited to 'src/tables.c')
| -rw-r--r-- | src/tables.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tables.c b/src/tables.c index 883d81e5..052e96e6 100644 --- a/src/tables.c +++ b/src/tables.c @@ -200,7 +200,7 @@ conflict_row (state *s) /* Find all reductions for token J, and record all that do not match ACTROW[J]. */ for (int i = 0; i < reds->num; i += 1) - if (bitset_test (reds->lookahead_tokens[i], j) + if (bitset_test (reds->lookaheads[i], j) && (actrow[j] != rule_number_as_item_number (reds->rules[i]->number))) { @@ -247,7 +247,7 @@ action_row (state *s) reductions *reds = s->reductions; bool conflicted = false; - if (reds->lookahead_tokens) + if (reds->lookaheads) /* loop over all the rules available here which require lookahead (in reverse order to give precedence to the first rule) */ @@ -257,7 +257,7 @@ action_row (state *s) { bitset_iterator biter; int j; - BITSET_FOR_EACH (biter, reds->lookahead_tokens[i], j, 0) + BITSET_FOR_EACH (biter, reds->lookaheads[i], j, 0) { /* and record this rule as the rule to use if that token follows. */ @@ -308,7 +308,7 @@ action_row (state *s) } /* Turn off default reductions where requested by the user. See - state_lookahead_tokens_count in lalr.c to understand when states are + state_lookaheads_count in lalr.c to understand when states are labeled as consistent. */ { char *default_reductions = |