mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 15:23:02 +00:00
* src/conflicts.c (conflicts_output): Don't output rules never
reduced here, since anyway that computation doesn't work. * src/gram.h, src/gram.h (rule_filter_t, rule_useful_p) (rule_useless_p, rule_never_reduced_p): New. (grammar_rules_partial_print): Use a filter instead of a range. Display the title only if needed. (grammar_rules_print): Adjust. (grammar_rules_never_reduced_report): New. * src/tables.c (action_row): Move the computation of rules never reduced to... (token_actions): here. * src/main.c (main): Make the parser before making the report, so that rules never reduced are computed. Call grammar_rules_never_reduced_report. * src/print.c (print_results): Report rules never reduced. * tests/conflicts.at, tests/reduce.at: Adjust.
This commit is contained in:
@@ -451,15 +451,10 @@ void
|
||||
conflicts_output (FILE *out)
|
||||
{
|
||||
bool printed_sth = FALSE;
|
||||
bool *used_rules = XCALLOC (bool, nrules);
|
||||
state_number_t i;
|
||||
for (i = 0; i < nstates; i++)
|
||||
{
|
||||
state_t *s = states[i];
|
||||
reductions_t *reds = s->reductions;
|
||||
int j;
|
||||
for (j = 0; j < reds->num; ++j)
|
||||
used_rules[reds->rules[j]->number] = TRUE;
|
||||
if (conflicts[i])
|
||||
{
|
||||
fprintf (out, _("State %d contains "), i);
|
||||
@@ -471,23 +466,6 @@ conflicts_output (FILE *out)
|
||||
}
|
||||
if (printed_sth)
|
||||
fputs ("\n\n", out);
|
||||
|
||||
for (i = 0; i < nstates; i++)
|
||||
{
|
||||
state_t *s = states[i];
|
||||
reductions_t *r = s->reductions;
|
||||
int j;
|
||||
for (j = 0; j < r->num; ++j)
|
||||
if (!used_rules[r->rules[j]->number])
|
||||
{
|
||||
LOCATION_PRINT (stderr, r->rules[j]->location);
|
||||
fprintf (stderr, ": %s: %s: ",
|
||||
_("warning"),
|
||||
_("rule never reduced because of conflicts"));
|
||||
rule_print (r->rules[j], stderr);
|
||||
}
|
||||
}
|
||||
free (used_rules);
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------.
|
||||
|
||||
Reference in New Issue
Block a user