c++: style: use "unsigned", not "unsigned int"

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 5e69a69b117d65807ca99023507c6ca2a60cf2c0..a61ae4c6f4464ffcf7d2c6ba199af09b3c13f842 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,594 +1,466 @@
 /* Grammar reduction for Bison.
 /* Grammar reduction for Bison.

-   Copyright (C) 1988, 1989 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   Copyright (C) 1988-1989, 2000-2003, 2005-2015 Free Software
+   Foundation, Inc.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-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.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-/*
- * Reduce the grammar:  Find and eliminate unreachable terminals,
- * nonterminals, and productions.  David S. Bakin.
- */

 
 

-/*
- * Don't eliminate unreachable terminals:  They may be used by the user's
- * parser.
- */
+/* Reduce the grammar: Find and eliminate unreachable terminals,
+   nonterminals, and productions.  David S. Bakin.  */

 
 

-#include <stdio.h>
-#include "system.h"
-#include "files.h"
-#include "gram.h"
-#include "machine.h"
-#include "alloc.h"
-
-
-extern char   **tags;          /* reader.c */
-extern int      verboseflag;   /* getargs.c */
-static int      statisticsflag;        /* XXXXXXX */
-extern int      fixed_outfiles;
+/* Don't eliminate unreachable terminals: They may be used by the
+   user's parser.  */

 
 

-#ifndef TRUE
-#define TRUE   (1)
-#define FALSE  (0)
-#endif
-typedef int bool;
-typedef unsigned *BSet;
-typedef short  *rule;
+#include <config.h>
+#include "system.h"

 
 

+#include <bitset.h>

 
 

-/*
- * N is set of all nonterminals which are not useless.  P is set of all rules
- * which have no useless nonterminals in their RHS.  V is the set of all
- * accessible symbols.
- */
+#include "complain.h"
+#include "files.h"
+#include "getargs.h"
+#include "gram.h"
+#include "print-xml.h"
+#include "reader.h"
+#include "reduce.h"
+#include "symtab.h"

 
 

-static BSet     N, P, V, V1;
+/* Set of all nonterminals which are not useless.  */
+static bitset N;

 
 

-static int      nuseful_productions, nuseless_productions,
-                nuseful_nonterminals, nuseless_nonterminals;
+/* Set of all rules which have no useless nonterminals in their RHS.  */
+static bitset P;

 
 

+/* Set of all accessible symbols.  */
+static bitset V;

 
 

-bool bits_equal PARAMS((BSet, BSet, int));
-int nbits PARAMS((unsigned));
-int bits_size PARAMS((BSet, int));
-void reduce_grammar PARAMS((void));
-static void useless_nonterminals PARAMS((void));
-static void inaccessable_symbols PARAMS((void));
-static void reduce_grammar_tables PARAMS((void));
-static void print_results PARAMS((void));
-static void print_notices PARAMS((void));
-void dump_grammar PARAMS((void));
+/* Set of symbols used to define rule precedence (so they are
+   'useless', but no warning should be issued).  */
+static bitset V1;

 
 

-extern void fatals PARAMS((char *, char *));
+static rule_number nuseful_productions;
+rule_number nuseless_productions;
+static int nuseful_nonterminals;
+symbol_number nuseless_nonterminals;

 \f
 \f

+/*-------------------------------------------------------------------.
+| Another way to do this would be with a set for each production and |
+| then do subset tests against N0, but even for the C grammar the    |
+| whole reducing process takes only 2 seconds on my 8Mhz AT.         |
+`-------------------------------------------------------------------*/

 
 

