X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/342b8b6e2156e923797745af2da2596e3086ccd5..eeeb962b:/src/print.c diff --git a/src/print.c b/src/print.c index ccafbdc6..6a302962 100644 --- a/src/print.c +++ b/src/print.c @@ -1,5 +1,5 @@ /* Print information on generated parser, for bison, - Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc. + Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -29,6 +29,7 @@ #include "state.h" #include "reader.h" #include "print.h" +#include "reduce.h" #if 0 static void @@ -47,40 +48,32 @@ static void print_core (FILE *out, int state) { int i; - int k; - int rule; - core *statep; - short *sp; - short *sp1; - - statep = state_table[state]; - k = statep->nitems; + core *statep = state_table[state].state; - if (k == 0) + if (!statep->nitems) return; - for (i = 0; i < k; i++) + for (i = 0; i < statep->nitems; i++) { + short *sp; + short *sp1; + int rule; + sp1 = sp = ritem + statep->items[i]; while (*sp > 0) sp++; rule = -(*sp); - fprintf (out, " %s -> ", tags[rlhs[rule]]); + fprintf (out, " %s -> ", tags[rule_table[rule].lhs]); - for (sp = ritem + rrhs[rule]; sp < sp1; sp++) - { - fprintf (out, "%s ", tags[*sp]); - } + for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++) + fprintf (out, "%s ", tags[*sp]); fputc ('.', out); - while (*sp > 0) - { - fprintf (out, " %s", tags[*sp]); - sp++; - } + for (/* Nothing */; *sp > 0; ++sp) + fprintf (out, " %s", tags[*sp]); fprintf (out, _(" (rule %d)"), rule); fputc ('\n', out); @@ -94,16 +87,10 @@ print_actions (FILE *out, int state) { int i; int k; - int state1; - int symbol; - shifts *shiftp; - errs *errp; - reductions *redp; - int rule; - shiftp = shift_table[state]; - redp = reduction_table[state]; - errp = err_table[state]; + shifts *shiftp = state_table[state].shift_table; + reductions *redp = state_table[state].reduction_table; + errs *errp = err_table[state]; if (!shiftp && !redp) { @@ -120,10 +107,11 @@ print_actions (FILE *out, int state) for (i = 0; i < k; i++) { - if (!shiftp->shifts[i]) + int symbol; + int state1 = shiftp->shifts[i]; + if (!state1) continue; - state1 = shiftp->shifts[i]; - symbol = accessing_symbol[state1]; + symbol = state_table[state1].accessing_symbol; /* The following line used to be turned off. */ if (ISVAR (symbol)) break; @@ -147,15 +135,12 @@ print_actions (FILE *out, int state) if (errp) { - int j, nerrs; - - nerrs = errp->nerrs; - - for (j = 0; j < nerrs; j++) + int j; + for (j = 0; j < errp->nerrs; j++) { - if (!errp->errs[j]) + int symbol = errp->errs[j]; + if (!symbol) continue; - symbol = errp->errs[j]; fprintf (out, _(" %-4s\terror (nonassociative)\n"), tags[symbol]); } @@ -164,26 +149,27 @@ print_actions (FILE *out, int state) fputc ('\n', out); } - if (consistent[state] && redp) + if (state_table[state].consistent && redp) { - rule = redp->rules[0]; - symbol = rlhs[rule]; + int rule = redp->rules[0]; + int symbol = rule_table[rule].lhs; fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), rule, tags[symbol]); } else if (redp) { - print_reductions (state); + print_reductions (out, state); } if (i < k) { for (; i < k; i++) { - if (!shiftp->shifts[i]) + int symbol; + int state1 = shiftp->shifts[i]; + if (!state1) continue; - state1 = shiftp->shifts[i]; - symbol = accessing_symbol[state1]; + symbol = state_table[state1].accessing_symbol; fprintf (out, _(" %-4s\tgo to state %d\n"), tags[symbol], state1); } @@ -226,18 +212,21 @@ print_grammar (FILE *out) int column = 0; /* rule # : LHS -> RHS */ - fprintf (out, "\n%s\n", _("Grammar")); + fprintf (out, "\n%s\n\n", _("Grammar")); + fprintf (out, " %s\n", _("Number, Line, Rule")); for (i = 1; i <= nrules; i++) /* Don't print rules disabled in reduce_grammar_tables. */ - if (rlhs[i] >= 0) + if (rule_table[i].lhs >= 0) { - fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]); - rule = &ritem[rrhs[i]]; + fprintf (out, _(" %3d %3d %s ->"), + i, rule_table[i].line, tags[rule_table[i].lhs]); + rule = &ritem[rule_table[i].rhs]; if (*rule > 0) while (*rule > 0) fprintf (out, " %s", tags[*rule++]); else - fprintf (out, " /* %s */\n", _("empty")); + fprintf (out, " /* %s */", _("empty")); + fputc ('\n', out); } /* TERMINAL (type #) : rule #s terminal is on RHS */ @@ -254,7 +243,7 @@ print_grammar (FILE *out) sprintf (buffer, " (%d)", i); for (j = 1; j <= nrules; j++) - for (rule = &ritem[rrhs[j]]; *rule > 0; rule++) + for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++) if (*rule == token_translations[i]) { END_TEST (65); @@ -272,9 +261,9 @@ print_grammar (FILE *out) for (j = 1; j <= nrules; j++) { - if (rlhs[j] == i) + if (rule_table[j].lhs == i) left_count++; - for (rule = &ritem[rrhs[j]]; *rule > 0; rule++) + for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++) if (*rule == i) { right_count++; @@ -296,7 +285,7 @@ print_grammar (FILE *out) for (j = 1; j <= nrules; j++) { END_TEST (65); - if (rlhs[j] == i) + if (rule_table[j].lhs == i) sprintf (buffer + strlen (buffer), " %d", j); } } @@ -309,7 +298,7 @@ print_grammar (FILE *out) sprintf (buffer + strlen (buffer), _(" on right:")); for (j = 1; j <= nrules; j++) { - for (rule = &ritem[rrhs[j]]; *rule > 0; rule++) + for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++) if (*rule == i) { END_TEST (65); @@ -336,8 +325,8 @@ print_results (void) size_t size = obstack_object_size (&output_obstack); fwrite (obstack_finish (&output_obstack), 1, size, out); - if (any_conflicts) - print_conflicts (out); + reduce_output (out); + conflicts_output (out); print_grammar (out);