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

cex: add an argument to the reporting functions to specify the stream

Browse Source 
* src/conflicts.c (find_state_item_number, report_state_counterexamples):
Move to...
* src/counterexample.h, src/counterexample.c (find_state_item_number)
(counterexample_report_state): this.
Add support for `out` as an argument.
(counterexample_report_reduce_reduce, counterexample_report_shift_reduce):
Accept an `out` argument, and be static.
This commit is contained in:
Akim Demaille
2020-06-11 07:20:09 +02:00
parent 1c3189734c
commit 5edac5e15a
3 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/conflicts.c
View File

@@ -626,72 +626,12 @@ conflicts_total_count (void)
return count_sr_conflicts () + count_rr_conflicts ();
}
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 (!SI_DISABLED (i)
&& item_number_as_rule_number (*state_items[i].item) == r->number)
return i;
abort ();
}
static void
report_state_counterexamples (const state *s)
{
const state_number sn = s->number;
const reductions *reds = s->reductions;
for (int i = 0; i < reds->num; ++i)
{
rule *r1 = reds->rules[i];
const state_item_number c1 = find_state_item_number (r1, sn);
for (int j = state_item_map[sn]; j < state_item_map[sn + 1]; ++j)
{
if (SI_DISABLED (j))
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))
{
counterexample_report_shift_reduce (c1, j, conf);
break;
}
}
for (int j = i+1; j < reds->num; ++j)
{
bitset conf = bitset_create (ntokens, BITSET_FIXED);
bitset_intersection (conf,
reds->lookahead_tokens[i],
reds->lookahead_tokens[j]);
if (!bitset_empty_p (conf))
{
rule *r2 = reds->rules[j];
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)
{
counterexample_report_reduce_reduce (c1, k, conf);
break;
}
}
}
bitset_free (conf);
}
}
}
static void
report_counterexamples (void)
{
for (state_number sn = 0; sn < nstates; ++sn)
if (conflicts[sn])
report_state_counterexamples (states[sn]);
counterexample_report_state (states[sn], stderr);
}
/*------------------------------------------------.