* src/LR0.c, src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 74dc93a6bd2d22e6e1f2673e2e96043f1cf8c46f..f9bec77d4c81638a110f0e0b2527d27687c1f19b 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -19,7 +19,9 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"

+#include "quotearg.h"

 #include "files.h"
 #include "files.h"

+#include "symtab.h"

 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"


@@ -28,6 +30,7 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"

+#include "closure.h"

 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"
 #include "obstack.h"
 #include "print_graph.h"
 #include "vcg.h"


@@ -35,42 +38,55 @@
 static graph_t graph;
 static FILE *fgraph = NULL;
 
 static graph_t graph;
 static FILE *fgraph = NULL;
 

+static inline const char *
+escape (const char *s)
+{
+  return quotearg_n_style (1, escape_quoting_style, s);
+}
+
+

 /* This part will construct the label of nodes. */
 static void
 /* This part will construct the label of nodes. */
 static void

-print_core (int state, struct obstack *node_obstack)
+print_core (state_t *state, struct obstack *node_obstack)

 {
   int i;
 {
   int i;

-  state_t *statep = state_table[state];
+  short *sitems = state->items;
+  int snitems   = state->nitems;

 
 

-  if (!statep->nitems)
-    return;
+  /* Output all the items of a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snitems);
+      sitems = itemset;
+      snitems = nitemset;
+    }

 
 

-  for (i = 0; i < statep->nitems; i++)
+  obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
+  for (i = 0; i < snitems; i++)

     {
       short *sp;
       short *sp1;
       int rule;
 
     {
       short *sp;
       short *sp1;
       int rule;
 

-      sp1 = sp = ritem + statep->items[i];
+      sp1 = sp = ritem + sitems[i];

 
 

-      while (*sp > 0)
+      while (*sp >= 0)

        sp++;
 
       rule = -(*sp);
 
       if (i)
        obstack_1grow (node_obstack, '\n');
        sp++;
 
       rule = -(*sp);
 
       if (i)
        obstack_1grow (node_obstack, '\n');

-      obstack_fgrow1 (node_obstack, "%d: ", rule);
-      obstack_fgrow1 (node_obstack, " %s  ->  ",
-                     tags[rule_table[rule].lhs]);
+      obstack_fgrow1 (node_obstack, " %s -> ",
+                     escape (symbols[rules[rule].lhs]->tag));

 
 

-      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-       obstack_fgrow1 (node_obstack, "%s ", tags[*sp]);
+      for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+       obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag));

 
       obstack_1grow (node_obstack, '.');
 
 
       obstack_1grow (node_obstack, '.');
 

-      for (/* Nothing */; *sp > 0; ++sp)
-       obstack_fgrow1 (node_obstack, " %s", tags[*sp]);
+      for (/* Nothing */; *sp >= 0; ++sp)
+       obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag));

     }
 }
 
     }
 }
 


@@ -81,105 +97,43 @@ print_core (int state, struct obstack *node_obstack)
 `---------------------------------------------------------------*/
 
 static void
 `---------------------------------------------------------------*/
 
 static void

-print_actions (int state, const char *node_name)
+print_actions (state_t *state, const char *node_name)

 {
   int i;
 
 {
   int i;
 

-  shifts   *shiftp = state_table[state]->shifts;
-  reductions *redp = state_table[state]->reductions;
-#if 0
-  errs       *errp = state_table[state]->errs;
-#endif
+  shifts   *shiftp = state->shifts;
+  reductions *redp = state->reductions;

 
   static char buff[10];
   edge_t edge;
 
   if (!shiftp->nshifts && !redp)
 
   static char buff[10];
   edge_t edge;
 
   if (!shiftp->nshifts && !redp)

-    {
-#if 0
-      if (final_state == state)
-       obstack_sgrow (node_obstack, "$default: accept");
-      else
-       obstack_sgrow (node_obstack, "NO ACTIONS");
-#endif
-      return;
-    }
+    return;

 
   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];
 
   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];

-       int symbol = state_table[state1]->accessing_symbol;
+       int symbol = states[state1]->accessing_symbol;

 
        new_edge (&edge);
 
 
        new_edge (&edge);
 

-       if (state > state1)
+       if (state->number > state1)

          edge.type = back_edge;
        open_edge (&edge, fgraph);
        /* The edge source is the current node.  */
        edge.sourcename = node_name;
        sprintf (buff, "%d", state1);
        edge.targetname = buff;
          edge.type = back_edge;
        open_edge (&edge, fgraph);
        /* The edge source is the current node.  */
        edge.sourcename = node_name;
        sprintf (buff, "%d", state1);
        edge.targetname = buff;

-       edge.color = (symbol == 0) ? red : blue;
-       edge.label = tags[symbol];
+       /* Shifts are blue, gotos are green, and error is red. */
+       if (SHIFT_IS_ERROR (shiftp, i))
+         edge.color = red;
+       else
+         edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
+       edge.label = escape (symbols[symbol]->tag);

        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }
        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }

-
-#if 0
-  if (errp)
-    {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
-       {
-         if (!errp->errs[j])
-           continue;
-         symbol = errp->errs[j];
-         /* If something has been added in the NODE_OBSTACK after
-            the declaration of the label, then we need a `\n'.
-         if (obstack_object_size (node_obstack) > node_output_size)
-           obstack_sgrow (node_obstack, "\n");
-           */
-         obstack_fgrow1 (node_obstack, _("%-4s\terror (nonassociative)"),
-                         tags[symbol]);
-       }
-      if (j > 0)
-       obstack_1grow (node_obstack, '\n');
-    }
-
-  if (state_table[state]->consistent && redp)
-    {
-      rule = redp->rules[0];
-      symbol = rule_table[rule].lhs;
-      /*
-      if (obstack_object_size (node_obstack) > node_output_size)
-       obstack_sgrow (node_obstack, "\n");
-       */
-      obstack_fgrow2 (node_obstack, _("$default\treduce using rule %d (%s)"),
-                     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);
-       }

 }
 
 
 }
 
 


@@ -189,7 +143,7 @@ print_actions (int state, const char *node_name)
 `-------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------*/
 
 static void

-print_state (int state)
+print_state (state_t *state)

 {
   static char name[10];
   struct obstack node_obstack;
 {
   static char name[10];
   struct obstack node_obstack;


@@ -198,7 +152,7 @@ print_state (int state)
   /* The labels of the nodes are their the items.  */
   obstack_init (&node_obstack);
   new_node (&node);
   /* The labels of the nodes are their the items.  */
   obstack_init (&node_obstack);
   new_node (&node);

-  sprintf (name, "%d", state);
+  sprintf (name, "%d", state->number);

   node.title = name;
   print_core (state, &node_obstack);
   obstack_1grow (&node_obstack, '\0');
   node.title = name;
   print_core (state, &node_obstack);
   obstack_1grow (&node_obstack, '\0');


@@ -220,9 +174,6 @@ print_graph (void)
 {
   int i;
 
 {
   int i;
 

-  if (!graph_flag)
-    return;
-

   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");
 
   /* Output file.  */
   fgraph = xfopen (spec_graph_file, "w");
 


@@ -249,8 +200,10 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */

+  new_closure (nritems);

   for (i = 0; i < nstates; i++)
   for (i = 0; i < nstates; i++)

-    print_state (i);
+    print_state (states[i]);
+  free_closure ();

 
   /* Close graph. */
   close_graph (&graph, fgraph);
 
   /* Close graph. */
   close_graph (&graph, fgraph);