X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/18bcecb07d832fa33e20aee7b4117fe6dc705bcc..b2d52318fadef8d2bf04769ec2fffb33baf6d92a:/src/print.c diff --git a/src/print.c b/src/print.c index 7be9f63d..ec5a12ad 100644 --- a/src/print.c +++ b/src/print.c @@ -1,5 +1,6 @@ /* Print information on generated parser, for bison, - Copyright 1984, 1986, 1989, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -68,24 +69,24 @@ static void print_core (FILE *out, state_t *state) { int i; - short *sitems = state->items; - int snitems = state->nitems; + item_number_t *sitems = state->items; + int snritems = state->nitems; /* New experimental feature: if TRACE_FLAGS output all the items of a state, not only its kernel. */ if (trace_flag) { - closure (sitems, snitems); + closure (sitems, snritems); sitems = itemset; - snitems = nitemset; + snritems = nritemset; } - if (snitems) + if (snritems) { - for (i = 0; i < snitems; i++) + for (i = 0; i < snritems; i++) { - short *sp; - short *sp1; + item_number_t *sp; + item_number_t *sp1; int rule; sp1 = sp = ritem + sitems[i]; @@ -94,7 +95,7 @@ print_core (FILE *out, state_t *state) sp++; rule = -(*sp); - fprintf (out, " %s -> ", escape (symbols[rules[rule].lhs]->tag)); + fprintf (out, " %s -> ", escape (rules[rule].lhs->tag)); for (sp = rules[rule].rhs; sp < sp1; sp++) fprintf (out, "%s ", escape (symbols[*sp]->tag)); @@ -123,7 +124,7 @@ print_shifts (FILE *out, state_t *state) if (!SHIFT_IS_DISABLED (shiftp, i)) { int state1 = shiftp->shifts[i]; - int symbol = states[state1]->accessing_symbol; + token_number_t symbol = states[state1]->accessing_symbol; fprintf (out, _(" %-4s\tshift, and go to state %d\n"), escape (symbols[symbol]->tag), state1); @@ -165,7 +166,7 @@ print_gotos (FILE *out, state_t *state) if (!SHIFT_IS_DISABLED (shiftp, i)) { int state1 = shiftp->shifts[i]; - int symbol = states[state1]->accessing_symbol; + token_number_t symbol = states[state1]->accessing_symbol; fprintf (out, _(" %-4s\tgo to state %d\n"), escape (symbols[symbol]->tag), state1); } @@ -189,7 +190,7 @@ print_reductions (FILE *out, state_t *state) if (state->consistent) { int rule = redp->rules[0]; - int symbol = rules[rule].lhs; + token_number_t symbol = rules[rule].lhs->number; fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), rule - 1, escape (symbols[symbol]->tag)); return; @@ -213,24 +214,26 @@ print_reductions (FILE *out, state_t *state) if (state->nlookaheads == 1 && !nodefault) { - int default_rule = LAruleno[state->lookaheadsp]; + rule_t *default_rule = LArule[state->lookaheadsp]; bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset); for (i = 0; i < ntokens; i++) if (bitset_test (lookaheadset, i)) fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"), - escape (symbols[i]->tag), default_rule - 1, - escape2 (symbols[rules[default_rule].lhs]->tag)); + escape (symbols[i]->tag), + default_rule->number - 1, + escape2 (default_rule->lhs->tag)); fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), - default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag)); + default_rule->number - 1, + escape (default_rule->lhs->tag)); } else if (state->nlookaheads >= 1) { int cmax = 0; int default_LA = -1; - int default_rule = 0; + rule_t *default_rule = NULL; if (!nodefault) for (i = 0; i < state->nlookaheads; ++i) @@ -248,7 +251,7 @@ print_reductions (FILE *out, state_t *state) { cmax = count; default_LA = state->lookaheadsp + i; - default_rule = LAruleno[state->lookaheadsp + i]; + default_rule = LArule[state->lookaheadsp + i]; } bitset_or (shiftset, shiftset, lookaheadset); @@ -275,8 +278,8 @@ print_reductions (FILE *out, state_t *state) fprintf (out, _(" %-4s\treduce using rule %d (%s)\n"), escape (symbols[i]->tag), - LAruleno[state->lookaheadsp + j] - 1, - escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag)); + LArule[state->lookaheadsp + j]->number - 1, + escape2 (LArule[state->lookaheadsp + j]->lhs->tag)); else defaulted = 1; @@ -288,22 +291,22 @@ print_reductions (FILE *out, state_t *state) fprintf (out, _(" %-4s\treduce using rule %d (%s)\n"), escape (symbols[i]->tag), - LAruleno[default_LA] - 1, - escape2 (symbols[rules[LAruleno[default_LA]].lhs]->tag)); + LArule[default_LA]->number - 1, + escape2 (LArule[default_LA]->lhs->tag)); defaulted = 0; fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"), escape (symbols[i]->tag), - LAruleno[state->lookaheadsp + j] - 1, - escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag)); + LArule[state->lookaheadsp + j]->number - 1, + escape2 (LArule[state->lookaheadsp + j]->lhs->tag)); } } } if (default_LA >= 0) fprintf (out, _(" $default\treduce using rule %d (%s)\n"), - default_rule - 1, - escape (symbols[rules[default_rule].lhs]->tag)); + default_rule->number - 1, + escape (default_rule->lhs->tag)); } } @@ -357,35 +360,34 @@ do { \ static void print_grammar (FILE *out) { - int i, j; - short *rule; + token_number_t i; + int j; + item_number_t *rule; char buffer[90]; int column = 0; /* rule # : LHS -> RHS */ fprintf (out, "%s\n\n", _("Grammar")); fprintf (out, " %s\n", _("Number, Line, Rule")); - for (i = 1; i < nrules + 1; i++) - /* Don't print rules disabled in reduce_grammar_tables. */ - if (rules[i].useful) - { - fprintf (out, _(" %3d %3d %s ->"), - i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag)); - rule = rules[i].rhs; - if (*rule >= 0) - while (*rule >= 0) - fprintf (out, " %s", escape (symbols[*rule++]->tag)); - else - fprintf (out, " /* %s */", _("empty")); - fputc ('\n', out); - } + for (j = 1; j < nrules + 1; j++) + { + fprintf (out, _(" %3d %3d %s ->"), + j - 1, rules[j].line, escape (rules[j].lhs->tag)); + rule = rules[j].rhs; + if (*rule >= 0) + while (*rule >= 0) + fprintf (out, " %s", escape (symbols[*rule++]->tag)); + else + fprintf (out, " /* %s */", _("empty")); + fputc ('\n', out); + } fputs ("\n\n", out); /* TERMINAL (type #) : rule #s terminal is on RHS */ fprintf (out, "%s\n\n", _("Terminals, with rules where they appear")); for (i = 0; i < max_user_token_number + 1; i++) - if (token_translations[i] != 2) + if (token_translations[i] != undeftoken->number) { buffer[0] = 0; column = strlen (escape (symbols[token_translations[i]]->tag)); @@ -395,7 +397,7 @@ print_grammar (FILE *out) for (j = 1; j < nrules + 1; j++) for (rule = rules[j].rhs; *rule >= 0; rule++) - if (*rule == token_translations[i]) + if (item_number_as_token_number (*rule) == token_translations[i]) { END_TEST (65); sprintf (buffer + strlen (buffer), " %d", j - 1); @@ -413,10 +415,10 @@ print_grammar (FILE *out) for (j = 1; j < nrules + 1; j++) { - if (rules[j].lhs == i) + if (rules[j].lhs->number == i) left_count++; for (rule = rules[j].rhs; *rule >= 0; rule++) - if (*rule == i) + if (item_number_as_token_number (*rule) == i) { right_count++; break; @@ -437,7 +439,7 @@ print_grammar (FILE *out) for (j = 1; j < nrules + 1; j++) { END_TEST (65); - if (rules[j].lhs == i) + if (rules[j].lhs->number == i) sprintf (buffer + strlen (buffer), " %d", j - 1); } } @@ -451,7 +453,7 @@ print_grammar (FILE *out) for (j = 1; j < nrules + 1; j++) { for (rule = rules[j].rhs; *rule >= 0; rule++) - if (*rule == i) + if (item_number_as_token_number (*rule) == i) { END_TEST (65); sprintf (buffer + strlen (buffer), " %d", j - 1);