Fix the previous test.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index f0c41165a8bca1eadae1775612cf7892238dce8a..795bc08e88c3cf1a019e3ca4918197c9c193ef56 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -19,20 +19,15 @@
    Boston, MA 02111-1307, USA.  */
 
 
    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 "system.h"
 #include "getargs.h"

+#include "symtab.h"

 #include "types.h"
 #include "reader.h"
 #include "gram.h"
 #include "derives.h"
 
 #include "types.h"
 #include "reader.h"
 #include "gram.h"
 #include "derives.h"
 

-short **derives;
-
+short **derives = NULL;

 
 static void
 print_derives (void)
 
 static void
 print_derives (void)


@@ -44,14 +39,14 @@ print_derives (void)
   for (i = ntokens; i < nsyms; i++)
     {
       short *sp;
   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;
          fprintf (stderr, "\t\t%d:", *sp);
       for (sp = derives[i]; *sp > 0; sp++)
        {
          short *rhsp;
          fprintf (stderr, "\t\t%d:", *sp);

-         for (rhsp = ritem + rule_table[*sp].rhs; *rhsp > 0; ++rhsp)
-           fprintf (stderr, " %s", tags[*rhsp]);
-         fputc ('\n', stderr);
+         for (rhsp = &ritem[rules[*sp].rhs]; *rhsp >= 0; ++rhsp)
+           fprintf (stderr, " %s", symbols[*rhsp]->tag);
+         fprintf (stderr, " (rule %d)\n", -*rhsp - 1);

        }
     }
 
        }
     }
 


@@ -63,7 +58,6 @@ void
 set_derives (void)
 {
   int i;
 set_derives (void)
 {
   int i;

-  int lhs;

   shorts *p;
   short *q;
   shorts **dset;
   shorts *p;
   short *q;
   shorts **dset;


@@ -74,16 +68,14 @@ set_derives (void)
 
   p = delts;
   for (i = nrules; i > 0; i--)
 
   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++;
-       }
-    }
+    if (rules[i].useful)
+      {
+       int lhs = rules[i].lhs;
+       p->next = dset[lhs];
+       p->value = i;
+       dset[lhs] = p;
+       p++;
+      }

 
   derives = XCALLOC (short *, nvars) - ntokens;
   q = XCALLOC (short, nvars + nrules);
 
   derives = XCALLOC (short *, nvars) - ntokens;
   q = XCALLOC (short, nvars + nrules);