/* Grammar reduction for Bison.
- Copyright (C) 1988, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
You should have received a copy of the GNU General Public License
along with Bison; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* Reduce the grammar: Find and eliminate unreachable terminals,
user's parser. */
#include "system.h"
-#include "quotearg.h"
-#include "getargs.h"
+
+#include <bitset.h>
+#include <quotearg.h>
+
+#include "complain.h"
#include "files.h"
-#include "symtab.h"
+#include "getargs.h"
#include "gram.h"
-#include "complain.h"
-#include "reduce.h"
#include "reader.h"
-#include "getargs.h"
-#include "bitset.h"
+#include "reduce.h"
+#include "symtab.h"
/* Set of all nonterminals which are not useless. */
static bitset N;
`useless', but no warning should be issued). */
static bitset V1;
-static rule_number_t nuseful_productions;
-rule_number_t nuseless_productions;
+static rule_number nuseful_productions;
+rule_number nuseless_productions;
static int nuseful_nonterminals;
-symbol_number_t nuseless_nonterminals;
+symbol_number nuseless_nonterminals;
\f
/*-------------------------------------------------------------------.
| Another way to do this would be with a set for each production and |
`-------------------------------------------------------------------*/
static bool
-useful_production (rule_number_t r, bitset N0)
+useful_production (rule_number r, bitset N0)
{
- item_number_t *rhsp;
+ item_number *rhsp;
/* A production is useful if all of the nonterminals in its appear
in the set of useful nonterminals. */
useless_nonterminals (void)
{
bitset Np, Ns;
- rule_number_t r;
+ rule_number 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)
{
- rule_number_t r;
+ rule_number r;
bitset_copy (Vp, V);
for (r = 0; r < nrules; r++)
{
&& bitset_test (P, r)
&& bitset_test (V, rules[r].lhs->number))
{
- item_number_t *rhsp;
+ item_number *rhsp;
for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
if (ISTOKEN (*rhsp) || bitset_test (N, *rhsp - ntokens))
bitset_set (Vp, *rhsp);
nuseful_nonterminals = 0;
{
- symbol_number_t i;
+ symbol_number i;
for (i = ntokens; i < nsyms; i++)
if (bitset_test (V, i))
nuseful_nonterminals++;
/* A token that was used in %prec should not be warned about. */
{
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules; ++r)
if (rules[r].precsym != 0)
bitset_set (V1, rules[r].precsym->number);
{
/* Report and flag useless productions. */
{
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules; r++)
rules[r].useful = bitset_test (P, r);
grammar_rules_never_reduced_report (_("useless rule"));
{
int useful = 0;
int useless = nrules - nuseless_productions;
- rule_t *rules_sorted = XMALLOC (rule_t, nrules);
- rule_number_t r;
+ rule *rules_sorted = xnmalloc (nrules, sizeof *rules_sorted);
+ rule_number r;
for (r = 0; r < nrules; ++r)
rules_sorted[rules[r].useful ? useful++ : useless++] = rules[r];
free (rules);
/* Renumber the rules markers in RITEMS. */
for (r = 0; r < nrules; ++r)
{
- item_number_t *rhsp = rules[r].rhs;
+ item_number *rhsp = rules[r].rhs;
for (/* Nothing. */; *rhsp >= 0; ++rhsp)
/* Nothing. */;
*rhsp = rule_number_as_item_number (r);
/* Adjust NRITEMS. */
{
- int r;
+ rule_number r;
int length;
for (r = nrules; r < nrules + nuseless_productions; ++r)
{
static void
nonterminals_reduce (void)
{
- symbol_number_t i, n;
+ symbol_number i, n;
/* Map the nonterminals to their new index: useful first, useless
afterwards. Kept for later report. */
- symbol_number_t *nontermmap = XCALLOC (symbol_number_t, nvars) - ntokens;
+ symbol_number *nontermmap = xnmalloc (nvars, sizeof *nontermmap);
n = ntokens;
for (i = ntokens; i < nsyms; i++)
if (bitset_test (V, i))
- nontermmap[i] = n++;
+ nontermmap[i - ntokens] = n++;
for (i = ntokens; i < nsyms; i++)
if (!bitset_test (V, i))
{
- nontermmap[i] = n++;
- LOCATION_PRINT (stderr, symbols[i]->location);
- fprintf (stderr, ": %s: %s: %s\n",
- _("warning"), _("useless nonterminal"),
+ nontermmap[i - ntokens] = n++;
+ warn_at (symbols[i]->location, _("useless nonterminal: %s"),
symbols[i]->tag);
}
/* Shuffle elements of tables indexed by symbol number. */
{
- symbol_t **symbols_sorted = XMALLOC (symbol_t *, nvars) - ntokens;
+ symbol **symbols_sorted = xnmalloc (nvars, sizeof *symbols_sorted);
for (i = ntokens; i < nsyms; i++)
- symbols[i]->number = nontermmap[i];
+ symbols[i]->number = nontermmap[i - ntokens];
for (i = ntokens; i < nsyms; i++)
- symbols_sorted[nontermmap[i]] = symbols[i];
+ symbols_sorted[nontermmap[i - ntokens] - ntokens] = symbols[i];
for (i = ntokens; i < nsyms; i++)
- symbols[i] = symbols_sorted[i];
- free (symbols_sorted + ntokens);
+ symbols[i] = symbols_sorted[i - ntokens];
+ free (symbols_sorted);
}
{
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules; ++r)
{
- item_number_t *rhsp;
+ item_number *rhsp;
for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
if (ISVAR (*rhsp))
- *rhsp = symbol_number_as_item_number (nontermmap[*rhsp]);
+ *rhsp = symbol_number_as_item_number (nontermmap[*rhsp
+ - ntokens]);
}
- accept->number = nontermmap[accept->number];
+ accept->number = nontermmap[accept->number - ntokens];
}
nsyms -= nuseless_nonterminals;
nvars -= nuseless_nonterminals;
- free (nontermmap + ntokens);
+ free (nontermmap);
}
nuseless_productions),
nuseless_productions);
- fprintf (stderr, "%s: %s: ", infile, _("warning"));
+ fprintf (stderr, "%s: %s: ", grammar_file, _("warning"));
if (nuseless_nonterminals > 0)
fprintf (stderr, ngettext ("%d useless nonterminal",
nuseless_productions),
nuseless_productions);
fprintf (stderr, "\n");
- fflush (stderr);
}
\f
void
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