X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa7815f5c6e8e07a85e47df9cd7b579468969efb..720e5c1bc36411c1a0591a525a897f47cfd17987:/src/derives.c?ds=inline

diff --git a/src/derives.c b/src/derives.c
index 49b4edff..f0c41165 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,5 +1,5 @@
 /* Match rules with nonterminals for bison,
-   Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 2000, 2001  Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -25,39 +25,39 @@
    */
 
 #include "system.h"
-#include "xalloc.h"
+#include "getargs.h"
 #include "types.h"
+#include "reader.h"
 #include "gram.h"
 #include "derives.h"
 
 short **derives;
 
-#if DEBUG
 
 static void
 print_derives (void)
 {
   int i;
-  short *sp;
 
-  fputs ("\n\n\n", stdout);
-  printf (_("DERIVES"));
-  fputs ("\n\n", stdout);
+  fputs ("DERIVES\n", stderr);
 
   for (i = ntokens; i < nsyms; i++)
     {
-      printf (_("%s derives"), tags[i]);
+      short *sp;
+      fprintf (stderr, "\t%s derives\n", tags[i]);
       for (sp = derives[i]; *sp > 0; sp++)
 	{
-	  printf ("  %d", *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);
 	}
-      putchar ('\n');
     }
 
-  putchar ('\n');
+  fputs ("\n\n", stderr);
 }
 
-#endif
 
 void
 set_derives (void)
@@ -75,7 +75,7 @@ set_derives (void)
   p = delts;
   for (i = nrules; i > 0; i--)
     {
-      lhs = rlhs[i];
+      lhs = rule_table[i].lhs;
       if (lhs >= 0)
 	{
 	  p->next = dset[lhs];
@@ -100,9 +100,8 @@ set_derives (void)
       *q++ = -1;
     }
 
-#if DEBUG
-  print_derives ();
-#endif
+  if (trace_flag)
+    print_derives ();
 
   XFREE (dset + ntokens);
   XFREE (delts);