-bool
-bits_equal (BSet L, BSet R, int n)
+static bool
+useful_production (rule_number r, bitset N0)

 {
 {

-  int i;
-
-  for (i = n - 1; i >= 0; i--)
-    if (L[i] != R[i])
-      return FALSE;
-  return TRUE;
-}
-
+  item_number *rhsp;

 
 

-int
-nbits (unsigned i)
-{
-  int count = 0;
+  /* A production is useful if all of the nonterminals in its appear
+     in the set of useful nonterminals.  */

 
 

-  while (i != 0) {
-    i ^= (i & ((unsigned) (- (int) i)));
-    ++count;
-  }
-  return count;
+  for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+    if (ISVAR (*rhsp) && !bitset_test (N0, *rhsp - ntokens))
+      return false;
+  return true;

 }
 
 
 }
 
 

-int
-bits_size (BSet S, int n)
-{
-  int i, count = 0;
+/*---------------------------------------------------------.
+| Remember that rules are 1-origin, symbols are 0-origin.  |
+`---------------------------------------------------------*/

 
 

-  for (i = n - 1; i >= 0; i--)
-    count += nbits(S[i]);
-  return count;
-}
-\f
-void
-reduce_grammar (void)
+static void
+useless_nonterminals (void)

 {
 {

-  bool reduced;
-
-  /* Allocate the global sets used to compute the reduced grammar */
-
-  N = NEW2(WORDSIZE(nvars), unsigned);
-  P = NEW2(WORDSIZE(nrules + 1), unsigned);
-  V = NEW2(WORDSIZE(nsyms), unsigned);
-  V1 = NEW2(WORDSIZE(nsyms), unsigned);
+  bitset Np, Ns;
+  rule_number r;

 
 

-  useless_nonterminals();
-  inaccessable_symbols();
+  /* 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.  */

 
 

-  reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
+  Np = bitset_create (nvars, BITSET_FIXED);

 
 

-  if (verboseflag)
-    print_results();

 
 

-  if (reduced == FALSE)
-    goto done_reducing;
+  /* The set being computed is a set of nonterminals which can derive
+     the empty string or strings consisting of all terminals. At each
+     iteration a nonterminal is added to the set if there is a
+     production with that nonterminal as its LHS for which all the
+     nonterminals in its RHS are already in the set.  Iterate until
+     the set being computed remains unchanged.  Any nonterminals not
+     in the set at that point are useless in that they will never be
+     used in deriving a sentence of the language.

 
 

-  print_notices();
+     This iteration doesn't use any special traversal over the
+     productions.  A set is kept of all productions for which all the
+     nonterminals in the RHS are in useful.  Only productions not in
+     this set are scanned on each iteration.  At the end, this set is
+     saved to be used when finding useful productions: only
+     productions in this set will appear in the final grammar.  */

 
 

-  if (!BITISSET(N, start_symbol - ntokens))
-    fatals(_("Start symbol %s does not derive any sentence"),
-          tags[start_symbol]);
-
-  reduce_grammar_tables();
-  /* if (verboseflag) {
-     fprintf(foutput, "REDUCED GRAMMAR\n\n");
-     dump_grammar();
-     }
-     */
-
-  /**/ statisticsflag = FALSE; /* someday getopts should handle this */
-  if (statisticsflag == TRUE)
-    fprintf(stderr,
-           _("reduced %s defines %d terminal%s, %d nonterminal%s\
-, and %d production%s.\n"), infile,
-           ntokens, (ntokens == 1 ? "" : "s"),
-           nvars,   (nvars   == 1 ? "" : "s"),
-           nrules,  (nrules  == 1 ? "" : "s"));
-
- done_reducing:
-
-  /* Free the global sets used to compute the reduced grammar */
-
-  FREE(N);
-  FREE(V);
-  FREE(P);
-
-}
-\f
-/*
- * Another way to do this would be with a set for each production and then do
- * subset tests against N0, but even for the C grammar the whole reducing
- * process takes only 2 seconds on my 8Mhz AT.
- */
-
-static bool
-useful_production (int i, BSet N0)
-{
-  rule  r;
-  short n;
-
-  /*
-   * A production is useful if all of the nonterminals in its RHS
-   * appear in the set of useful nonterminals.
-   */
-
-  for (r = &ritem[rrhs[i]]; *r > 0; r++)
-    if (ISVAR(n = *r))
-      if (!BITISSET(N0, n - ntokens))
-       return FALSE;
-  return TRUE;
-}
-
-
-/* Remember that rules are 1-origin, symbols are 0-origin. */
-
-static void
-useless_nonterminals (void)
-{
-  BSet Np, Ns;
-  int  i, n;
-
-  /*
-   * 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.
-   */
-
-  Np = NEW2(WORDSIZE(nvars), unsigned);
-
-  /*
-   * The set being computed is a set of nonterminals which can derive
-   * the empty string or strings consisting of all terminals. At each
-   * iteration a nonterminal is added to the set if there is a
-   * production with that nonterminal as its LHS for which all the
-   * nonterminals in its RHS are already in the set.  Iterate until the
-   * set being computed remains unchanged.  Any nonterminals not in the
-   * set at that point are useless in that they will never be used in
-   * deriving a sentence of the language.
-   *
-   * This iteration doesn't use any special traversal over the
-   * productions.  A set is kept of all productions for which all the
-   * nonterminals in the RHS are in useful.  Only productions not in
-   * this set are scanned on each iteration.  At the end, this set is
-   * saved to be used when finding useful productions: only productions
-   * in this set will appear in the final grammar.
-   */
-
-  n = 0;

   while (1)
     {
   while (1)
     {

-      for (i = WORDSIZE(nvars) - 1; i >= 0; i--)
-       Np[i] = N[i];
-      for (i = 1; i <= nrules; i++)
-       {
-         if (!BITISSET(P, i))
-           {
-             if (useful_production(i, N))
-               {
-                 SETBIT(Np, rlhs[i] - ntokens);
-                 SETBIT(P, i);
-               }
-           }
-       }
-      if (bits_equal(N, Np, WORDSIZE(nvars)))
-       break;
+      bitset_copy (Np, N);
+      for (r = 0; r < nrules; r++)
+        if (!bitset_test (P, r)
+            && useful_production (r, N))
+          {
+            bitset_set (Np, rules[r].lhs->number - ntokens);
+            bitset_set (P, r);
+          }
+      if (bitset_equal_p (N, Np))
+        break;

       Ns = Np;
       Np = N;
       N = Ns;
     }
       Ns = Np;
       Np = N;
       N = Ns;
     }

-  FREE(N);
+  bitset_free (N);

   N = Np;
 }
   N = Np;
 }

