* src/derives.c (print_derives): Fix and enrich.

* src/closure.c (print_fderives): Likewise.

diff --git a/ChangeLog b/ChangeLog
index fd85c1faf6b60de1e166124dcd97c813c170a3f4..8c43d62a5502b0ce38f54f9f4ed28ee9b34e898f 100644 (file)
--- 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 ac37b2c018021e162b9520e5d84670f585618bed..ab086342dc67c4140b586098740f970efb398617 100644 (file)
--- 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 3a34a30ff72df5e3b16fa30cce06abc7d8a153a1..f0c41165a8bca1eadae1775612cf7892238dce8a 100644 (file)
--- 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);