* src/symtab.h, src/symtab.c (symbol_t): printer and

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 80e430bf71f24a44b9499591dac1cc09ae1cc4fc..d78d55633bbeec07ae4d7de6b2544d0ab2fb721b 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -21,6 +21,7 @@
 
 #include "system.h"
 #include "getargs.h"
+#include "symtab.h"
 #include "types.h"
 #include "reader.h"
 #include "gram.h"
@@ -38,13 +39,13 @@ print_derives (void)
   for (i = ntokens; i < nsyms; i++)
     {
       short *sp;
-      fprintf (stderr, "\t%s derives\n", tags[i]);
+      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
       for (sp = derives[i]; *sp > 0; sp++)
        {
-         short *rhsp;
+         item_number_t *rhsp;
          fprintf (stderr, "\t\t%d:", *sp);
-         for (rhsp = &ritem[rule_table[*sp].rhs]; *rhsp >= 0; ++rhsp)
-           fprintf (stderr, " %s", tags[*rhsp]);
+         for (rhsp = rules[*sp].rhs; *rhsp >= 0; ++rhsp)
+           fprintf (stderr, " %s", symbols[*rhsp]->tag);
          fprintf (stderr, " (rule %d)\n", -*rhsp - 1);
        }
     }
@@ -67,14 +68,13 @@ set_derives (void)
 
   p = delts;
   for (i = nrules; i > 0; i--)
-    if (rule_table[i].useful)
-      {
-       int lhs = rule_table[i].lhs;
-       p->next = dset[lhs];
-       p->value = i;
-       dset[lhs] = p;
-       p++;
-      }
+    {
+      symbol_number_t lhs = rules[i].lhs->number;
+      p->next = dset[lhs];
+      p->value = i;
+      dset[lhs] = p;
+      p++;
+    }
 
   derives = XCALLOC (short *, nvars) - ntokens;
   q = XCALLOC (short, nvars + nrules);