-\f
+
+

 static void
 inaccessable_symbols (void)
 {
 static void
 inaccessable_symbols (void)
 {

-  BSet  Vp, Vs, Pp;
-  int   i, n;
-  short t;
-  rule  r;
-
-  /*
-   * Find out which productions are reachable and which symbols are
-   * used.  Starting with an empty set of productions and a set of
-   * symbols which only has the start symbol in it, iterate over all
-   * productions until the set of productions remains unchanged for an
-   * iteration.  For each production which has a LHS in the set of
-   * reachable symbols, add the production to the set of reachable
-   * productions, and add all of the nonterminals in the RHS of the
-   * production to the set of reachable symbols.
-   *
-   * Consider only the (partially) reduced grammar which has only
-   * nonterminals in N and productions in P.
-   *
-   * The result is the set P of productions in the reduced grammar, and
-   * the set V of symbols in the reduced grammar.
-   *
-   * Although this algorithm also computes the set of terminals which are
-   * reachable, no terminal will be deleted from the grammar. Some
-   * terminals might not be in the grammar but might be generated by
-   * semantic routines, and so the user might want them available with
-   * specified numbers.  (Is this true?)  However, the nonreachable
-   * terminals are printed (if running in verbose mode) so that the user
-   * can know.
-   */
-
-  Vp = NEW2(WORDSIZE(nsyms), unsigned);
-  Pp = NEW2(WORDSIZE(nrules + 1), unsigned);
+  bitset Vp, Vs, Pp;
+
+  /* Find out which productions are reachable and which symbols are
+     used.  Starting with an empty set of productions and a set of
+     symbols which only has the start symbol in it, iterate over all
+     productions until the set of productions remains unchanged for an
+     iteration.  For each production which has a LHS in the set of
+     reachable symbols, add the production to the set of reachable
+     productions, and add all of the nonterminals in the RHS of the
+     production to the set of reachable symbols.
+
+     Consider only the (partially) reduced grammar which has only
+     nonterminals in N and productions in P.
+
+     The result is the set P of productions in the reduced grammar,
+     and the set V of symbols in the reduced grammar.
+
+     Although this algorithm also computes the set of terminals which
+     are reachable, no terminal will be deleted from the grammar. Some
+     terminals might not be in the grammar but might be generated by
+     semantic routines, and so the user might want them available with
+     specified numbers.  (Is this true?)  However, the nonreachable
+     terminals are printed (if running in verbose mode) so that the
+     user can know.  */
+
+  Vp = bitset_create (nsyms, BITSET_FIXED);
+  Pp = bitset_create (nrules, BITSET_FIXED);

 
   /* If the start symbol isn't useful, then nothing will be useful. */
 
   /* If the start symbol isn't useful, then nothing will be useful. */

-  if (!BITISSET(N, start_symbol - ntokens))
-    goto end_iteration;
-
-  SETBIT(V, start_symbol);
-
-  n = 0;
-  while (1)
+  if (bitset_test (N, accept->number - ntokens))

     {
     {

-      for (i = WORDSIZE(nsyms) - 1; i >= 0; i--)
-       Vp[i] = V[i];
-      for (i = 1; i <= nrules; i++)
-       {
-         if (!BITISSET(Pp, i) && BITISSET(P, i) &&
-             BITISSET(V, rlhs[i]))
-           {
-             for (r = &ritem[rrhs[i]]; *r >= 0; r++)
-               {
-                 if (ISTOKEN(t = *r)
-                     || BITISSET(N, t - ntokens))
-                   {
-                     SETBIT(Vp, t);
-                   }
-               }
-             SETBIT(Pp, i);
-           }
-       }
-      if (bits_equal(V, Vp, WORDSIZE(nsyms)))
-       {
-         break;
-       }
-      Vs = Vp;
-      Vp = V;
-      V = Vs;
+      bitset_set (V, accept->number);
+
+      while (1)
+        {
+          rule_number r;
+          bitset_copy (Vp, V);
+          for (r = 0; r < nrules; r++)
+            {
+              if (!bitset_test (Pp, r)
+                  && bitset_test (P, r)
+                  && bitset_test (V, rules[r].lhs->number))
+                {
+                  item_number *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))
+            break;
+          Vs = Vp;
+          Vp = V;
+          V = Vs;
+        }

     }
     }

- end_iteration:

 
 

-  FREE(V);
+  bitset_free (V);

   V = Vp;
 
   /* Tokens 0, 1, and 2 are internal to Bison.  Consider them useful. */
   V = Vp;
 
   /* Tokens 0, 1, and 2 are internal to Bison.  Consider them useful. */

-  SETBIT(V, 0);                        /* end-of-input token */
-  SETBIT(V, 1);                        /* error token */
-  SETBIT(V, 2);                        /* some undefined 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 */

 
 

-  FREE(P);
+  bitset_free (P);

   P = Pp;
 
   P = Pp;
 

-  nuseful_productions = bits_size(P, WORDSIZE(nrules + 1));
+  nuseful_productions = bitset_count (P);

   nuseless_productions = nrules - nuseful_productions;
 
   nuseful_nonterminals = 0;
   nuseless_productions = nrules - nuseful_productions;
 
   nuseful_nonterminals = 0;

-  for (i = ntokens; i < nsyms; i++)
-    if (BITISSET(V, i))
-      nuseful_nonterminals++;
+  {
+    symbol_number 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.  */
   nuseless_nonterminals = nvars - nuseful_nonterminals;
 
   /* A token that was used in %prec should not be warned about.  */

-  for (i = 1; i < nrules; i++)
-    if (rprecsym[i] != 0)
-      SETBIT(V1, rprecsym[i]);
+  {
+    rule_number r;
+    for (r = 0; r < nrules; ++r)
+      if (rules[r].precsym != 0)
+        bitset_set (V1, rules[r].precsym->number);
+  }

 }
 }

-\f
+
+
+/*-------------------------------------------------------------------.
+| Put the useless productions at the end of RULES, and adjust NRULES |
+| accordingly.                                                       |
+`-------------------------------------------------------------------*/
+

 static void
 reduce_grammar_tables (void)
 {
 static void
 reduce_grammar_tables (void)
 {

-/* This is turned off because we would need to change the numbers
-   in the case statements in the actions file.  */
-#if 0
-  /* remove useless productions */
-  if (nuseless_productions > 0)
-    {
-      short np, pn, ni, pi;
-
-      np = 0;
-      ni = 0;
-      for (pn = 1; pn <= nrules; pn++)
-       {
-         if (BITISSET(P, pn))
-           {
-             np++;
-             if (pn != np)
-               {
-                 rlhs[np] = rlhs[pn];
-                 rline[np] = rline[pn];
-                 rprec[np] = rprec[pn];
-                 rassoc[np] = rassoc[pn];
-                 rrhs[np] = rrhs[pn];
-                 if (rrhs[np] != ni)
-                   {
-                     pi = rrhs[np];
-                     rrhs[np] = ni;
-                     while (ritem[pi] >= 0)
-                       ritem[ni++] = ritem[pi++];
-                     ritem[ni++] = -np;
-                   }
-               } else {
-                 while (ritem[ni++] >= 0);
-               }
-           }
-       }
-      ritem[ni] = 0;
-      nrules -= nuseless_productions;
-      nitems = ni;
-
-      /*
-       * Is it worth it to reduce the amount of memory for the
-       * grammar? Probably not.
-       */
-
-    }
-#endif /* 0 */
-  /* Disable useless productions,
-     since they may contain useless nonterms
-     that would get mapped below to -1 and confuse everyone.  */
-  if (nuseless_productions > 0)
-    {
-      int pn;
-
-      for (pn = 1; pn <= nrules; pn++)
-       {
-         if (!BITISSET(P, pn))
-           {
-             rlhs[pn] = -1;
-           }
-       }
-    }
+  /* Report and flag useless productions.  */
+  {
+    rule_number r;
+    for (r = 0; r < nrules; r++)
+      rules[r].useful = bitset_test (P, r);
+    grammar_rules_useless_report (_("rule useless in grammar"));
+  }

 
 

-  /* remove useless symbols */
-  if (nuseless_nonterminals > 0)
-    {
+  /* Map the nonterminals to their new index: useful first, useless
+     afterwards.  Kept for later report.  */
+  {
+    int useful = 0;
+    int useless = nrules - nuseless_productions;
+    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);
+    rules = rules_sorted;
+
+    /* Renumber the rules markers in RITEMS.  */
+    for (r = 0; r < nrules; ++r)
+      {
+        item_number *rhsp = rules[r].rhs;
+        for (/* Nothing. */; *rhsp >= 0; ++rhsp)
+          /* Nothing. */;
+        *rhsp = rule_number_as_item_number (r);
+        rules[r].number = r;
+      }
+    nrules -= nuseless_productions;
+  }

 
 

-      int    i, n;
-/*      short  j; JF unused */
-      short *nontermmap;
-      rule   r;
-
-      /*
-       * create a map of nonterminal number to new nonterminal
-       * number. -1 in the map means it was useless and is being
-       * eliminated.
-       */
-
-      nontermmap = NEW2(nvars, short) - ntokens;
-      for (i = ntokens; i < nsyms; i++)
-       nontermmap[i] = -1;
-
-      n = ntokens;
-      for (i = ntokens; i < nsyms; i++)
-       if (BITISSET(V, i))
-         nontermmap[i] = n++;
-
-      /* Shuffle elements of tables indexed by symbol number.  */
-
-      for (i = ntokens; i < nsyms; i++)
-       {
-         n = nontermmap[i];
-         if (n >= 0)
-           {
-             sassoc[n] = sassoc[i];
-             sprec[n] = sprec[i];
-             tags[n] = tags[i];
-           } else {
-             free(tags[i]);
-           }
-       }
-
-      /* Replace all symbol numbers in valid data structures.  */
-
-      for (i = 1; i <= nrules; i++)
-       {
-         /* Ignore the rules disabled above.  */
-         if (rlhs[i] >= 0)
-           rlhs[i] = nontermmap[rlhs[i]];
-         if (ISVAR (rprecsym[i]))
-           /* Can this happen?  */
-           rprecsym[i] = nontermmap[rprecsym[i]];
-       }
-
-      for (r = ritem; *r; r++)
-       if (ISVAR(*r))
-         *r = nontermmap[*r];
-
-      start_symbol = nontermmap[start_symbol];
-
-      nsyms -= nuseless_nonterminals;
-      nvars -= nuseless_nonterminals;
-
-      free(&nontermmap[ntokens]);
-    }
+  /* Adjust NRITEMS.  */
+  {
+    rule_number r;
+    int length;
+    for (r = nrules; r < nrules + nuseless_productions; ++r)
+      {
+        length = rule_rhs_length (&rules[r]);
+        nritems -= length + 1;
+      }
+  }

 }
 }

