* src/closure.c (print_closure): Improve.

(closure): Use it for printing input and output.

diff --git a/ChangeLog b/ChangeLog
index 840e1e4c0b48fc90ac8a6772c396fe9e16061a62..5f3544782a397d7296d3e9855ed4f76c211b8bd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-05  Akim Demaille  <akim@epita.fr>
+
+       * src/closure.c (print_closure): Improve.
+       (closure): Use it for printing input and output.
+
+       
 2001-12-05  Akim Demaille  <akim@epita.fr>
 
        * src/closure.c (FIRSTS, FDERIVES): Adjust to reality: they are

diff --git a/src/LR0.c b/src/LR0.c
index 6910f3e0862770892053240678dcd4763846f0d8..f8fa5bd0c15b564aee15c7bbd64fdfc6f44b2c95 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -583,6 +583,9 @@ generate_states (void)
 
   while (this_state)
     {
+      if (trace_flag)
+       fprintf (stderr, "Processing state %d (reached by %s)\n",
+                this_state->number, tags[this_state->accessing_symbol]);
       /* Set up ruleset and itemset for the transitions out of this
          state.  ruleset gets a 1 bit for each rule that could reduce
          now.  itemset gets a vector of all the items that could be

diff --git a/src/closure.c b/src/closure.c
index bb45ba026cae20fe99ed42852bc383c00f28555b..ed35c730fc438fec8e29693dd24526f47b09c7d4 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -52,13 +52,19 @@ static int varsetsize;
 `-----------------*/
 
 static void
-print_closure (int n)
+print_closure (const char *title, short *array, size_t size)
 {
-  int i;
-  fprintf (stderr, "n = %d\n", n);
-  for (i = 0; i < itemsetsize; ++i)
-    fprintf (stderr, "   %d\n", itemset[i]);
-  fprintf (stderr, "\n\n");
+  size_t i;
+  fprintf (stderr, "Closure: %s\n", title);
+  for (i = 0; i < size; ++i)
+    {
+      short *rp;
+      fprintf (stderr, "  %2d: .", array[i]);
+      for (rp = &ritem[array[i]]; *rp > 0; ++rp)
+       fprintf (stderr, " %s", tags[*rp]);
+      fprintf (stderr, "  (rule %d)\n", -*rp);
+    }
+  fputs ("\n\n", stderr);
 }
 
 
@@ -194,12 +200,7 @@ closure (short *core, int n)
   int ruleno;
 
   if (trace_flag)
-    {
-      fprintf (stderr, "Entering closure (items = {");
-      for (c = 0; c < n; ++c)
-       fprintf (stderr, " %d ", core[c]);
-      fprintf (stderr, "})\n");
-    }
+    print_closure ("input", core, n);
 
   if (n == 0)
     {
@@ -241,7 +242,7 @@ closure (short *core, int n)
     }
 
   if (trace_flag)
-    print_closure (n);
+    print_closure ("output", itemset, itemsetsize);
 }