X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6b98e4b5636203b60c2a43ddaa988562616b4c69..464c692789eba089bb21ebd3983ebeaa4a8d3312:/src/reduce.c?ds=sidebyside diff --git a/src/reduce.c b/src/reduce.c index 2319b60b..94df548e 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -1,5 +1,6 @@ /* Grammar reduction for Bison. - Copyright (C) 1988, 1989, 2000, 2001, 2002 Free Software Foundation, Inc. + + Copyright (C) 1988, 1989, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -26,16 +27,17 @@ user's parser. */ #include "system.h" -#include "quotearg.h" -#include "getargs.h" + +#include +#include + +#include "complain.h" #include "files.h" -#include "symtab.h" +#include "getargs.h" #include "gram.h" -#include "complain.h" -#include "reduce.h" #include "reader.h" -#include "getargs.h" -#include "bitset.h" +#include "reduce.h" +#include "symtab.h" /* Set of all nonterminals which are not useless. */ static bitset N; @@ -50,10 +52,10 @@ static bitset V; `useless', but no warning should be issued). */ static bitset V1; -static int nuseful_productions; -int nuseless_productions; +static rule_number nuseful_productions; +rule_number nuseless_productions; static int nuseful_nonterminals; -int nuseless_nonterminals; +symbol_number nuseless_nonterminals; /*-------------------------------------------------------------------. | Another way to do this would be with a set for each production and | @@ -62,18 +64,17 @@ int nuseless_nonterminals; `-------------------------------------------------------------------*/ static bool -useful_production (int i, bitset N0) +useful_production (rule_number r, bitset N0) { - item_number_t *r; - short n; + item_number *rhsp; /* A production is useful if all of the nonterminals in its appear in the set of useful nonterminals. */ - for (r = rules[i].rhs; *r >= 0; r++) - if (ISVAR (n = *r) && !bitset_test (N0, n - ntokens)) - return FALSE; - return TRUE; + for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) + if (ISVAR (*rhsp) && !bitset_test (N0, *rhsp - ntokens)) + return false; + return true; } @@ -85,7 +86,7 @@ static void useless_nonterminals (void) { bitset Np, Ns; - int i; + rule_number r; /* N is set as built. Np is set being built this iteration. P is set of all productions which have a RHS all in N. */ @@ -112,12 +113,12 @@ useless_nonterminals (void) while (1) { bitset_copy (Np, N); - for (i = 1; i < nrules + 1; i++) - if (!bitset_test (P, i) - && useful_production (i, N)) + for (r = 0; r < nrules; r++) + if (!bitset_test (P, r) + && useful_production (r, N)) { - bitset_set (Np, rules[i].lhs->number - ntokens); - bitset_set (P, i); + bitset_set (Np, rules[r].lhs->number - ntokens); + bitset_set (P, r); } if (bitset_equal_p (N, Np)) break; @@ -134,9 +135,6 @@ static void inaccessable_symbols (void) { bitset Vp, Vs, Pp; - int i; - short t; - item_number_t *r; /* Find out which productions are reachable and which symbols are used. Starting with an empty set of productions and a set of @@ -162,26 +160,28 @@ inaccessable_symbols (void) user can know. */ Vp = bitset_create (nsyms, BITSET_FIXED); - Pp = bitset_create (nrules + 1, BITSET_FIXED); + Pp = bitset_create (nrules, BITSET_FIXED); /* If the start symbol isn't useful, then nothing will be useful. */ - if (bitset_test (N, axiom->number - ntokens)) + if (bitset_test (N, accept->number - ntokens)) { - bitset_set (V, axiom->number); + bitset_set (V, accept->number); while (1) { + rule_number r; bitset_copy (Vp, V); - for (i = 1; i < nrules + 1; i++) + for (r = 0; r < nrules; r++) { - if (!bitset_test (Pp, i) - && bitset_test (P, i) - && bitset_test (V, rules[i].lhs->number)) + if (!bitset_test (Pp, r) + && bitset_test (P, r) + && bitset_test (V, rules[r].lhs->number)) { - for (r = rules[i].rhs; *r >= 0; r++) - if (ISTOKEN (t = *r) || bitset_test (N, t - ntokens)) - bitset_set (Vp, t); - bitset_set (Pp, i); + item_number *rhsp; + for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++) + if (ISTOKEN (*rhsp) || bitset_test (N, *rhsp - ntokens)) + bitset_set (Vp, *rhsp); + bitset_set (Pp, r); } } if (bitset_equal_p (V, Vp)) @@ -196,7 +196,7 @@ inaccessable_symbols (void) V = Vp; /* Tokens 0, 1, and 2 are internal to Bison. Consider them useful. */ - bitset_set (V, eoftoken->number); /* end-of-input token */ + bitset_set (V, endtoken->number); /* end-of-input token */ bitset_set (V, errtoken->number); /* error token */ bitset_set (V, undeftoken->number); /* some undefined token */ @@ -207,15 +207,21 @@ inaccessable_symbols (void) nuseless_productions = nrules - nuseful_productions; nuseful_nonterminals = 0; - for (i = ntokens; i < nsyms; i++) - if (bitset_test (V, i)) - nuseful_nonterminals++; + { + symbol_number i; + for (i = ntokens; i < nsyms; i++) + if (bitset_test (V, i)) + nuseful_nonterminals++; + } nuseless_nonterminals = nvars - nuseful_nonterminals; /* A token that was used in %prec should not be warned about. */ - for (i = 1; i < nrules + 1; i++) - if (rules[i].precsym != 0) - bitset_set (V1, rules[i].precsym->number); + { + rule_number r; + for (r = 0; r < nrules; ++r) + if (rules[r].precsym != 0) + bitset_set (V1, rules[r].precsym->number); + } } @@ -229,39 +235,32 @@ reduce_grammar_tables (void) { /* Report and flag useless productions. */ { - int r; - for (r = 1; r < nrules + 1; r++) - { - rules[r].useful = bitset_test (P, r); - if (!rules[r].useful) - { - LOCATION_PRINT (stderr, rules[r].location); - fprintf (stderr, ": %s: %s: ", _("warning"), _("useless rule")); - rule_print (&rules[r], stderr); - } - } + rule_number r; + for (r = 0; r < nrules; r++) + rules[r].useful = bitset_test (P, r); + grammar_rules_never_reduced_report (_("useless rule")); } /* Map the nonterminals to their new index: useful first, useless afterwards. Kept for later report. */ { - int useful = 1; - int useless = nrules + 1 - nuseless_productions; - rule_t *rules_sorted = XMALLOC (rule_t, nrules + 1) - 1; - int i; - for (i = 1; i < nrules + 1; ++i) - rules_sorted[rules[i].useful ? useful++ : useless++] = rules[i]; - free (rules + 1); + int useful = 0; + int useless = nrules - nuseless_productions; + rule *rules_sorted = MALLOC (rules_sorted, nrules); + rule_number r; + for (r = 0; r < nrules; ++r) + rules_sorted[rules[r].useful ? useful++ : useless++] = rules[r]; + free (rules); rules = rules_sorted; /* Renumber the rules markers in RITEMS. */ - for (i = 1; i < nrules + 1; ++i) + for (r = 0; r < nrules; ++r) { - item_number_t *rhsp = rules[i].rhs; + item_number *rhsp = rules[r].rhs; for (/* Nothing. */; *rhsp >= 0; ++rhsp) /* Nothing. */; - *rhsp = -i; - rules[i].number = i; + *rhsp = rule_number_as_item_number (r); + rules[r].number = r; } nrules -= nuseless_productions; } @@ -270,7 +269,7 @@ reduce_grammar_tables (void) { int r; int length; - for (r = nrules + 1; r < nrules + 1 + nuseless_productions; ++r) + for (r = nrules; r < nrules + nuseless_productions; ++r) { length = rule_rhs_length (&rules[r]); nritems -= length + 1; @@ -286,56 +285,55 @@ reduce_grammar_tables (void) static void nonterminals_reduce (void) { - symbol_number_t i, n; + symbol_number i, n; /* Map the nonterminals to their new index: useful first, useless afterwards. Kept for later report. */ - symbol_number_t *nontermmap = XCALLOC (symbol_number_t, nvars) - ntokens; + symbol_number *nontermmap = CALLOC (nontermmap, nvars); n = ntokens; for (i = ntokens; i < nsyms; i++) if (bitset_test (V, i)) - nontermmap[i] = n++; + nontermmap[i - ntokens] = n++; for (i = ntokens; i < nsyms; i++) if (!bitset_test (V, i)) { - nontermmap[i] = n++; - LOCATION_PRINT (stderr, symbols[i]->location); - fprintf (stderr, ": %s: %s: %s\n", - _("warning"), _("useless nonterminal"), - symbol_tag_get (symbols[i])); + nontermmap[i - ntokens] = n++; + warn_at (symbols[i]->location, _("useless nonterminal: %s"), + symbols[i]->tag); } /* Shuffle elements of tables indexed by symbol number. */ { - symbol_t **symbols_sorted = XMALLOC (symbol_t *, nvars) - ntokens; + symbol **symbols_sorted = MALLOC (symbols_sorted, nvars); for (i = ntokens; i < nsyms; i++) - symbols[i]->number = nontermmap[i]; + symbols[i]->number = nontermmap[i - ntokens]; for (i = ntokens; i < nsyms; i++) - symbols_sorted[nontermmap[i]] = symbols[i]; + symbols_sorted[nontermmap[i - ntokens] - ntokens] = symbols[i]; for (i = ntokens; i < nsyms; i++) - symbols[i] = symbols_sorted[i]; - free (symbols_sorted + ntokens); + symbols[i] = symbols_sorted[i - ntokens]; + free (symbols_sorted); } { - int r; - for (r = 1; r < nrules + 1; ++r) + rule_number r; + for (r = 0; r < nrules; ++r) { - item_number_t *rhsp; + item_number *rhsp; for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) if (ISVAR (*rhsp)) - *rhsp = symbol_number_as_item_number (nontermmap[*rhsp]); + *rhsp = symbol_number_as_item_number (nontermmap[*rhsp + - ntokens]); } - axiom->number = nontermmap[axiom->number]; + accept->number = nontermmap[accept->number - ntokens]; } nsyms -= nuseless_nonterminals; nvars -= nuseless_nonterminals; - free (nontermmap + ntokens); + free (nontermmap); } @@ -349,42 +347,30 @@ reduce_output (FILE *out) if (nuseless_nonterminals > 0) { int i; - fprintf (out, "%s\n\n", _("Useless nonterminals:")); + fprintf (out, "%s\n\n", _("Useless nonterminals")); for (i = 0; i < nuseless_nonterminals; ++i) - fprintf (out, " %s\n", symbol_tag_get (symbols[nsyms + i])); + fprintf (out, " %s\n", symbols[nsyms + i]->tag); fputs ("\n\n", out); } { - bool b = FALSE; + bool b = false; int i; for (i = 0; i < ntokens; i++) if (!bitset_test (V, i) && !bitset_test (V1, i)) { if (!b) - fprintf (out, "%s\n\n", _("Terminals which are not used:")); - b = TRUE; - fprintf (out, " %s\n", symbol_tag_get (symbols[i])); + fprintf (out, "%s\n\n", _("Terminals which are not used")); + b = true; + fprintf (out, " %s\n", symbols[i]->tag); } if (b) fputs ("\n\n", out); } if (nuseless_productions > 0) - { - int i; - fprintf (out, "%s\n\n", _("Useless rules:")); - for (i = nrules + 1; i < nuseless_productions + nrules + 1; i++) - { - item_number_t *r; - fprintf (out, "#%-4d ", rules[i].user_number - 1); - fprintf (out, "%s:", symbol_tag_get (rules[i].lhs)); - for (r = rules[i].rhs; *r >= 0; r++) - fprintf (out, " %s", symbol_tag_get (symbols[*r])); - fputs (";\n", out); - } - fputs ("\n\n", out); - } + grammar_rules_partial_print (out, _("Useless rules"), + rule_useless_p); } @@ -404,7 +390,7 @@ reduce_print (void) nuseless_productions), nuseless_productions); - fprintf (stderr, "%s: %s: ", infile, _("warning")); + fprintf (stderr, "%s: %s: ", grammar_file, _("warning")); if (nuseless_nonterminals > 0) fprintf (stderr, ngettext ("%d useless nonterminal", @@ -421,7 +407,6 @@ reduce_print (void) nuseless_productions), nuseless_productions); fprintf (stderr, "\n"); - fflush (stderr); } void @@ -432,7 +417,7 @@ reduce_grammar (void) /* Allocate the global sets used to compute the reduced grammar */ N = bitset_create (nvars, BITSET_FIXED); - P = bitset_create (nrules + 1, BITSET_FIXED); + P = bitset_create (nrules, BITSET_FIXED); V = bitset_create (nsyms, BITSET_FIXED); V1 = bitset_create (nsyms, BITSET_FIXED); @@ -445,9 +430,10 @@ reduce_grammar (void) reduce_print (); - if (!bitset_test (N, axiom->number - ntokens)) - fatal (_("Start symbol %s does not derive any sentence"), - symbol_tag_get (symbols[axiom->number])); + if (!bitset_test (N, accept->number - ntokens)) + fatal_at (startsymbol_location, + _("start symbol %s does not derive any sentence"), + startsymbol->tag); /* First reduce the nonterminals, as they renumber themselves in the whole grammar. If you change the order, nonterms would be @@ -457,13 +443,13 @@ reduce_grammar (void) if (nuseless_productions > 0) reduce_grammar_tables (); - if (trace_flag) + if (trace_flag & trace_grammar) { grammar_dump (stderr, "Reduced Grammar"); fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals\ , and %d productions.\n", - infile, ntokens, nvars, nrules); + grammar_file, ntokens, nvars, nrules); } }