diff options
author | Akim Demaille <akim.demaille@gmail.com> | 2019-01-23 07:26:23 +0100 |
---|---|---|
committer | Akim Demaille <akim.demaille@gmail.com> | 2019-01-26 16:21:35 +0100 |
commit | 21a7fa8063171de5afae1caae506b0e0b10a5824 (patch) | |
tree | f359e4fafdc4feac5d6b3698ac278bc1e51b78ab /src | |
parent | 83463dfbee32f0d289a6fcfc2cf7801f5a910c82 (diff) | |
download | bison-21a7fa8063171de5afae1caae506b0e0b10a5824.tar.gz |
traces: always print the reduced grammar and fix it
* src/gram.c (grammar_dump): Print the effective number first instead
of last. And fix it (remove the incorrect "+1").
Use t/f for Booleans.
* src/reduce.c: When asked, always print the reduced grammar, even if
there was nothing useless.
* tests/sets.at (Reduced Grammar): Check that.
Diffstat (limited to 'src')
-rw-r--r-- | src/gram.c | 15 | ||||
-rw-r--r-- | src/reduce.c | 34 |
2 files changed, 25 insertions, 24 deletions
@@ -237,27 +237,28 @@ grammar_dump (FILE *out, const char *title) fprintf (out, "Rules\n-----\n\n"); { + /* Reduced number, then original number in the sources. */ fprintf (out, - "Num (Prec, Assoc, Useful, Ritem Range) Lhs" - " -> Rhs (Ritem range) [Num]\n"); - for (rule_number i = 0; i < nrules + nuseless_productions; i++) + "Num (Num, Prec, Assoc, Useful, UselessChain, Ritem Range)" + " Lhs -> Rhs (Ritem range)\n"); + for (rule_number i = 0; i < nrules + nuseless_productions; ++i) { rule const *rule_i = &rules[i]; unsigned const rhs_itemno = rule_i->rhs - ritem; unsigned length = rule_rhs_length (rule_i); - fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u) %2d ->", + fprintf (out, "%3d (%3d, %2d, %2d, %2s, %2u-%2u) %2d ->", + item_number_as_rule_number (rule_i->rhs[length]), i, rule_i->prec ? rule_i->prec->prec : 0, rule_i->prec ? rule_i->prec->assoc : 0, - rule_i->useful, + rule_i->useful ? "t" : "f", rhs_itemno, rhs_itemno + length - 1, rule_i->lhs->number); /* Dumped the RHS. */ for (item_number *rhsp = rule_i->rhs; 0 <= *rhsp; ++rhsp) fprintf (out, " %3d", *rhsp); - fprintf (out, " [%d]\n", - item_number_as_rule_number (rule_i->rhs[length+1])); + fputc ('\n', out); } } fprintf (out, "\n\n"); diff --git a/src/reduce.c b/src/reduce.c index 56a90754..574e9b07 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -378,23 +378,23 @@ reduce_grammar (void) inaccessable_symbols (); /* Did we reduce something? */ - if (!nuseless_nonterminals && !nuseless_productions) - return; - - reduce_print (); - - if (!bitset_test (N, accept->content->number - ntokens)) - complain (&startsymbol_location, fatal, - _("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 - renumbered only in the reduced grammar. */ - if (nuseless_nonterminals) - nonterminals_reduce (); - if (nuseless_productions) - reduce_grammar_tables (); + if (nuseless_nonterminals || nuseless_productions) + { + reduce_print (); + + if (!bitset_test (N, accept->content->number - ntokens)) + complain (&startsymbol_location, fatal, + _("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 + renumbered only in the reduced grammar. */ + if (nuseless_nonterminals) + nonterminals_reduce (); + if (nuseless_productions) + reduce_grammar_tables (); + } if (trace_flag & trace_grammar) { |