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

cex: fix pruning crash

Browse Source 
Fixes a crash on Cim's grammar.
https://lists.gnu.org/r/bison-patches/2020-05/msg00107.html

* src/state-item.c (prune_disabled_paths): Prune forward and backwards
paths in seperate passes.
(prune_forward, prune_backward): New.
(disable_state_item): Change function argument from state_item_number
to state_item.
(state_items_report): Add disabling to graph print-out.
* src/conflicts.c (find_state_item_number,
report_state_counterexamples): Add SI_DISABLED checks.
This commit is contained in:
Vincent Imbimbo
2020-05-23 11:20:46 -04:00
committed by Akim Demaille
parent 37da3c4b42
commit 50cd3f16de
2 changed files with 89 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/conflicts.c
View File

@@ -361,7 +361,8 @@ set_conflicts (state *s, symbol **errors)
check for shift-reduce conflict, and try to resolve using
precedence. */
for (int i = 0; i < reds->num; ++i)
if (reds->rules[i]->prec && reds->rules[i]->prec->prec
if (reds->rules[i]->prec
&& reds->rules[i]->prec->prec
&& !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
resolve_sr_conflict (s, i, errors, &nerrs);
@@ -629,7 +630,8 @@ static state_item_number
find_state_item_number (const rule *r, state_number sn)
{
for (int i = state_item_map[sn]; i < state_item_map[sn + 1]; ++i)
if (item_number_as_rule_number (*state_items[i].item) == r->number)
if (!SI_DISABLED (i)
&& item_number_as_rule_number (*state_items[i].item) == r->number)
return i;
abort ();
}
@@ -649,8 +651,8 @@ report_state_counterexamples (const state *s)
continue;
state_item *si = state_items + j;
item_number conf = *si->item;
if (item_number_is_symbol_number (conf) &&
bitset_test (reds->lookahead_tokens[i], conf))
if (item_number_is_symbol_number (conf)
&& bitset_test (reds->lookahead_tokens[i], conf))
{
counterexample_report_shift_reduce (c1, j, conf);
break;
@@ -668,6 +670,8 @@ report_state_counterexamples (const state *s)
for (int k = state_item_map[sn];
k < state_item_map[sn + 1]; ++k)
{
if (SI_DISABLED (k))
continue;
state_item *si = state_items + k;
const rule *r = item_rule (si->item);
if (r == r2)