X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c87d4863f6de617e0ed35dc566c59d5b4a072101..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/derives.c

diff --git a/src/derives.c b/src/derives.c
index 3a34a30f..d3443602 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -19,34 +19,35 @@
    Boston, MA 02111-1307, USA.  */
 
 
-/* set_derives finds, for each variable (nonterminal), which rules can
-   derive it.  It sets up the value of derives so that derives[i -
-   ntokens] points to a vector of rule numbers, terminated with -1.
-   */
-
 #include "system.h"
 #include "getargs.h"
+#include "symtab.h"
 #include "types.h"
 #include "reader.h"
 #include "gram.h"
 #include "derives.h"
 
-short **derives;
-
+short **derives = NULL;
 
 static void
 print_derives (void)
 {
   int i;
-  short *sp;
 
   fputs ("DERIVES\n", stderr);
 
   for (i = ntokens; i < nsyms; i++)
     {
-      fprintf (stderr, "\t%s derives\n", tags[i]);
+      short *sp;
+      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
       for (sp = derives[i]; *sp > 0; sp++)
-	fprintf (stderr, "\t\t%d (%s)\n", *sp, tags[*sp]);
+	{
+	  item_number_t *rhsp;
+	  fprintf (stderr, "\t\t%d:", *sp);
+	  for (rhsp = rules[*sp].rhs; *rhsp >= 0; ++rhsp)
+	    fprintf (stderr, " %s", symbols[*rhsp]->tag);
+	  fprintf (stderr, " (rule %d)\n", -*rhsp - 1);
+	}
     }
 
   fputs ("\n\n", stderr);
@@ -57,7 +58,6 @@ void
 set_derives (void)
 {
   int i;
-  int lhs;
   shorts *p;
   short *q;
   shorts **dset;
@@ -69,14 +69,11 @@ set_derives (void)
   p = delts;
   for (i = nrules; i > 0; i--)
     {
-      lhs = rule_table[i].lhs;
-      if (lhs >= 0)
-	{
-	  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;