#include "reader.h"
#include "print.h"
#include "reduce.h"
+#include "closure.h"
#if 0
static void
print_core (FILE *out, int state)
{
int i;
- core *statep = state_table[state].state;
+ short *sitems = state_table[state]->items;
+ int snitems = state_table[state]->nitems;
- if (!statep->nitems)
- 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 < statep->nitems; i++)
+ if (snitems)
{
- short *sp;
- short *sp1;
- int rule;
+ for (i = 0; i < snitems; i++)
+ {
+ short *sp;
+ short *sp1;
+ int rule;
+
+ sp1 = sp = ritem + sitems[i];
- sp1 = sp = ritem + statep->items[i];
+ while (*sp > 0)
+ sp++;
- while (*sp > 0)
- sp++;
+ rule = -(*sp);
+ fprintf (out, " %s -> ", tags[rule_table[rule].lhs]);
- rule = -(*sp);
- fprintf (out, " %s -> ", tags[rule_table[rule].lhs]);
+ for (sp = ritem + rule_table[rule].rhs; 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);
- fputc ('.', out);
+ for (/* Nothing */; *sp > 0; ++sp)
+ fprintf (out, " %s", tags[*sp]);
- 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);
}
-
- fputc ('\n', out);
}
static void
print_actions (FILE *out, int state)
{
int i;
- int k;
- shifts *shiftp = state_table[state].shift_table;
- reductions *redp = state_table[state].reduction_table;
- errs *errp = err_table[state];
+ shifts *shiftp = state_table[state]->shifts;
+ reductions *redp = state_table[state]->reductions;
+ errs *errp = state_table[state]->errs;
- if (!shiftp && !redp)
+ if (!shiftp->nshifts && !redp)
{
if (final_state == state)
fprintf (out, _(" $default\taccept\n"));
return;
}
- if (shiftp)
- {
- k = shiftp->nshifts;
+ 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);
+ }
- for (i = 0; i < k; i++)
- {
- int symbol;
- int state1 = shiftp->shifts[i];
- if (!state1)
- continue;
- 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);
- }
- else
- {
- i = 0;
- k = 0;
- }
+ if (i > 0)
+ fputc ('\n', out);
if (errp)
{
fputc ('\n', out);
}
- if (state_table[state].consistent && redp)
+ if (state_table[state]->consistent && redp)
{
int rule = redp->rules[0];
int symbol = rule_table[rule].lhs;
print_reductions (out, state);
}
- if (i < k)
+ if (i < shiftp->nshifts)
{
- for (; i < k; i++)
- {
- int symbol;
- int state1 = shiftp->shifts[i];
- if (!state1)
- continue;
- symbol = state_table[state1].accessing_symbol;
- fprintf (out, _(" %-4s\tgo to state %d\n"),
- tags[symbol], state1);
- }
+ 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);
+ }
fputc ('\n', out);
}
static void
print_state (FILE *out, int state)
{
- fputs ("\n\n", out);
fprintf (out, _("state %d"), state);
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 (rule_table[i].lhs >= 0)
+ if (rule_table[i].useful)
{
- 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);
}
+ 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++)
}
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;
}
fprintf (out, "%s\n", buffer);
}
+ fputs ("\n\n", out);
}
\f
void
{
int i;
- /* We used to use just .out if spec_name_prefix (-p) was used, but
+ /* 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);
+ 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);
for (i = 0; i < nstates; i++)
print_state (out, i);
+ if (trace_flag)
+ free_closure ();
xfclose (out);
}
projects / bison.git / blobdiff