2007-02-07 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index f70c1435eea8cd4d5a8cfcee5132d57766da0141..aba6902831e155eae002a17143ba3cfedbd6035d 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,6 +1,7 @@
-/* Output a VCG description on generated parser, for Bison,
+/* Output a graph of the generated parser, for Bison.

 
 

-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -16,12 +17,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to

-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 

+#include <config.h>

 #include "system.h"
 
 #include "system.h"
 

-#include <obstack.h>

 #include <quotearg.h>
 
 #include "LR0.h"
 #include <quotearg.h>
 
 #include "LR0.h"


@@ -31,15 +32,12 @@
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"

+#include "graphviz.h"

 #include "lalr.h"
 #include "print_graph.h"
 #include "reader.h"
 #include "state.h"
 #include "symtab.h"
 #include "lalr.h"
 #include "print_graph.h"
 #include "reader.h"
 #include "state.h"
 #include "symtab.h"

-#include "vcg.h"
-
-static graph static_graph;
-static FILE *fgraph = NULL;

 
 
 /*----------------------------.
 
 
 /*----------------------------.


@@ -49,9 +47,9 @@ static FILE *fgraph = NULL;
 static void
 print_core (struct obstack *oout, state *s)
 {
 static void
 print_core (struct obstack *oout, state *s)
 {

-  int i;
+  size_t i;

   item_number *sitems = s->items;
   item_number *sitems = s->items;

-  int snritems = s->nitems;
+  size_t snritems = s->nitems;

 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)


@@ -61,7 +59,7 @@ print_core (struct obstack *oout, state *s)
       snritems = nritemset;
     }
 
       snritems = nritemset;
     }
 

-  obstack_fgrow1 (oout, "state %2d\n", s->number);
+  obstack_fgrow1 (oout, "%d", s->number);

   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;


@@ -75,10 +73,7 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
 
       r = item_number_as_rule_number (*sp);
 

-      if (i)
-       obstack_1grow (oout, '\n');
-      obstack_fgrow1 (oout, " %s -> ",
-                     rules[r].lhs->tag);
+      obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag);

 
       for (sp = rules[r].rhs; sp < sp1; sp++)
        obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
        obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);


@@ -88,21 +83,21 @@ print_core (struct obstack *oout, state *s)
       for (/* Nothing */; *sp >= 0; ++sp)
        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 
       for (/* Nothing */; *sp >= 0; ++sp)
        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 

