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

cex: factor memory allocation

Browse Source 
* src/counterexample.c (counterexample_report_state): Allocate once
per conflicted state, instead of once per r/r conflict.
This commit is contained in:
Akim Demaille
2020-07-12 15:13:08 +02:00
parent 12191911ba
commit c04693d651
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/counterexample.c
View File

@@ -1286,6 +1286,7 @@ counterexample_report_state (const state *s, FILE *out, const char *prefix)
{ {
const state_number sn = s->number; const state_number sn = s->number;
const reductions *reds = s->reductions; const reductions *reds = s->reductions;
bitset lookahead_tokens = bitset_create (ntokens, BITSET_FIXED);
for (int i = 0; i < reds->num; ++i) for (int i = 0; i < reds->num; ++i)
{ {
const rule *r1 = reds->rules[i]; const rule *r1 = reds->rules[i];
@@ -1300,20 +1301,20 @@ counterexample_report_state (const state *s, FILE *out, const char *prefix)
} }
for (int j = i+1; j < reds->num; ++j) for (int j = i+1; j < reds->num; ++j)
{ {
bitset conf = bitset_create (ntokens, BITSET_FIXED);
const rule *r2 = reds->rules[j]; const rule *r2 = reds->rules[j];
bitset_intersection (conf, // Conflicts: common lookaheads.
bitset_intersection (lookahead_tokens,
reds->lookahead_tokens[i], reds->lookahead_tokens[i],
reds->lookahead_tokens[j]); reds->lookahead_tokens[j]);
if (!bitset_empty_p (conf)) if (!bitset_empty_p (lookahead_tokens))
for (state_item_number c2 = state_item_map[sn]; c2 < state_item_map[sn + 1]; ++c2) for (state_item_number c2 = state_item_map[sn]; c2 < state_item_map[sn + 1]; ++c2)
if (!SI_DISABLED (c2) if (!SI_DISABLED (c2)
&& item_rule (state_items[c2].item) == r2) && item_rule (state_items[c2].item) == r2)
{ {
counterexample_report_reduce_reduce (c1, c2, conf, out, prefix); counterexample_report_reduce_reduce (c1, c2, lookahead_tokens, out, prefix);
break; break;
} }
bitset_free (conf);
} }
} }
bitset_free (lookahead_tokens);
} }