-\f
+
+
+/*------------------------------.
+| Remove useless nonterminals.  |
+`------------------------------*/
+

 static void
 static void

-print_results (void)
+nonterminals_reduce (void)

 {
 {

-  int   i;
-/*  short j; JF unused */
-  rule  r;
-  bool  b;
+  /* Map the nonterminals to their new index: useful first, useless
+     afterwards.  Kept for later report.  */

 
 

-  if (nuseless_nonterminals > 0)
-    {
-      fprintf(foutput, _("Useless nonterminals:\n\n"));
-      for (i = ntokens; i < nsyms; i++)
-       if (!BITISSET(V, i))
-         fprintf(foutput, "   %s\n", tags[i]);
-    }
-  b = FALSE;
-  for (i = 0; i < ntokens; i++)
-    {
-      if (!BITISSET(V, i) && !BITISSET(V1, i))
-       {
-         if (!b)
-           {
-             fprintf(foutput, _("\n\nTerminals which are not used:\n\n"));
-             b = TRUE;
-           }
-         fprintf(foutput, "   %s\n", tags[i]);
-       }
-    }
+  symbol_number *nontermmap = xnmalloc (nvars, sizeof *nontermmap);
+  symbol_number n = ntokens;
+  symbol_number i;
+  for (i = ntokens; i < nsyms; i++)
+    if (bitset_test (V, i))
+      nontermmap[i - ntokens] = n++;
+  for (i = ntokens; i < nsyms; i++)
+    if (!bitset_test (V, i))
+      {
+        nontermmap[i - ntokens] = n++;
+        if (symbols[i]->status != used)
+          complain (&symbols[i]->location, Wother,
+                    _("nonterminal useless in grammar: %s"),
+                    symbols[i]->tag);
+      }
+
+
+  /* Shuffle elements of tables indexed by symbol number.  */
+  {
+    symbol **symbols_sorted = xnmalloc (nvars, sizeof *symbols_sorted);
+
+    for (i = ntokens; i < nsyms; i++)
+      symbols[i]->number = nontermmap[i - ntokens];
+    for (i = ntokens; i < nsyms; i++)
+      symbols_sorted[nontermmap[i - ntokens] - ntokens] = symbols[i];
+    for (i = ntokens; i < nsyms; i++)
+      symbols[i] = symbols_sorted[i - ntokens];
+    free (symbols_sorted);
+  }

 
 

-  if (nuseless_productions > 0)
-    {
-      fprintf(foutput, _("\n\nUseless rules:\n\n"));
-      for (i = 1; i <= nrules; i++)
-       {
-         if (!BITISSET(P, i))
-           {
-             fprintf(foutput, "#%-4d  ", i);
-             fprintf(foutput, "%s :\t", tags[rlhs[i]]);
-             for (r = &ritem[rrhs[i]]; *r >= 0; r++)
-               {
-                 fprintf(foutput, " %s", tags[*r]);
-               }
-             fprintf(foutput, ";\n");
-           }
-       }
-    }
-  if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)
-    fprintf(foutput, "\n\n");
+  {
+    rule_number r;
+    for (r = 0; r < nrules; ++r)
+      {
+        item_number *rhsp;
+        for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+          if (ISVAR (*rhsp))
+            *rhsp =  symbol_number_as_item_number (nontermmap[*rhsp
+                                                              - ntokens]);
+      }
+    accept->number = nontermmap[accept->number - ntokens];
+  }
+
+  nsyms -= nuseless_nonterminals;
+  nvars -= nuseless_nonterminals;
+
+  free (nontermmap);

 }
 }

