#endif
\f
+
+/*---------------------------------------.
+| *WIDTH := max (*WIDTH, strlen (STR)). |
+`---------------------------------------*/
+
+static void
+max_length (size_t *width, const char *str)
+{
+ size_t len = strlen (str);
+ if (len > *width)
+ *width = len;
+}
+
/*--------------------------------.
| Report information on a state. |
`--------------------------------*/
if (!snritems)
return;
+ fputc ('\n', out);
+
for (i = 0; i < snritems; i++)
{
item_number_t *sp;
previous_lhs = rules[rule].lhs;
for (sp = rules[rule].rhs; sp < sp1; sp++)
- fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
+ fprintf (out, " %s", symbols[*sp]->tag);
fputs (" .", out);
for (/* Nothing */; *sp >= 0; ++sp)
- fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
+ fprintf (out, " %s", symbols[*sp]->tag);
/* Display the lookaheads? */
if (report_flag & report_lookaheads)
fputc ('\n', out);
}
-
- fputc ('\n', out);
}
+/*----------------------------------------------------------------.
+| Report the shifts iff DISPLAY_SHIFTS_P or the gotos of STATE on |
+| OUT. |
+`----------------------------------------------------------------*/
+
static void
-print_shifts (FILE *out, state_t *state)
+print_transitions (state_t *state, FILE *out, bool display_transitions_p)
{
+ transitions_t *transitions = state->transitions;
+ size_t width = 0;
int i;
- shifts_t *shiftp = state->shifts;
- for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
- if (!SHIFT_IS_DISABLED (shiftp, i))
+ /* Compute the width of the lookaheads column. */
+ for (i = 0; i < transitions->num; i++)
+ if (!TRANSITION_IS_DISABLED (transitions, i)
+ && TRANSITION_IS_SHIFT (transitions, i) == display_transitions_p)
{
- state_number_t state1 = shiftp->shifts[i];
- symbol_number_t symbol = states[state1]->accessing_symbol;
- fprintf (out,
- _(" %-4s\tshift, and go to state %d\n"),
- symbol_tag_get (symbols[symbol]), state1);
+ symbol_t *symbol = symbols[TRANSITION_SYMBOL (transitions, i)];
+ max_length (&width, symbol->tag);
}
- if (i > 0)
- fputc ('\n', out);
+ /* Nothing to report. */
+ if (!width)
+ return;
+
+ fputc ('\n', out);
+ width += 2;
+
+ /* Report lookaheads and shifts. */
+ for (i = 0; i < transitions->num; i++)
+ if (!TRANSITION_IS_DISABLED (transitions, i)
+ && TRANSITION_IS_SHIFT (transitions, i) == display_transitions_p)
+ {
+ symbol_t *symbol = symbols[TRANSITION_SYMBOL (transitions, i)];
+ const char *tag = symbol->tag;
+ state_number_t state1 = transitions->states[i];
+ int j;
+
+ fprintf (out, " %s", tag);
+ for (j = width - strlen (tag); j > 0; --j)
+ fputc (' ', out);
+ if (display_transitions_p)
+ fprintf (out, _("shift, and go to state %d\n"), state1);
+ else
+ fprintf (out, _("go to state %d\n"), state1);
+ }
}
+/*------------------------------------------------------------.
+| Report the explicit errors of STATE raised from %nonassoc. |
+`------------------------------------------------------------*/
+
static void
print_errs (FILE *out, state_t *state)
{
errs_t *errp = state->errs;
+ size_t width = 0;
int i;
- for (i = 0; i < errp->nerrs; ++i)
- if (errp->errs[i])
- fprintf (out, _(" %-4s\terror (nonassociative)\n"),
- symbol_tag_get (symbols[errp->errs[i]]));
+ /* Compute the width of the lookaheads column. */
+ for (i = 0; i < errp->num; ++i)
+ if (errp->symbols[i])
+ max_length (&width, symbols[errp->symbols[i]]->tag);
- if (i > 0)
- fputc ('\n', out);
-}
-
-
-static void
-print_gotos (FILE *out, state_t *state)
-{
- int i;
- shifts_t *shiftp = state->shifts;
-
- for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
- /* Skip token shifts. */;
+ /* Nothing to report. */
+ if (!width)
+ return;
- if (i < shiftp->nshifts)
- {
- for (; i < shiftp->nshifts; i++)
- if (!SHIFT_IS_DISABLED (shiftp, i))
- {
- state_number_t state1 = shiftp->shifts[i];
- symbol_number_t symbol = states[state1]->accessing_symbol;
- fprintf (out, _(" %-4s\tgo to state %d\n"),
- symbol_tag_get (symbols[symbol]), state1);
- }
+ fputc ('\n', out);
+ width += 2;
- fputc ('\n', out);
- }
+ /* Report lookaheads and errors. */
+ for (i = 0; i < errp->num; ++i)
+ if (errp->symbols[i])
+ {
+ const char *tag = symbols[errp->symbols[i]]->tag;
+ int j;
+ fprintf (out, " %s", tag);
+ for (j = width - strlen (tag); j > 0; --j)
+ fputc (' ', out);
+ fputs (_("error (nonassociative)\n"), out);
+ }
}
`----------------------------------------------------------*/
static rule_t *
-state_default_rule_compute (state_t *state)
+state_default_rule (state_t *state)
{
reductions_t *redp = state->reductions;
rule_t *default_rule = NULL;
we shift (S/R conflicts)... */
bitset_zero (shiftset);
{
- shifts_t *shiftp = state->shifts;
- for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
- if (!SHIFT_IS_DISABLED (shiftp, i))
+ transitions_t *transitions = state->transitions;
+ for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++)
+ if (!TRANSITION_IS_DISABLED (transitions, i))
{
/* If this state has a shift for the error token, don't use a
default rule. */
- if (SHIFT_IS_ERROR (shiftp, i))
+ if (TRANSITION_IS_ERROR (transitions, i))
return NULL;
- bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
+ bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));
}
}
we raise an error (due to %nonassoc). */
{
errs_t *errp = state->errs;
- for (i = 0; i < errp->nerrs; i++)
- if (errp->errs[i])
- bitset_set (shiftset, errp->errs[i]);
+ for (i = 0; i < errp->num; i++)
+ if (errp->symbols[i])
+ bitset_set (shiftset, errp->symbols[i]);
}
for (i = 0; i < state->nlookaheads; ++i)
}
+/*--------------------------------------------------------------------.
+| Report a reduction of RULE on LOOKAHEADS (which can be `default'). |
+| If not ENABLED, the rule is masked by a shift or a reduce (S/R and |
+| R/R conflicts). |
+`--------------------------------------------------------------------*/
+
+static void
+print_reduction (FILE *out, size_t width,
+ const char *lookahead,
+ rule_t *rule, bool enabled)
+{
+ int j;
+ fprintf (out, " %s", lookahead);
+ for (j = width - strlen (lookahead); j > 0; --j)
+ fputc (' ', out);
+ if (!enabled)
+ fputc ('[', out);
+ fprintf (out, _("reduce using rule %d (%s)"),
+ rule->number - 1, rule->lhs->tag);
+ if (!enabled)
+ fputc (']', out);
+ fputc ('\n', out);
+}
+
+
/*----------------------------------------------------.
| Report on OUT the reduction actions of this STATE. |
`----------------------------------------------------*/
static void
print_reductions (FILE *out, state_t *state)
{
- int i;
- shifts_t *shiftp = state->shifts;
+ transitions_t *transitions = state->transitions;
reductions_t *redp = state->reductions;
rule_t *default_rule = NULL;
+ size_t width = 0;
+ int i, j;
- if (redp->nreds == 0)
+ if (redp->num == 0)
return;
- default_rule = state_default_rule_compute (state);
+ default_rule = state_default_rule (state);
bitset_zero (shiftset);
- for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
- if (!SHIFT_IS_DISABLED (shiftp, i))
- bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
+ for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++)
+ if (!TRANSITION_IS_DISABLED (transitions, i))
+ bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));
+
+ /* Compute the width of the lookaheads column. */
+ if (default_rule)
+ width = strlen (_("$default"));
+ for (i = 0; i < ntokens; i++)
+ {
+ int count = bitset_test (shiftset, i);
+
+ for (j = 0; j < state->nlookaheads; ++j)
+ if (bitset_test (state->lookaheads[j], i))
+ {
+ if (count == 0)
+ {
+ if (state->lookaheads_rule[j] != default_rule)
+ max_length (&width, symbols[i]->tag);
+ count++;
+ }
+ else
+ {
+ max_length (&width, symbols[i]->tag);
+ }
+ }
+ }
+
+ /* Nothing to report. */
+ if (!width)
+ return;
+
+ fputc ('\n', out);
+ width += 2;
+ /* Report lookaheads (or $default) and reductions. */
for (i = 0; i < ntokens; i++)
{
- int j;
int defaulted = 0;
int count = bitset_test (shiftset, i);
if (count == 0)
{
if (state->lookaheads_rule[j] != default_rule)
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- symbol_tag_get (symbols[i]),
- state->lookaheads_rule[j]->number - 1,
- symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));
+ print_reduction (out, width,
+ symbols[i]->tag,
+ state->lookaheads_rule[j], TRUE);
else
defaulted = 1;
count++;
else
{
if (defaulted)
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- symbol_tag_get (symbols[i]),
- default_rule->number - 1,
- symbol_tag_get_n (default_rule->lhs, 1));
+ print_reduction (out, width,
+ symbols[i]->tag,
+ default_rule, TRUE);
defaulted = 0;
- fprintf (out,
- _(" %-4s\t[reduce using rule %d (%s)]\n"),
- symbol_tag_get (symbols[i]),
- state->lookaheads_rule[j]->number - 1,
- symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));
+ print_reduction (out, width,
+ symbols[i]->tag,
+ state->lookaheads_rule[j], FALSE);
}
}
}
if (default_rule)
- fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
- default_rule->number - 1,
- symbol_tag_get (default_rule->lhs));
- fputc ('\n', out);
+ print_reduction (out, width,
+ _("$default"), default_rule, TRUE);
}
print_actions (FILE *out, state_t *state)
{
reductions_t *redp = state->reductions;
- shifts_t *shiftp = state->shifts;
+ transitions_t *transitions = state->transitions;
- if (shiftp->nshifts == 0 && redp->nreds == 0)
+ if (transitions->num == 0 && redp->num == 0)
{
+ fputc ('\n', out);
if (state->number == final_state->number)
fprintf (out, _(" $default\taccept\n"));
else
return;
}
- print_shifts (out, state);
+ /* Print shifts. */
+ print_transitions (state, out, TRUE);
print_errs (out, state);
print_reductions (out, state);
- print_gotos (out, state);
+ /* Print gotos. */
+ print_transitions (state, out, FALSE);
}
+/*--------------------------------------.
+| Report all the data on STATE on OUT. |
+`--------------------------------------*/
+
static void
print_state (FILE *out, state_t *state)
{
- fprintf (out, _("state %d"), state->number);
fputs ("\n\n", out);
+ fprintf (out, _("state %d"), state->number);
+ fputc ('\n', out);
print_core (out, state);
print_actions (out, state);
if ((report_flag & report_solved_conflicts)
&& state->solved_conflicts)
fputs (state->solved_conflicts, out);
- fputs ("\n\n", out);
}
\f
/*-----------------------------------------.
for (i = 0; i < max_user_token_number + 1; i++)
if (token_translations[i] != undeftoken->number)
{
- const char *tag = symbol_tag_get (symbols[token_translations[i]]);
+ const char *tag = symbols[token_translations[i]]->tag;
rule_number_t r;
item_number_t *rhsp;
{
int left_count = 0, right_count = 0;
rule_number_t r;
- const char *tag = symbol_tag_get (symbols[i]);
+ const char *tag = symbols[i]->tag;
for (r = 1; r < nrules + 1; r++)
{
}
fprintf (out, "%s\n", buffer);
}
- fputs ("\n\n", out);
}
\f
void
projects / bison.git / blobdiff