-      /* Experimental feature: display the lookaheads. */
-      if (report_flag & report_lookaheads)
+      /* Experimental feature: display the lookahead tokens. */
+      if (report_flag & report_lookahead_tokens)

        {
          /* Find the reduction we are handling.  */
          reductions *reds = s->reductions;
          int redno = state_reduction_find (s, &rules[r]);
 
          /* Print them if there are.  */
        {
          /* Find the reduction we are handling.  */
          reductions *reds = s->reductions;
          int redno = state_reduction_find (s, &rules[r]);
 
          /* Print them if there are.  */

-         if (reds->lookaheads && redno != -1)
+         if (reds->lookahead_tokens && redno != -1)

            {
              bitset_iterator biter;
              int k;
              char const *sep = "";
              obstack_sgrow (oout, "[");
            {
              bitset_iterator biter;
              int k;
              char const *sep = "";
              obstack_sgrow (oout, "[");

-             BITSET_FOR_EACH (biter, reds->lookaheads[redno], k, 0)
+             BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)

                {
                  obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
                  sep = ", ";
                {
                  obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
                  sep = ", ";


@@ -120,17 +115,13 @@ print_core (struct obstack *oout, state *s)
 `---------------------------------------------------------------*/
 
 static void
 `---------------------------------------------------------------*/
 
 static void

-print_actions (state *s, const char *node_name)
+print_actions (state const *s, FILE *fgraph)

 {
   int i;
 
 {
   int i;
 

-  transitions *trans = s->transitions;
-  reductions *reds = s->reductions;
+  transitions const *trans = s->transitions;

 
 

-  static char buff[10];
-  edge e;
-
-  if (!trans->num && !reds)
+  if (!trans->num && !s->reductions)

     return;
 
   for (i = 0; i < trans->num; i++)
     return;
 
   for (i = 0; i < trans->num; i++)


@@ -139,23 +130,18 @@ print_actions (state *s, const char *node_name)
        state *s1 = trans->states[i];
        symbol_number sym = s1->accessing_symbol;
 
        state *s1 = trans->states[i];
        symbol_number sym = s1->accessing_symbol;
 

-       new_edge (&e);
-
-       if (s->number > s1->number)
-         e.type = back_edge;
-       open_edge (&e, fgraph);
-       /* The edge source is the current node.  */
-       e.sourcename = node_name;
-       sprintf (buff, "%d", s1->number);
-       e.targetname = buff;
-       /* Shifts are blue, gotos are green, and error is red. */
-       if (TRANSITION_IS_ERROR (trans, i))
-         e.color = red;
-       else
-         e.color = TRANSITION_IS_SHIFT (trans, i) ? blue : green;
-       e.label = symbols[sym]->tag;
-       output_edge (&e, fgraph);
-       close_edge (fgraph);
+       /* Shifts are solid, gotos are dashed, and error is dotted.  */
+       char const *style =
+         (TRANSITION_IS_ERROR (trans, i) ? "dotted"
+          : TRANSITION_IS_SHIFT (trans, i) ? "solid"
+          : "dashed");
+
+       if (TRANSITION_IS_ERROR (trans, i)
+           && strcmp (symbols[sym]->tag, "error") != 0)
+         abort ();
+       output_edge (s->number, s1->number,
+                    TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
+                    style, fgraph);

       }
 }
 
       }
 }
 


@@ -166,29 +152,19 @@ print_actions (state *s, const char *node_name)
 `-------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------*/
 
 static void

-print_state (state *s)
+print_state (state *s, FILE *fgraph)

 {
 {

-  static char name[10];

   struct obstack node_obstack;
   struct obstack node_obstack;

-  node n;

 
 

-  /* The labels of the nodes are their the items.  */
+  /* A node's label contains its items.  */

   obstack_init (&node_obstack);
   obstack_init (&node_obstack);

-  new_node (&n);
-  sprintf (name, "%d", s->number);
-  n.title = name;

   print_core (&node_obstack, s);
   obstack_1grow (&node_obstack, '\0');
   print_core (&node_obstack, s);
   obstack_1grow (&node_obstack, '\0');

-  n.label = obstack_finish (&node_obstack);
-
-  open_node (fgraph);
-  output_node (&n, fgraph);
-  close_node (fgraph);
+  output_node (s->number, obstack_finish (&node_obstack), fgraph);
+  obstack_free (&node_obstack, 0);

 
   /* Output the edges.  */
 
   /* Output the edges.  */

-  print_actions (s, name);
-
-  obstack_free (&node_obstack, 0);
+  print_actions (s, fgraph);

 }
 \f
 
 }
 \f
 


@@ -196,39 +172,15 @@ void
 print_graph (void)
 {
   state_number i;
 print_graph (void)
 {
   state_number i;

-
-  /* Output file.  */
-  fgraph = xfopen (spec_graph_file, "w");
-
-  new_graph (&static_graph);
-
-#if 0
-  static_graph.smanhattan_edges = yes;
-  static_graph.manhattan_edges = yes;
-#endif
-
-  static_graph.display_edge_labels = yes;
-  static_graph.layoutalgorithm = normal;
-
-  static_graph.port_sharing = no;
-  static_graph.finetuning = yes;
-  static_graph.long_straight_phase = yes;
-  static_graph.priority_phase = yes;
-  static_graph.splines = yes;
-
-  static_graph.crossing_weight = median;
-
-  /* Output graph options. */
-  open_graph (fgraph);
-  output_graph (&static_graph, fgraph);
+  FILE *fgraph = xfopen (spec_graph_file, "w");
+  start_graph (fgraph);

 
   /* Output nodes and edges. */
   new_closure (nritems);
   for (i = 0; i < nstates; i++)
 
   /* Output nodes and edges. */
   new_closure (nritems);
   for (i = 0; i < nstates; i++)

-    print_state (states[i]);
+    print_state (states[i], fgraph);

   free_closure ();
 
   free_closure ();
 

-  /* Close graph. */
-  close_graph (&static_graph, fgraph);
+  finish_graph (fgraph);

   xfclose (fgraph);
 }
   xfclose (fgraph);
 }