* src/system.h: No longer using strndup.

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 23ad38bc3364f02599a07f5c0f65ad3feecc98c4..256817505722905f706b36c7ae396237443168bd 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -199,9 +199,9 @@ inaccessable_symbols (void)
   V = Vp;
 
   /* Tokens 0, 1, and 2 are internal to Bison.  Consider them useful. */
-  bitset_set (V, 0);           /* end-of-input token */
-  bitset_set (V, 1);           /* error token */
-  bitset_set (V, 2);           /* some undefined token */
+  bitset_set (V, eoftoken->number);            /* end-of-input token */
+  bitset_set (V, errtoken->number);            /* error token */
+  bitset_set (V, undeftoken->number);          /* some undefined token */
 
   bitset_free (P);
   P = Pp;
@@ -269,7 +269,6 @@ reduce_grammar_tables (void)
       {
        length = rule_rhs_length (&rules[r]);
        nritems -= length + 1;
-       nitems -= length + 1;
       }
   }
 }
@@ -299,7 +298,7 @@ nonterminals_reduce (void)
 
   /* Shuffle elements of tables indexed by symbol number.  */
   {
-    bucket **symbols_sorted = XMALLOC (bucket *, nvars) - ntokens;
+    symbol_t **symbols_sorted = XMALLOC (symbol_t *, nvars) - ntokens;
 
     for (i = ntokens; i < nsyms; i++)
       symbols[i]->number = nontermmap[i];
@@ -383,8 +382,8 @@ dump_grammar (FILE *out)
 
   fprintf (out, "REDUCED GRAMMAR\n\n");
   fprintf (out,
-          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
-          ntokens, nvars, nsyms, nrules, nitems);
+          "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++)