-\f
+
+
+/*------------------------------------------------------------------.
+| Output the detailed results of the reductions.  For FILE.output.  |
+`------------------------------------------------------------------*/
+

 void
 void

-dump_grammar (void)
+reduce_output (FILE *out)

 {
 {

-  int i;
-  rule r;
-
-  fprintf(foutput,
-         "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
-         ntokens, nvars, nsyms, nrules, nitems);
-  fprintf(foutput, _("Variables\n---------\n\n"));
-  fprintf(foutput, _("Value  Sprec    Sassoc    Tag\n"));
-  for (i = ntokens; i < nsyms; i++)
-    fprintf(foutput, "%5d  %5d  %5d  %s\n",
-           i, sprec[i], sassoc[i], tags[i]);
-  fprintf(foutput, "\n\n");
-  fprintf(foutput, _("Rules\n-----\n\n"));
-  for (i = 1; i <= nrules; i++)
-    {
-      fprintf(foutput, "%-5d(%5d%5d)%5d : (@%-5d)",
-             i, rprec[i], rassoc[i], rlhs[i], rrhs[i]);
-      for (r = &ritem[rrhs[i]]; *r > 0; r++)
-       fprintf(foutput, "%5d", *r);
-      fprintf(foutput, " [%d]\n", -(*r));
-    }
-  fprintf(foutput, "\n\n");
-  fprintf(foutput, _("Rules interpreted\n-----------------\n\n"));
-  for (i = 1; i <= nrules; i++)
+  if (nuseless_nonterminals > 0)

     {
     {

-      fprintf(foutput, "%-5d  %s :", i, tags[rlhs[i]]);
-      for (r = &ritem[rrhs[i]]; *r > 0; r++)
-       fprintf(foutput, " %s", tags[*r]);
-      fprintf(foutput, "\n");
+      int i;
+      fprintf (out, "%s\n\n", _("Nonterminals useless in grammar"));
+      for (i = 0; i < nuseless_nonterminals; ++i)
+        fprintf (out, "   %s\n", symbols[nsyms + i]->tag);
+      fputs ("\n\n", out);

     }
     }

-  fprintf(foutput, "\n\n");
+
+  {
+    bool b = false;
+    int i;
+    for (i = 0; i < ntokens; i++)
+      if (reduce_token_unused_in_grammar (i))
+        {
+          if (!b)
+            fprintf (out, "%s\n\n", _("Terminals unused in grammar"));
+          b = true;
+          fprintf (out, "   %s\n", symbols[i]->tag);
+        }
+    if (b)
+      fputs ("\n\n", out);
+  }
+
+  if (nuseless_productions > 0)
+    grammar_rules_partial_print (out, _("Rules useless in grammar"),
+                                 rule_useless_in_grammar_p);

 }
 }

