X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1a2b5d37e1d44b47cd51220945f4ba29c228a419..2243f537c666414c66652b2bb53a5c37413d291e:/src/derives.c

diff --git a/src/derives.c b/src/derives.c
index 795bc08e..d3443602 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -42,9 +42,9 @@ print_derives (void)
       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[rules[*sp].rhs]; *rhsp >= 0; ++rhsp)
+	  for (rhsp = rules[*sp].rhs; *rhsp >= 0; ++rhsp)
 	    fprintf (stderr, " %s", symbols[*rhsp]->tag);
 	  fprintf (stderr, " (rule %d)\n", -*rhsp - 1);
 	}
@@ -68,14 +68,13 @@ set_derives (void)
 
   p = delts;
   for (i = nrules; i > 0; i--)
-    if (rules[i].useful)
-      {
-	int lhs = rules[i].lhs;
-	p->next = dset[lhs];
-	p->value = i;
-	dset[lhs] = p;
-	p++;
-      }
+    {
+      token_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);