X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b2ed6e5826e772162719db595446b2c58e4ac5d6..eeeb962b:/src/print.c diff --git a/src/print.c b/src/print.c index 96b64e88..6a302962 100644 --- a/src/print.c +++ b/src/print.c @@ -48,20 +48,17 @@ static void print_core (FILE *out, int state) { int i; - int k; - int rule; - core *statep; - short *sp; - short *sp1; - - statep = state_table[state].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) @@ -71,17 +68,12 @@ print_core (FILE *out, int state) fprintf (out, " %s -> ", tags[rule_table[rule].lhs]); for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++) - { - fprintf (out, "%s ", tags[*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); @@ -95,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 = state_table[state].shift_table; - redp = state_table[state].reduction_table; - 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) { @@ -121,9 +107,10 @@ 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 = state_table[state1].accessing_symbol; /* The following line used to be turned off. */ if (ISVAR (symbol)) @@ -148,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]); } @@ -167,8 +151,8 @@ print_actions (FILE *out, int state) if (state_table[state].consistent && redp) { - rule = redp->rules[0]; - symbol = rule_table[rule].lhs; + int rule = redp->rules[0]; + int symbol = rule_table[rule].lhs; fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), rule, tags[symbol]); } @@ -181,9 +165,10 @@ print_actions (FILE *out, int state) { for (; i < k; i++) { - if (!shiftp->shifts[i]) + int symbol; + int state1 = shiftp->shifts[i]; + if (!state1) continue; - state1 = shiftp->shifts[i]; symbol = state_table[state1].accessing_symbol; fprintf (out, _(" %-4s\tgo to state %d\n"), tags[symbol], state1); @@ -228,17 +213,19 @@ print_grammar (FILE *out) /* rule # : LHS -> RHS */ 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 (rule_table[i].lhs >= 0) { - fprintf (out, _("rule %-4d %s ->"), i, tags[rule_table[i].lhs]); + 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 */", _("empty")); + fprintf (out, " /* %s */", _("empty")); fputc ('\n', out); }