`useless', but no warning should be issued). */
static bitset V1;
-static int nuseful_productions;
-static int nuseless_productions;
+static rule_number_t nuseful_productions;
+rule_number_t nuseless_productions;
static int nuseful_nonterminals;
-int nuseless_nonterminals;
+symbol_number_t nuseless_nonterminals;
\f
/*-------------------------------------------------------------------.
| Another way to do this would be with a set for each production and |
`-------------------------------------------------------------------*/
static bool
-useful_production (int i, bitset N0)
+useful_production (rule_number_t r, bitset N0)
{
- item_number_t *r;
- short n;
+ item_number_t *rhsp;
/* A production is useful if all of the nonterminals in its appear
in the set of useful nonterminals. */
- for (r = rules[i].rhs; *r >= 0; r++)
- if (ISVAR (n = *r) && !bitset_test (N0, n - ntokens))
- return FALSE;
- return TRUE;
+ for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+ if (ISVAR (*rhsp) && !bitset_test (N0, *rhsp - ntokens))
+ return false;
+ return true;
}
useless_nonterminals (void)
{
bitset Np, Ns;
- int i;
+ rule_number_t r;
/* N is set as built. Np is set being built this iteration. P is
set of all productions which have a RHS all in N. */
while (1)
{
bitset_copy (Np, N);
- for (i = 1; i < nrules + 1; i++)
- if (!bitset_test (P, i)
- && useful_production (i, N))
+ for (r = 0; r < nrules; r++)
+ if (!bitset_test (P, r)
+ && useful_production (r, N))
{
- bitset_set (Np, rules[i].lhs->number - ntokens);
- bitset_set (P, i);
+ bitset_set (Np, rules[r].lhs->number - ntokens);
+ bitset_set (P, r);
}
if (bitset_equal_p (N, Np))
break;
inaccessable_symbols (void)
{
bitset Vp, Vs, Pp;
- int i;
- short t;
- item_number_t *r;
/* Find out which productions are reachable and which symbols are
used. Starting with an empty set of productions and a set of
user can know. */
Vp = bitset_create (nsyms, BITSET_FIXED);
- Pp = bitset_create (nrules + 1, BITSET_FIXED);
+ Pp = bitset_create (nrules, BITSET_FIXED);
/* If the start symbol isn't useful, then nothing will be useful. */
- if (bitset_test (N, start_symbol - ntokens))
+ if (bitset_test (N, accept->number - ntokens))
{
- bitset_set (V, start_symbol);
+ bitset_set (V, accept->number);
while (1)
{
+ rule_number_t r;
bitset_copy (Vp, V);
- for (i = 1; i < nrules + 1; i++)
+ for (r = 0; r < nrules; r++)
{
- if (!bitset_test (Pp, i)
- && bitset_test (P, i)
- && bitset_test (V, rules[i].lhs->number))
+ if (!bitset_test (Pp, r)
+ && bitset_test (P, r)
+ && bitset_test (V, rules[r].lhs->number))
{
- for (r = rules[i].rhs; *r >= 0; r++)
- if (ISTOKEN (t = *r) || bitset_test (N, t - ntokens))
- bitset_set (Vp, t);
- bitset_set (Pp, i);
+ item_number_t *rhsp;
+ for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+ if (ISTOKEN (*rhsp) || bitset_test (N, *rhsp - ntokens))
+ bitset_set (Vp, *rhsp);
+ bitset_set (Pp, r);
}
}
if (bitset_equal_p (V, Vp))
V = Vp;
/* Tokens 0, 1, and 2 are internal to Bison. Consider them useful. */
- bitset_set (V, eoftoken->number); /* end-of-input token */
+ bitset_set (V, endtoken->number); /* end-of-input token */
bitset_set (V, errtoken->number); /* error token */
bitset_set (V, undeftoken->number); /* some undefined token */
nuseless_productions = nrules - nuseful_productions;
nuseful_nonterminals = 0;
- for (i = ntokens; i < nsyms; i++)
- if (bitset_test (V, i))
- nuseful_nonterminals++;
+ {
+ symbol_number_t i;
+ for (i = ntokens; i < nsyms; i++)
+ if (bitset_test (V, i))
+ nuseful_nonterminals++;
+ }
nuseless_nonterminals = nvars - nuseful_nonterminals;
/* A token that was used in %prec should not be warned about. */
- for (i = 1; i < nrules + 1; i++)
- if (rules[i].precsym != 0)
- bitset_set (V1, rules[i].precsym->number);
+ {
+ rule_number_t r;
+ for (r = 0; r < nrules; ++r)
+ if (rules[r].precsym != 0)
+ bitset_set (V1, rules[r].precsym->number);
+ }
}
static void
reduce_grammar_tables (void)
{
- /* Flag useless productions. */
+ /* Report and flag useless productions. */
{
- int pn;
- for (pn = 1; pn < nrules + 1; pn++)
- rules[pn].useful = bitset_test (P, pn);
+ rule_number_t r;
+ for (r = 0; r < nrules; r++)
+ rules[r].useful = bitset_test (P, r);
+ grammar_rules_never_reduced_report (_("useless rule"));
}
/* Map the nonterminals to their new index: useful first, useless
afterwards. Kept for later report. */
{
- int useful = 1;
- int useless = nrules + 1 - nuseless_productions;
- rule_t *rules_sorted = XMALLOC (rule_t, nrules + 1) - 1;
- int i;
- for (i = 1; i < nrules + 1; ++i)
- rules_sorted[rules[i].useful ? useful++ : useless++] = rules[i];
- free (rules + 1);
+ int useful = 0;
+ int useless = nrules - nuseless_productions;
+ rule_t *rules_sorted = XMALLOC (rule_t, nrules);
+ rule_number_t r;
+ for (r = 0; r < nrules; ++r)
+ rules_sorted[rules[r].useful ? useful++ : useless++] = rules[r];
+ free (rules);
rules = rules_sorted;
/* Renumber the rules markers in RITEMS. */
- for (i = 1; i < nrules + 1; ++i)
+ for (r = 0; r < nrules; ++r)
{
- item_number_t *rhsp = rules[i].rhs;
+ item_number_t *rhsp = rules[r].rhs;
for (/* Nothing. */; *rhsp >= 0; ++rhsp)
/* Nothing. */;
- *rhsp = -i;
- rules[i].number = i;
+ *rhsp = rule_number_as_item_number (r);
+ rules[r].number = r;
}
nrules -= nuseless_productions;
}
- /* Adjust NRITEMS and NITEMS. */
+ /* Adjust NRITEMS. */
{
int r;
int length;
- for (r = nrules + 1; r < nrules + 1 + nuseless_productions; ++r)
+ for (r = nrules; r < nrules + nuseless_productions; ++r)
{
length = rule_rhs_length (&rules[r]);
nritems -= length + 1;
static void
nonterminals_reduce (void)
{
- token_number_t i, n;
+ symbol_number_t i, n;
/* Map the nonterminals to their new index: useful first, useless
afterwards. Kept for later report. */
- token_number_t *nontermmap = XCALLOC (token_number_t, nvars) - ntokens;
+ symbol_number_t *nontermmap = XCALLOC (symbol_number_t, nvars) - ntokens;
n = ntokens;
for (i = ntokens; i < nsyms; i++)
if (bitset_test (V, i))
nontermmap[i] = n++;
for (i = ntokens; i < nsyms; i++)
if (!bitset_test (V, i))
- nontermmap[i] = n++;
+ {
+ nontermmap[i] = n++;
+ LOCATION_PRINT (stderr, symbols[i]->location);
+ fprintf (stderr, ": %s: %s: %s\n",
+ _("warning"), _("useless nonterminal"),
+ symbols[i]->tag);
+ }
/* Shuffle elements of tables indexed by symbol number. */
free (symbols_sorted + ntokens);
}
- for (i = 0; i < nritems; ++i)
- if (ISVAR (ritem[i]))
- ritem[i] = token_number_as_item_number (nontermmap[ritem[i]]);
-
- start_symbol = nontermmap[start_symbol];
+ {
+ rule_number_t r;
+ for (r = 0; r < nrules; ++r)
+ {
+ item_number_t *rhsp;
+ for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+ if (ISVAR (*rhsp))
+ *rhsp = symbol_number_as_item_number (nontermmap[*rhsp]);
+ }
+ accept->number = nontermmap[accept->number];
+ }
nsyms -= nuseless_nonterminals;
nvars -= nuseless_nonterminals;
if (nuseless_nonterminals > 0)
{
int i;
- fprintf (out, "%s\n\n", _("Useless nonterminals:"));
+ fprintf (out, "%s\n\n", _("Useless nonterminals"));
for (i = 0; i < nuseless_nonterminals; ++i)
- fprintf (out, " %s\n", quotearg_style (escape_quoting_style,
- symbols[nsyms + i]->tag));
+ fprintf (out, " %s\n", symbols[nsyms + i]->tag);
fputs ("\n\n", out);
}
{
- bool b = FALSE;
+ bool b = false;
int i;
for (i = 0; i < ntokens; i++)
if (!bitset_test (V, i) && !bitset_test (V1, i))
{
if (!b)
- fprintf (out, "%s\n\n", _("Terminals which are not used:"));
- b = TRUE;
- fprintf (out, " %s\n", quotearg_style (escape_quoting_style,
- symbols[i]->tag));
+ fprintf (out, "%s\n\n", _("Terminals which are not used"));
+ b = true;
+ fprintf (out, " %s\n", symbols[i]->tag);
}
if (b)
fputs ("\n\n", out);
}
if (nuseless_productions > 0)
- {
- int i;
- fprintf (out, "%s\n\n", _("Useless rules:"));
- for (i = nrules + 1; i < nuseless_productions + nrules + 1; i++)
- {
- item_number_t *r;
- fprintf (out, "#%-4d ", rules[i].user_number - 1);
- fprintf (out, "%s:", quotearg_style (escape_quoting_style,
- rules[i].lhs->tag));
- for (r = rules[i].rhs; *r >= 0; r++)
- fprintf (out, " %s", quotearg_style (escape_quoting_style,
- symbols[*r]->tag));
- fputs (";\n", out);
- }
- fputs ("\n\n", out);
- }
+ grammar_rules_partial_print (out, _("Useless rules"),
+ rule_useless_p);
}
\f
-static void
-dump_grammar (FILE *out)
-{
- int i;
- item_number_t *r;
-
- fprintf (out, "REDUCED GRAMMAR\n\n");
- fprintf (out,
- "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
- ntokens, nvars, nsyms, nrules, nritems);
- fprintf (out, "Variables\n---------\n\n");
- fprintf (out, "Value Sprec Sassoc Tag\n");
- for (i = ntokens; i < nsyms; i++)
- fprintf (out, "%5d %5d %5d %s\n",
- i,
- symbols[i]->prec, symbols[i]->assoc,
- quotearg_style (escape_quoting_style, symbols[i]->tag));
- fprintf (out, "\n\n");
- fprintf (out, "Rules\n-----\n\n");
- fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
- for (i = 1; i < nrules + nuseless_productions + 1; i++)
- {
- int rhs_count = 0;
- /* Find the last RHS index in ritems. */
- for (r = rules[i].rhs; *r >= 0; ++r)
- ++rhs_count;
- fprintf (out, "%3d (%2d, %2d, %2d, %2d-%2d) %2d ->",
- i - 1,
- rules[i].prec->prec,
- rules[i].prec->assoc,
- rules[i].useful,
- rules[i].rhs - ritem,
- rules[i].rhs - ritem + rhs_count - 1,
- rules[i].lhs->number);
- /* Dumped the RHS. */
- for (r = rules[i].rhs; *r >= 0; r++)
- fprintf (out, "%3d", *r);
- fprintf (out, " [%d]\n", -(*r) - 1);
- }
- fprintf (out, "\n\n");
- fprintf (out, "Rules interpreted\n-----------------\n\n");
- for (i = 1; i < nrules + nuseless_productions + 1; i++)
- {
- fprintf (out, "%-5d %s :",
- i, quotearg_style (escape_quoting_style, rules[i].lhs->tag));
- for (r = rules[i].rhs; *r >= 0; r++)
- fprintf (out, " %s",
- quotearg_style (escape_quoting_style, symbols[*r]->tag));
- fputc ('\n', out);
- }
- fprintf (out, "\n\n");
-}
+
nuseless_productions),
nuseless_productions);
- fprintf (stderr, _("%s contains "), infile);
+ fprintf (stderr, "%s: %s: ", grammar_file, _("warning"));
if (nuseless_nonterminals > 0)
fprintf (stderr, ngettext ("%d useless nonterminal",
/* Allocate the global sets used to compute the reduced grammar */
N = bitset_create (nvars, BITSET_FIXED);
- P = bitset_create (nrules + 1, BITSET_FIXED);
+ P = bitset_create (nrules, BITSET_FIXED);
V = bitset_create (nsyms, BITSET_FIXED);
V1 = bitset_create (nsyms, BITSET_FIXED);
reduce_print ();
- if (!bitset_test (N, start_symbol - ntokens))
- fatal (_("Start symbol %s does not derive any sentence"),
- quotearg_style (escape_quoting_style, symbols[start_symbol]->tag));
+ if (!bitset_test (N, accept->number - ntokens))
+ fatal_at (startsymbol_location,
+ _("start symbol %s does not derive any sentence"),
+ startsymbol->tag);
/* First reduce the nonterminals, as they renumber themselves in the
whole grammar. If you change the order, nonterms would be
if (nuseless_productions > 0)
reduce_grammar_tables ();
- if (trace_flag)
+ if (trace_flag & trace_grammar)
{
- dump_grammar (stderr);
+ grammar_dump (stderr, "Reduced Grammar");
fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals\
, and %d productions.\n",
- infile, ntokens, nvars, nrules);
+ grammar_file, ntokens, nvars, nrules);
}
}
projects / bison.git / blobdiff