/* Print information on generated parser, for bison,
- Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1984, 1986, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
#include "system.h"
#include "quotearg.h"
#include "files.h"
+#include "symtab.h"
#include "gram.h"
#include "LR0.h"
#include "lalr.h"
#include "print.h"
#include "reduce.h"
#include "closure.h"
+#include "bitset.h"
-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;
+static bitset shiftset;
+static bitset lookaheadset;
#if 0
static void
sp1 = sp = ritem + sitems[i];
- while (*sp > 0)
+ while (*sp >= 0)
sp++;
rule = -(*sp);
- fprintf (out, " %s -> ", escape (tags[rule_table[rule].lhs]));
+ fprintf (out, " %s -> ", escape (symbols[rules[rule].lhs]->tag));
- for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
- fprintf (out, "%s ", escape (tags[*sp]));
+ for (sp = rules[rule].rhs; sp < sp1; sp++)
+ fprintf (out, "%s ", escape (symbols[*sp]->tag));
fputc ('.', out);
- for (/* Nothing */; *sp > 0; ++sp)
- fprintf (out, " %s", escape (tags[*sp]));
+ for (/* Nothing */; *sp >= 0; ++sp)
+ fprintf (out, " %s", escape (symbols[*sp]->tag));
- fprintf (out, _(" (rule %d)"), rule);
+ fprintf (out, _(" (rule %d)"), rule - 1);
fputc ('\n', out);
}
if (!SHIFT_IS_DISABLED (shiftp, i))
{
int state1 = shiftp->shifts[i];
- int symbol = state_table[state1]->accessing_symbol;
+ int symbol = states[state1]->accessing_symbol;
fprintf (out,
_(" %-4s\tshift, and go to state %d\n"),
- escape (tags[symbol]), state1);
+ escape (symbols[symbol]->tag), state1);
}
if (i > 0)
for (i = 0; i < errp->nerrs; ++i)
if (errp->errs[i])
fprintf (out, _(" %-4s\terror (nonassociative)\n"),
- escape (tags[errp->errs[i]]));
+ escape (symbols[errp->errs[i]]->tag));
if (i > 0)
fputc ('\n', out);
if (!SHIFT_IS_DISABLED (shiftp, i))
{
int state1 = shiftp->shifts[i];
- int symbol = state_table[state1]->accessing_symbol;
+ int symbol = states[state1]->accessing_symbol;
fprintf (out, _(" %-4s\tgo to state %d\n"),
- escape (tags[symbol]), state1);
+ escape (symbols[symbol]->tag), state1);
}
fputc ('\n', out);
if (state->consistent)
{
int rule = redp->rules[0];
- int symbol = rule_table[rule].lhs;
+ int symbol = rules[rule].lhs;
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
- rule, escape (tags[symbol]));
+ rule - 1, escape (symbols[symbol]->tag));
return;
}
- for (i = 0; i < tokensetsize; i++)
- shiftset[i] = 0;
+ bitset_zero (shiftset);
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
if (!SHIFT_IS_DISABLED (shiftp, i))
default rule. */
if (SHIFT_IS_ERROR (shiftp, i))
nodefault = 1;
- SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+ bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
}
for (i = 0; i < errp->nerrs; i++)
if (errp->errs[i])
- SETBIT (shiftset, errp->errs[i]);
+ bitset_set (shiftset, errp->errs[i]);
if (state->nlookaheads == 1 && !nodefault)
{
- int k;
int default_rule = LAruleno[state->lookaheadsp];
- for (k = 0; k < tokensetsize; ++k)
- lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+ bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);
for (i = 0; i < ntokens; i++)
- if (BITISSET (lookaheadset, i))
+ if (bitset_test (lookaheadset, i))
fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
- escape (tags[i]), default_rule,
- escape2 (tags[rule_table[default_rule].lhs]));
+ escape (symbols[i]->tag), default_rule - 1,
+ escape2 (symbols[rules[default_rule].lhs]->tag));
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
- default_rule, escape (tags[rule_table[default_rule].lhs]));
+ default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag));
}
else if (state->nlookaheads >= 1)
{
for (i = 0; i < state->nlookaheads; ++i)
{
int count = 0;
- int j, k;
+ int j;
- for (k = 0; k < tokensetsize; ++k)
- lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
+ bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);
for (j = 0; j < ntokens; j++)
- if (BITISSET (lookaheadset, j))
+ if (bitset_test (lookaheadset, j))
count++;
if (count > cmax)
default_rule = LAruleno[state->lookaheadsp + i];
}
- for (k = 0; k < tokensetsize; ++k)
- shiftset[k] |= lookaheadset[k];
+ bitset_or (shiftset, shiftset, lookaheadset);
}
- for (i = 0; i < tokensetsize; i++)
- shiftset[i] = 0;
+ bitset_zero (shiftset);
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
if (!SHIFT_IS_DISABLED (shiftp, i))
- SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+ bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
for (i = 0; i < ntokens; i++)
{
int j;
int defaulted = 0;
- int count = BITISSET (shiftset, i);
+ int count = bitset_test (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"),
- escape (tags[i]),
- LAruleno[state->lookaheadsp + j],
- escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
- else
- defaulted = 1;
-
- count++;
- }
- else
- {
- if (defaulted)
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- escape (tags[i]),
- LAruleno[default_LA],
- escape2 (tags[rule_table[LAruleno[default_LA]].lhs]));
- defaulted = 0;
+ if (bitset_test (LA[state->lookaheadsp + j], i))
+ {
+ if (count == 0)
+ {
+ if (state->lookaheadsp + j != default_LA)
fprintf (out,
- _(" %-4s\t[reduce using rule %d (%s)]\n"),
- escape (tags[i]),
- LAruleno[state->lookaheadsp + j],
- escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
- }
- }
- }
+ _(" %-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));
+ else
+ defaulted = 1;
+
+ count++;
+ }
+ else
+ {
+ if (defaulted)
+ 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));
+ 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));
+ }
+ }
}
if (default_LA >= 0)
fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
- default_rule, escape (tags[rule_table[default_rule].lhs]));
+ default_rule - 1,
+ escape (symbols[rules[default_rule].lhs]->tag));
}
}
if (shiftp->nshifts == 0 && redp->nreds == 0)
{
if (final_state == state->number)
- fprintf (out, _(" $default\taccept\n"));
+ fprintf (out, _(" $default\taccept\n"));
else
- fprintf (out, _(" NO ACTIONS\n"));
+ fprintf (out, _(" NO ACTIONS\n"));
return;
}
/* rule # : LHS -> RHS */
fprintf (out, "%s\n\n", _("Grammar"));
fprintf (out, " %s\n", _("Number, Line, Rule"));
- for (i = 1; i <= nrules; i++)
+ for (i = 1; i < nrules + 1; i++)
/* Don't print rules disabled in reduce_grammar_tables. */
- if (rule_table[i].useful)
+ if (rules[i].useful)
{
fprintf (out, _(" %3d %3d %s ->"),
- i, rule_table[i].line, escape (tags[rule_table[i].lhs]));
- rule = &ritem[rule_table[i].rhs];
- if (*rule > 0)
- while (*rule > 0)
- fprintf (out, " %s", escape (tags[*rule++]));
+ 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);
/* TERMINAL (type #) : rule #s terminal is on RHS */
fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
- fprintf (out, "%s (-1)\n", escape (tags[0]));
-
- for (i = 0; i <= max_user_token_number; i++)
+ for (i = 0; i < max_user_token_number + 1; i++)
if (token_translations[i] != 2)
{
buffer[0] = 0;
- column = strlen (escape (tags[token_translations[i]]));
- fputs (escape (tags[token_translations[i]]), out);
+ column = strlen (escape (symbols[token_translations[i]]->tag));
+ fputs (escape (symbols[token_translations[i]]->tag), out);
END_TEST (50);
sprintf (buffer, " (%d)", i);
- for (j = 1; j <= nrules; j++)
- for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+ for (j = 1; j < nrules + 1; j++)
+ for (rule = rules[j].rhs; *rule >= 0; rule++)
if (*rule == token_translations[i])
{
END_TEST (65);
- sprintf (buffer + strlen (buffer), " %d", j);
+ sprintf (buffer + strlen (buffer), " %d", j - 1);
break;
}
fprintf (out, "%s\n", buffer);
fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
- for (i = ntokens; i <= nsyms - 1; i++)
+ for (i = ntokens; i < nsyms; i++)
{
int left_count = 0, right_count = 0;
- for (j = 1; j <= nrules; j++)
+ for (j = 1; j < nrules + 1; j++)
{
- if (rule_table[j].lhs == i)
+ if (rules[j].lhs == i)
left_count++;
- for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+ for (rule = rules[j].rhs; *rule >= 0; rule++)
if (*rule == i)
{
right_count++;
}
buffer[0] = 0;
- fputs (escape (tags[i]), out);
- column = strlen (escape (tags[i]));
+ fputs (escape (symbols[i]->tag), out);
+ column = strlen (escape (symbols[i]->tag));
sprintf (buffer, " (%d)", i);
END_TEST (0);
END_TEST (50);
sprintf (buffer + strlen (buffer), _(" on left:"));
- for (j = 1; j <= nrules; j++)
+ for (j = 1; j < nrules + 1; j++)
{
END_TEST (65);
- if (rule_table[j].lhs == i)
- sprintf (buffer + strlen (buffer), " %d", j);
+ if (rules[j].lhs == i)
+ sprintf (buffer + strlen (buffer), " %d", j - 1);
}
}
sprintf (buffer + strlen (buffer), ",");
END_TEST (50);
sprintf (buffer + strlen (buffer), _(" on right:"));
- for (j = 1; j <= nrules; j++)
+ for (j = 1; j < nrules + 1; j++)
{
- for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+ for (rule = rules[j].rhs; *rule >= 0; rule++)
if (*rule == i)
{
END_TEST (65);
- sprintf (buffer + strlen (buffer), " %d", j);
+ sprintf (buffer + strlen (buffer), " %d", j - 1);
break;
}
}
void
print_results (void)
{
- int i;
+ size_t i;
/* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
that conflicts with Posix. */
only its kernel. Requires to run closure, which need memory
allocation/deallocation. */
if (trace_flag)
- new_closure (nitems);
+ new_closure (nritems);
/* Storage for print_reductions. */
- shiftset = XCALLOC (unsigned, tokensetsize);
- lookaheadset = XCALLOC (unsigned, tokensetsize);
+ shiftset = bitset_create (ntokens, BITSET_FIXED);
+ lookaheadset = bitset_create (ntokens, BITSET_FIXED);
for (i = 0; i < nstates; i++)
- print_state (out, state_table[i]);
- free (shiftset);
- free (lookaheadset);
+ print_state (out, states[i]);
+ bitset_free (shiftset);
+ bitset_free (lookaheadset);
if (trace_flag)
free_closure ();
projects / bison.git / blobdiff