From: Akim Demaille <akim@epita.fr>
Date: Mon, 19 Nov 2001 10:39:21 +0000 (+0000)
Subject: * src/derives.c (print_derives): Fix and enrich.
X-Git-Tag: before-m4-back-end~282
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/720e5c1bc36411c1a0591a525a897f47cfd17987

* src/derives.c (print_derives): Fix and enrich.
* src/closure.c (print_fderives): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index fd85c1fa..8c43d62a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19  Akim Demaille  <akim@epita.fr>
+
+	* src/derives.c (print_derives): Fix and enrich.
+	* src/closure.c (print_fderives): Likewise.
+
+	
 2001-11-19  Akim Demaille  <akim@epita.fr>
 
 	* src/closure.c (itemsetend): Remove, replaced with...
diff --git a/src/closure.c b/src/closure.c
index ac37b2c0..ab086342 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -100,7 +100,13 @@ print_fderives (void)
 
       for (j = 0; j <= nrules; j++)
 	if (BITISSET (rp, j))
-	  fprintf (stderr, "\t\t%d (%s)\n", j, tags[j]);
+	  {
+	    short *rhsp;
+	    fprintf (stderr, "\t\t%d:", j);
+	    for (rhsp = ritem + rule_table[j].rhs; *rhsp > 0; ++rhsp)
+	      fprintf (stderr, " %s", tags[*rhsp]);
+	    fputc ('\n', stderr);
+	  }
     }
   fprintf (stderr, "\n\n");
 }
diff --git a/src/derives.c b/src/derives.c
index 3a34a30f..f0c41165 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -38,15 +38,21 @@ static void
 print_derives (void)
 {
   int i;
-  short *sp;
 
   fputs ("DERIVES\n", stderr);
 
   for (i = ntokens; i < nsyms; i++)
     {
+      short *sp;
       fprintf (stderr, "\t%s derives\n", tags[i]);
       for (sp = derives[i]; *sp > 0; sp++)
-	fprintf (stderr, "\t\t%d (%s)\n", *sp, tags[*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);
+	}
     }
 
   fputs ("\n\n", stderr);