* src/print.c (print_actions): Output the handling of `$' as the

traces do: shifting the token EOF.  Before EOF was treated as a
nonterminal.
* tests/regression.at: Adjust some tests.
* src/print_graph.c (print_core): Complete the set of items via
closure.  The next-to-final and final states are still unsatisfying,
but that's to be addressed elsewhere.
No longer output the rule numbers, but do output the state number.
A single loop for the shifts + gotos is enough, but picked a
distinct color for each.
(print_graph): Initialize and finalize closure.

diff --git a/ChangeLog b/ChangeLog
index f38481efce5fe733688759674436b71201538d97..2e936b0a1c6ab6917ae05e3e078ab4b3779d06b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-12-13  Akim Demaille  <akim@epita.fr>
+
+       * src/print.c (print_actions): Output the handling of `$' as the
+       traces do: shifting the token EOF.  Before EOF was treated as a
+       nonterminal.
+       * tests/regression.at: Adjust some tests.
+       * src/print_graph.c (print_core): Complete the set of items via
+       closure.  The next-to-final and final states are still unsatisfying,
+       but that's to be addressed elsewhere.
+       No longer output the rule numbers, but do output the state number.
+       A single loop for the shifts + gotos is enough, but picked a
+       distinct color for each.
+       (print_graph): Initialize and finalize closure.
+
 2001-12-13  Akim Demaille  <akim@epita.fr>
 
        * src/reader.c (readgram): Remove dead code, an strip useless

diff --git a/src/print.c b/src/print.c
index 013b57804c8ec6f1906d588a89bbf221ed7741f9..0a2d0209281fd34c9d79d05cec0e40cb38263052 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -111,21 +111,14 @@ print_actions (FILE *out, int state)
       return;
     }
 
-  for (i = 0; i < shiftp->nshifts; i++)
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];
        int symbol = state_table[state1]->accessing_symbol;
-       /* The following line used to be turned off.  */
-       if (ISVAR (symbol))
-         break;
-       if (symbol == 0)        /* I.e. strcmp(tags[symbol],"$")==0 */
-         fprintf (out,
-                  _("    $   \tgo to state %d\n"), state1);
-       else
-         fprintf (out,
-                  _("    %-4s\tshift, and go to state %d\n"),
-                  tags[symbol], state1);
+       fprintf (out,
+                _("    %-4s\tshift, and go to state %d\n"),
+                tags[symbol], state1);
       }
 
   if (i > 0)

diff --git a/src/print_graph.c b/src/print_graph.c
index 74dc93a6bd2d22e6e1f2673e2e96043f1cf8c46f..5045ed0fec218ba671c83e7daa59e9b13c018cff 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -28,6 +28,7 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
+#include "closure.h"
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
@@ -40,18 +41,22 @@ static void
 print_core (int state, struct obstack *node_obstack)
 {
   int i;
-  state_t *statep = state_table[state];
+  short *sitems = state_table[state]->items;
+  int snitems   = state_table[state]->nitems;
 
-  if (!statep->nitems)
-    return;
+  /* Output all the items of a state, not only its kernel.  */
+  closure (sitems, snitems);
+  sitems = itemset;
+  snitems = nitemset;
 
-  for (i = 0; i < statep->nitems; i++)
+  obstack_fgrow1 (node_obstack, "%2d: ", state);
+  for (i = 0; i < snitems; i++)
     {
       short *sp;
       short *sp1;
       int rule;
 
-      sp1 = sp = ritem + statep->items[i];
+      sp1 = sp = ritem + sitems[i];
 
       while (*sp > 0)
        sp++;
@@ -59,8 +64,7 @@ print_core (int state, struct obstack *node_obstack)
       rule = -(*sp);
 
       if (i)
-       obstack_1grow (node_obstack, '\n');
-      obstack_fgrow1 (node_obstack, "%d: ", rule);
+       obstack_sgrow (node_obstack, "\n    ");
       obstack_fgrow1 (node_obstack, " %s  ->  ",
                      tags[rule_table[rule].lhs]);
 
@@ -120,7 +124,8 @@ print_actions (int state, const char *node_name)
        edge.sourcename = node_name;
        sprintf (buff, "%d", state1);
        edge.targetname = buff;
-       edge.color = (symbol == 0) ? red : blue;
+       /* Shifts are blue, gotos are red. */
+       edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red;
        edge.label = tags[symbol];
        output_edge (&edge, fgraph);
        close_edge (fgraph);
@@ -162,24 +167,6 @@ print_actions (int state, const char *node_name)
                      rule, tags[symbol]);
     }
 #endif
-
-  if (i < shiftp->nshifts)
-    for (; i < shiftp->nshifts; i++)
-      if (!SHIFT_IS_DISABLED (shiftp, i))
-       {
-         int state1 = shiftp->shifts[i];
-         int symbol = state_table[state1]->accessing_symbol;
-
-         new_edge (&edge);
-         open_edge (&edge, fgraph);
-         edge.sourcename = node_name;
-         sprintf (buff, "%d", state1);
-         edge.targetname = buff;
-         edge.color = red;
-         edge.label = tags[symbol];
-         output_edge (&edge, fgraph);
-         close_edge (fgraph);
-       }
 }
 
 
@@ -249,8 +236,10 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
+  new_closure (nitems);
   for (i = 0; i < nstates; i++)
     print_state (i);
+  free_closure ();
 
   /* Close graph. */
   close_graph (&graph, fgraph);

diff --git a/tests/regression.at b/tests/regression.at
index d8788f8824def7d63e014a32f8b92cbde438b27f..f6d532507ed0d7921197c066d1fe47474247f91e 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -105,7 +105,7 @@ state 2
 
     exp  ->  exp . OP exp   (rule 1)
 
-    $          go to state 5
+    $          shift, and go to state 5
     OP         shift, and go to state 3
 
 
@@ -134,7 +134,7 @@ state 4
 
 state 5
 
-    $          go to state 6
+    $          shift, and go to state 6
 
 
 
@@ -209,7 +209,7 @@ state 2
 
     exp  ->  exp . OP exp   (rule 1)
 
-    $          go to state 5
+    $          shift, and go to state 5
     OP         shift, and go to state 3
 
 
@@ -237,7 +237,7 @@ state 4
 
 state 5
 
-    $          go to state 6
+    $          shift, and go to state 6
 
 
 
@@ -376,7 +376,7 @@ state 5
 
 state 6
 
-    $          go to state 7
+    $          shift, and go to state 7