X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8b3df748a3ce59d3f88b84677a8bee2a8ad2d82b..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/reduce.c?ds=sidebyside diff --git a/src/reduce.c b/src/reduce.c index 439e5207..61ad2b2e 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -37,9 +37,6 @@ #include "getargs.h" #include "bitset.h" -typedef short *rule; - - /* Set of all nonterminals which are not useless. */ static bitset N; @@ -54,7 +51,7 @@ static bitset V; static bitset V1; static int nuseful_productions; -static int nuseless_productions; +int nuseless_productions; static int nuseful_nonterminals; int nuseless_nonterminals; @@ -67,7 +64,7 @@ int nuseless_nonterminals; static bool useful_production (int i, bitset N0) { - rule r; + item_number_t *r; short n; /* A production is useful if all of the nonterminals in its appear @@ -139,7 +136,7 @@ inaccessable_symbols (void) bitset Vp, Vs, Pp; int i; short t; - rule r; + 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 @@ -199,9 +196,9 @@ inaccessable_symbols (void) V = Vp; /* Tokens 0, 1, and 2 are internal to Bison. Consider them useful. */ - bitset_set (V, 0); /* end-of-input token */ - bitset_set (V, 1); /* error token */ - bitset_set (V, 2); /* some undefined token */ + bitset_set (V, eoftoken->number); /* end-of-input token */ + bitset_set (V, errtoken->number); /* error token */ + bitset_set (V, undeftoken->number); /* some undefined token */ bitset_free (P); P = Pp; @@ -218,7 +215,7 @@ inaccessable_symbols (void) /* 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); + bitset_set (V1, rules[i].precsym->number); } @@ -252,7 +249,7 @@ reduce_grammar_tables (void) /* Renumber the rules markers in RITEMS. */ for (i = 1; i < nrules + 1; ++i) { - short *rhsp = rules[i].rhs; + item_number_t *rhsp = rules[i].rhs; for (/* Nothing. */; *rhsp >= 0; ++rhsp) /* Nothing. */; *rhsp = -i; @@ -269,7 +266,6 @@ reduce_grammar_tables (void) { length = rule_rhs_length (&rules[r]); nritems -= length + 1; - nitems -= length + 1; } } } @@ -282,12 +278,12 @@ reduce_grammar_tables (void) static void nonterminals_reduce (void) { - int i, n; + token_number_t i, n; /* Map the nonterminals to their new index: useful first, useless afterwards. Kept for later report. */ - short *nontermmap = XCALLOC (short, nvars) - ntokens; + token_number_t *nontermmap = XCALLOC (token_number_t, nvars) - ntokens; n = ntokens; for (i = ntokens; i < nsyms; i++) if (bitset_test (V, i)) @@ -299,7 +295,7 @@ nonterminals_reduce (void) /* Shuffle elements of tables indexed by symbol number. */ { - bucket **symbols_sorted = XMALLOC (bucket *, nvars) - ntokens; + symbol_t **symbols_sorted = XMALLOC (symbol_t *, nvars) - ntokens; for (i = ntokens; i < nsyms; i++) symbols[i]->number = nontermmap[i]; @@ -310,18 +306,9 @@ nonterminals_reduce (void) free (symbols_sorted + ntokens); } - /* Replace all symbol numbers in valid data structures. */ - - for (i = 1; i < nrules + 1; i++) - { - if (ISVAR (rules[i].precsym)) - /* Can this happen? */ - rules[i].precsym = nontermmap[rules[i].precsym]; - } - for (i = 0; i < nritems; ++i) if (ISVAR (ritem[i])) - ritem[i] = nontermmap[ritem[i]]; + ritem[i] = token_number_as_item_number (nontermmap[ritem[i]]); start_symbol = nontermmap[start_symbol]; @@ -371,7 +358,7 @@ reduce_output (FILE *out) fprintf (out, "%s\n\n", _("Useless rules:")); for (i = nrules + 1; i < nuseless_productions + nrules + 1; i++) { - rule r; + item_number_t *r; fprintf (out, "#%-4d ", rules[i].user_number - 1); fprintf (out, "%s:", quotearg_style (escape_quoting_style, rules[i].lhs->tag)); @@ -384,55 +371,7 @@ reduce_output (FILE *out) } } -static void -dump_grammar (FILE *out) -{ - int i; - rule r; - - fprintf (out, "REDUCED GRAMMAR\n\n"); - fprintf (out, - "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n", - ntokens, nvars, nsyms, nrules, nitems); - fprintf (out, "Variables\n---------\n\n"); - fprintf (out, "Value Sprec Sassoc Tag\n"); - for (i = ntokens; i < nsyms; i++) - fprintf (out, "%5d %5d %5d %s\n", - i, - symbols[i]->prec, symbols[i]->assoc, - quotearg_style (escape_quoting_style, symbols[i]->tag)); - fprintf (out, "\n\n"); - fprintf (out, "Rules\n-----\n\n"); - fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"); - for (i = 1; i < nrules + nuseless_productions + 1; i++) - { - int rhs_count = 0; - /* Find the last RHS index in ritems. */ - for (r = rules[i].rhs; *r >= 0; ++r) - ++rhs_count; - fprintf (out, "%3d (%2d, %2d, %2d, %2d-%2d) %2d ->", - i - 1, - rules[i].prec, rules[i].assoc, rules[i].useful, - rules[i].rhs - ritem, rules[i].rhs - ritem + rhs_count - 1, - rules[i].lhs->number); - /* Dumped the RHS. */ - for (r = rules[i].rhs; *r >= 0; r++) - fprintf (out, "%3d", *r); - fprintf (out, " [%d]\n", -(*r) - 1); - } - fprintf (out, "\n\n"); - fprintf (out, "Rules interpreted\n-----------------\n\n"); - for (i = 1; i < nrules + nuseless_productions + 1; i++) - { - fprintf (out, "%-5d %s :", - i, quotearg_style (escape_quoting_style, rules[i].lhs->tag)); - for (r = rules[i].rhs; *r >= 0; r++) - fprintf (out, " %s", - quotearg_style (escape_quoting_style, symbols[*r]->tag)); - fputc ('\n', out); - } - fprintf (out, "\n\n"); -} + @@ -494,14 +433,17 @@ reduce_grammar (void) fatal (_("Start symbol %s does not derive any sentence"), quotearg_style (escape_quoting_style, symbols[start_symbol]->tag)); - if (nuseless_productions > 0) - reduce_grammar_tables (); + /* First reduce the nonterminals, as they renumber themselves in the + whole grammar. If you change the order, nonterms would be + renumbered only in the reduced grammar. */ if (nuseless_nonterminals > 0) nonterminals_reduce (); + if (nuseless_productions > 0) + reduce_grammar_tables (); if (trace_flag) { - dump_grammar (stderr); + grammar_dump (stderr, "Reduced Grammar"); fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals\ , and %d productions.\n",