+\f

 
 

+/*-------------------------------.
+| Report the results to STDERR.  |
+`-------------------------------*/

 
 static void
 
 static void

-print_notices (void)
+reduce_print (void)

 {
 {

-  if (fixed_outfiles && nuseless_productions)
-    fprintf(stderr, _("%d rules never reduced\n"), nuseless_productions);
+  if (nuseless_nonterminals > 0)
+    complain (NULL, Wother, ngettext ("%d nonterminal useless in grammar",
+                                      "%d nonterminals useless in grammar",
+                                      nuseless_nonterminals),
+              nuseless_nonterminals);
+  if (nuseless_productions > 0)
+    complain (NULL, Wother, ngettext ("%d rule useless in grammar",
+                                      "%d rules useless in grammar",
+                                      nuseless_productions),
+              nuseless_productions);
+}
+\f
+void
+reduce_grammar (void)
+{
+  bool reduced;

 
 

-  fprintf(stderr, _("%s contains "), infile);
+  /* Allocate the global sets used to compute the reduced grammar */

 
 

-  if (nuseless_nonterminals > 0)
-    {
-      fprintf(stderr, _("%d useless nonterminal%s"),
-             nuseless_nonterminals,
-             (nuseless_nonterminals == 1 ? "" : "s"));
-    }
-  if (nuseless_nonterminals > 0 && nuseless_productions > 0)
-    fprintf(stderr, _(" and "));
+  N = bitset_create (nvars, BITSET_FIXED);
+  P =  bitset_create (nrules, BITSET_FIXED);
+  V = bitset_create (nsyms, BITSET_FIXED);
+  V1 = bitset_create (nsyms, BITSET_FIXED);
+
+  useless_nonterminals ();
+  inaccessable_symbols ();
+
+  reduced = (nuseless_nonterminals + nuseless_productions > 0);
+  if (!reduced)
+    return;
+
+  reduce_print ();
+
+  if (!bitset_test (N, accept->number - ntokens))
+    complain (&startsymbol_location, fatal,
+              _("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
+     renumbered only in the reduced grammar.  */
+  if (nuseless_nonterminals > 0)
+    nonterminals_reduce ();

   if (nuseless_productions > 0)
   if (nuseless_productions > 0)

+    reduce_grammar_tables ();
+
+  if (trace_flag & trace_grammar)

     {
     {

-      fprintf(stderr, _("%d useless rule%s"),
-             nuseless_productions,
-             (nuseless_productions == 1 ? "" : "s"));
+      grammar_dump (stderr, "Reduced Grammar");
+
+      fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals"
+               ", and %d productions.\n",
+               grammar_file, ntokens, nvars, nrules);

     }
     }

-  fprintf(stderr, "\n");
-  fflush(stderr);
+}
+
+bool
+reduce_token_unused_in_grammar (symbol_number i)
+{
+  aver (i < ntokens);
+  return !bitset_test (V, i) && !bitset_test (V1, i);
+}
+
+bool
+reduce_nonterminal_useless_in_grammar (symbol_number i)
+{
+  aver (ntokens <= i && i < nsyms + nuseless_nonterminals);
+  return nsyms <= i;
+}
+
+/*-----------------------------------------------------------.
+| Free the global sets used to compute the reduced grammar.  |
+`-----------------------------------------------------------*/
+
+void
+reduce_free (void)
+{
+  bitset_free (N);
+  bitset_free (V);
+  bitset_free (V1);
+  bitset_free (P);

 }
 }