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

* src/conflicts.c (conflicts_output): Don't output rules never

Browse Source 
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:
Akim Demaille
2002-08-02 08:05:01 +00:00
parent cd08e51eda
commit c8f002c7d3
10 changed files with 175 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/tables.c
View File

@@ -394,16 +394,6 @@ action_row (state_t *state)
}
}
/* Find the rules which are reduced. */
if (!glr_parser)
{
for (i = 0; i < ntokens; i++)
if (actrow[i] < 0 && actrow[i] != ACTION_MIN)
rules[item_number_as_rule_number (actrow[i])].useful = TRUE;
if (default_rule)
default_rule->useful = TRUE;
}
/* If have no default rule, the default is an error.
So replace any action which says "error" with "use default". */
@@ -477,7 +467,9 @@ static void
token_actions (void)
{
state_number_t i;
symbol_number_t j;
rule_number_t r;
int nconflict = conflicts_total_count ();
yydefact = XCALLOC (rule_number_t, nstates);
@@ -485,9 +477,7 @@ token_actions (void)
actrow = XCALLOC (action_t, ntokens);
conflrow = XCALLOC (unsigned int, ntokens);
/* Now that the parser was computed, we can find which rules are
really reduced, and which are not because of SR or RR conflicts.
*/
/* Find the rules which are reduced. */
if (!glr_parser)
for (r = 0; r < nrules; ++r)
rules[r].useful = FALSE;
@@ -506,17 +496,19 @@ token_actions (void)
rule_t *default_rule = action_row (states[i]);
yydefact[i] = default_rule ? default_rule->number + 1 : 0;
save_row (i);
}
if (!glr_parser)
for (r = 0; r < nrules ; ++r)
if (!rules[r].useful)
/* Now that the parser was computed, we can find which rules are
really reduced, and which are not because of SR or RR
conflicts. */
if (!glr_parser)
{
LOCATION_PRINT (stderr, rules[r].location);
fprintf (stderr, ": %s: %s: ",
_("warning"), _("rule never reduced because of conflicts"));
rule_print (&rules[r], stderr);
for (j = 0; j < ntokens; ++j)
if (actrow[j] < 0 && actrow[j] != ACTION_MIN)
rules[item_number_as_rule_number (actrow[j])].useful = TRUE;
if (yydefact[i])
rules[yydefact[i] - 1].useful = TRUE;
}
}
free (actrow);
free (conflrow);