#include "reader.h"
#include "print.h"
#include "reduce.h"
+#include "closure.h"
+
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;
#if 0
static void
`--------------------------------*/
static void
-print_core (FILE *out, int state)
+print_core (FILE *out, state_t *state)
{
int i;
- int k;
- int rule;
- core *statep;
- short *sp;
- short *sp1;
-
- statep = state_table[state].state;
- k = statep->nitems;
+ short *sitems = state->items;
+ int snitems = state->nitems;
- if (k == 0)
- return;
+ /* New experimental feature: if TRACE_FLAGS output all the items of
+ a state, not only its kernel. */
+ if (trace_flag)
+ {
+ closure (sitems, snitems);
+ sitems = itemset;
+ snitems = nitemset;
+ }
- for (i = 0; i < k; i++)
+ if (snitems)
{
- sp1 = sp = ritem + statep->items[i];
+ for (i = 0; i < snitems; i++)
+ {
+ short *sp;
+ short *sp1;
+ int rule;
- while (*sp > 0)
- sp++;
+ sp1 = sp = ritem + sitems[i];
- rule = -(*sp);
- fprintf (out, " %s -> ", tags[rlhs[rule]]);
+ while (*sp > 0)
+ sp++;
- for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
- {
- fprintf (out, "%s ", tags[*sp]);
- }
+ rule = -(*sp);
+ fprintf (out, " %s -> ", tags[rule_table[rule].lhs]);
- fputc ('.', out);
+ for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
+ fprintf (out, "%s ", tags[*sp]);
- while (*sp > 0)
- {
- fprintf (out, " %s", tags[*sp]);
- sp++;
+ fputc ('.', out);
+
+ for (/* Nothing */; *sp > 0; ++sp)
+ fprintf (out, " %s", tags[*sp]);
+
+ fprintf (out, _(" (rule %d)"), rule);
+ fputc ('\n', out);
}
- fprintf (out, _(" (rule %d)"), rule);
fputc ('\n', out);
}
+}
+
+
+static void
+print_shifts (FILE *out, state_t *state)
+{
+ int i;
+ shifts *shiftp = state->shifts;
- fputc ('\n', out);
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ if (!SHIFT_IS_DISABLED (shiftp, i))
+ {
+ int state1 = shiftp->shifts[i];
+ int symbol = state_table[state1]->accessing_symbol;
+ fprintf (out,
+ _(" %-4s\tshift, and go to state %d\n"),
+ tags[symbol], state1);
+ }
+
+ if (i > 0)
+ fputc ('\n', out);
}
+
static void
-print_actions (FILE *out, int state)
+print_errs (FILE *out, state_t *state)
{
+ errs *errp = state->errs;
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];
-
- if (!shiftp && !redp)
- {
- if (final_state == state)
- fprintf (out, _(" $default\taccept\n"));
- else
- fprintf (out, _(" NO ACTIONS\n"));
- return;
- }
- if (shiftp)
- {
- k = shiftp->nshifts;
+ for (i = 0; i < errp->nerrs; ++i)
+ if (errp->errs[i])
+ fprintf (out, _(" %-4s\terror (nonassociative)\n"),
+ tags[errp->errs[i]]);
- for (i = 0; i < k; i++)
- {
- if (!shiftp->shifts[i])
- continue;
- state1 = shiftp->shifts[i];
- symbol = state_table[state1].accessing_symbol;
- /* The following line used to be turned off. */
- if (ISVAR (symbol))
- break;
- if (symbol == 0) /* I.e. strcmp(tags[symbol],"$")==0 */
- fprintf (out,
- _(" $ \tgo to state %d\n"), state1);
- else
- fprintf (out,
- _(" %-4s\tshift, and go to state %d\n"),
- tags[symbol], state1);
- }
+ if (i > 0)
+ fputc ('\n', out);
+}
- if (i > 0)
- fputc ('\n', out);
- }
- else
- {
- i = 0;
- k = 0;
- }
- if (errp)
- {
- int j, nerrs;
+static void
+print_gotos (FILE *out, state_t *state)
+{
+ int i;
+ shifts *shiftp = state->shifts;
- nerrs = errp->nerrs;
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ /* Skip token shifts. */;
- for (j = 0; j < nerrs; j++)
- {
- if (!errp->errs[j])
- continue;
- symbol = errp->errs[j];
- fprintf (out, _(" %-4s\terror (nonassociative)\n"),
- tags[symbol]);
- }
+ if (i < shiftp->nshifts)
+ {
+ for (; i < shiftp->nshifts; i++)
+ if (!SHIFT_IS_DISABLED (shiftp, i))
+ {
+ int state1 = shiftp->shifts[i];
+ int symbol = state_table[state1]->accessing_symbol;
+ fprintf (out, _(" %-4s\tgo to state %d\n"),
+ tags[symbol], state1);
+ }
- if (j > 0)
- fputc ('\n', out);
+ fputc ('\n', out);
}
+}
- if (consistent[state] && redp)
+static void
+print_reductions (FILE *out, state_t *state)
+{
+ int i;
+ shifts *shiftp = state->shifts;
+ reductions *redp = state->reductions;
+ errs *errp = state->errs;
+ int nodefault = 0;
+
+ if (state->consistent)
{
- 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]);
+ return;
}
- else if (redp)
+
+ for (i = 0; i < tokensetsize; i++)
+ shiftset[i] = 0;
+
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ if (!SHIFT_IS_DISABLED (shiftp, i))
+ {
+ /* if this state has a shift for the error token, don't use a
+ default rule. */
+ if (SHIFT_IS_ERROR (shiftp, i))
+ nodefault = 1;
+ SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+ }
+
+ for (i = 0; i < errp->nerrs; i++)
+ if (errp->errs[i])
+ SETBIT (shiftset, errp->errs[i]);
+
+ if (state->nlookaheads == 1 && !nodefault)
{
- print_reductions (out, state);
- }
+ int k;
+ int default_rule = LAruleno[state->lookaheadsp];
+
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
- if (i < k)
+ for (i = 0; i < ntokens; i++)
+ if (BITISSET (lookaheadset, i))
+ fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
+ tags[i], default_rule,
+ tags[rule_table[default_rule].lhs]);
+
+ fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
+ default_rule, tags[rule_table[default_rule].lhs]);
+ }
+ else if (state->nlookaheads >= 1)
{
- for (; i < k; i++)
+ int cmax = 0;
+ int default_LA = -1;
+ int default_rule = 0;
+
+ if (!nodefault)
+ for (i = 0; i < state->nlookaheads; ++i)
+ {
+ int count = 0;
+ int j, k;
+
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
+
+ for (j = 0; j < ntokens; j++)
+ if (BITISSET (lookaheadset, j))
+ count++;
+
+ if (count > cmax)
+ {
+ cmax = count;
+ default_LA = state->lookaheadsp + i;
+ default_rule = LAruleno[state->lookaheadsp + i];
+ }
+
+ for (k = 0; k < tokensetsize; ++k)
+ shiftset[k] |= lookaheadset[k];
+ }
+
+ for (i = 0; i < tokensetsize; i++)
+ shiftset[i] = 0;
+
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ if (!SHIFT_IS_DISABLED (shiftp, i))
+ SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+
+ for (i = 0; i < ntokens; i++)
{
- if (!shiftp->shifts[i])
- continue;
- state1 = shiftp->shifts[i];
- symbol = state_table[state1].accessing_symbol;
- fprintf (out, _(" %-4s\tgo to state %d\n"),
- tags[symbol], state1);
+ int j;
+ int defaulted = 0;
+ int count = BITISSET (shiftset, i);
+
+ for (j = 0; j < state->nlookaheads; ++j)
+ {
+ if (BITISSET (LA (state->lookaheadsp + j), i))
+ {
+ if (count == 0)
+ {
+ if (state->lookaheadsp + j != default_LA)
+ fprintf (out,
+ _(" %-4s\treduce using rule %d (%s)\n"),
+ tags[i],
+ LAruleno[state->lookaheadsp + j],
+ tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]);
+ else
+ defaulted = 1;
+
+ count++;
+ }
+ else
+ {
+ if (defaulted)
+ fprintf (out,
+ _(" %-4s\treduce using rule %d (%s)\n"),
+ tags[i],
+ LAruleno[default_LA],
+ tags[rule_table[LAruleno[default_LA]].lhs]);
+ defaulted = 0;
+ fprintf (out,
+ _(" %-4s\t[reduce using rule %d (%s)]\n"),
+ tags[i],
+ LAruleno[state->lookaheadsp + j],
+ tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]);
+ }
+ }
+ }
}
- fputc ('\n', out);
+ if (default_LA >= 0)
+ fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
+ default_rule, tags[rule_table[default_rule].lhs]);
}
}
+
static void
-print_state (FILE *out, int state)
+print_actions (FILE *out, state_t *state)
{
- fputs ("\n\n", out);
- fprintf (out, _("state %d"), state);
+ reductions *redp = state->reductions;
+ shifts *shiftp = state->shifts;
+
+ if (!shiftp->nshifts && !redp)
+ {
+ if (final_state == state->number)
+ fprintf (out, _(" $default\taccept\n"));
+ else
+ fprintf (out, _(" NO ACTIONS\n"));
+ return;
+ }
+
+ print_shifts (out, state);
+ print_errs (out, state);
+ if (redp)
+ print_reductions (out, state);
+ print_gotos (out, state);
+}
+
+static void
+print_state (FILE *out, state_t *state)
+{
+ fprintf (out, _("state %d"), state->number);
fputs ("\n\n", out);
print_core (out, state);
print_actions (out, state);
+ fputs ("\n\n", out);
}
\f
/*-----------------------------------------.
int column = 0;
/* rule # : LHS -> RHS */
- fprintf (out, "\n%s\n\n", _("Grammar"));
+ fprintf (out, "%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].useful)
{
- 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 */", _("empty"));
+ fprintf (out, " /* %s */", _("empty"));
fputc ('\n', out);
}
+ fputs ("\n\n", out);
+
/* TERMINAL (type #) : rule #s terminal is on RHS */
- fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+ fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
fprintf (out, "%s (-1)\n", tags[0]);
for (i = 0; i <= max_user_token_number; i++)
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);
}
fprintf (out, "%s\n", buffer);
}
+ fputs ("\n\n", out);
+
- fprintf (out, "\n%s\n\n",
- _("Nonterminals, with rules where they appear"));
+ fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
for (i = ntokens; i <= nsyms - 1; i++)
{
int left_count = 0, right_count = 0;
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++;
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);
}
}
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);
}
fprintf (out, "%s\n", buffer);
}
+ fputs ("\n\n", out);
}
\f
void
print_results (void)
{
- if (verbose_flag)
- {
- int i;
-
- /* We used to use just .out if spec_name_prefix (-p) was used, but
- that conflicts with Posix. */
- FILE *out = xfopen (spec_verbose_file, "w");
-
- size_t size = obstack_object_size (&output_obstack);
- fwrite (obstack_finish (&output_obstack), 1, size, out);
-
- reduce_output (out);
- conflicts_output (out);
-
- print_grammar (out);
+ int i;
- for (i = 0; i < nstates; i++)
- print_state (out, i);
+ /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
+ that conflicts with Posix. */
+ FILE *out = xfopen (spec_verbose_file, "w");
- xfclose (out);
- }
+ size_t size = obstack_object_size (&output_obstack);
+ fwrite (obstack_finish (&output_obstack), 1, size, out);
obstack_free (&output_obstack, NULL);
+
+ if (size)
+ fputs ("\n\n", out);
+
+ reduce_output (out);
+ conflicts_output (out);
+
+ print_grammar (out);
+
+ /* New experimental feature: output all the items of a state, not
+ only its kernel. Requires to run closure, which need memory
+ allocation/deallocation. */
+ if (trace_flag)
+ new_closure (nitems);
+ /* Storage for print_reductions. */
+ shiftset = XCALLOC (unsigned, tokensetsize);
+ lookaheadset = XCALLOC (unsigned, tokensetsize);
+ for (i = 0; i < nstates; i++)
+ print_state (out, state_table[i]);
+ free (shiftset);
+ free (lookaheadset);
+ if (trace_flag)
+ free_closure ();
+
+ xfclose (out);
}
projects / bison.git / blobdiff