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

ielr: make some conditions about items easier to understand

Browse Source 
Checking that an item index is > 1 means ruling out `$accept: • input
$end` and `$accept: input • $end`.  But actually only the latter is
possible there, i.e., we're checking whether this item is about a
successor of a (kernel) item of the initial state ($accept: input •
$end).

* src/ielr.c (is_successor_of_initial_item): Use a variable to name
this condition.
This commit is contained in:
Akim Demaille
2020-10-11 15:41:17 +02:00
parent a38d0b9145
commit e9a43ed4ae
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ielr.c
View File

@@ -413,7 +413,10 @@ ielr_item_has_lookahead (state *s, symbol_number lhs, size_t item,
didn't change this test to an aver just in case the usage of this
function evolves to need those two cases. In both cases, the current
implementation returns the right result. */
if (s->items[item] > 1)
aver (s->items[item] != 1);
const bool is_successor_of_initial_item = s->items[item] <= 1;
aver (!is_successor_of_initial_item);
if (!is_successor_of_initial_item)
{
/* If the LHS symbol of this item isn't known (because this is a
top-level invocation), go get it. */
@@ -622,9 +625,11 @@ ielr_compute_lookaheads (bitsetv follow_kernel_items, bitsetv always_follows,
a special case to avoid the - 2 below, but the next successor can be
handled fine without special casing it. */
aver (t->items[t_item] != 0);
if (t->items[t_item] > 1
const bool is_successor_of_initial_item = t->items[t_item] <= 1;
if (!is_successor_of_initial_item
&& !bitset_empty_p (lookahead_filter[t_item]))
{
/* Is this kernel item next to the beginning of the RHS? */
if (item_number_is_rule_number (ritem[t->items[t_item] - 2]))
ielr_compute_goto_follow_set (
follow_kernel_items, always_follows, s,