scan-skel.l: shift complain_args arguments

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 9580f3f145ab9d204fc391bf63d0df6ea8382b98..ca1dc24ea54a89713b3426219d50d7dd457be73e 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,28 +1,25 @@
-/* Output a VCG description on generated parser, for Bison,
+/* Output a graph of the generated parser, for Bison.

 
 

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

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

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 
 #include <config.h>

-#include "system.h"
-

 #include <quotearg.h>
 #include <quotearg.h>

+#include "system.h"

 
 #include "LR0.h"
 #include "closure.h"
 
 #include "LR0.h"
 #include "closure.h"


@@ -31,15 +28,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;

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


@@ -58,10 +52,10 @@ print_core (struct obstack *oout, state *s)
     {
       closure (sitems, snritems);
       sitems = itemset;
     {
       closure (sitems, snritems);
       sitems = itemset;

-      snritems = nritemset;
+      snritems = nitemset;

     }
 
     }
 

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

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


@@ -71,45 +65,45 @@ print_core (struct obstack *oout, state *s)
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)

-       sp++;
+        sp++;

 
       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_printf (oout, "%d: %s -> ", r, escape (rules[r].lhs->tag));

 
       for (sp = rules[r].rhs; sp < sp1; sp++)
 
       for (sp = rules[r].rhs; sp < sp1; sp++)

-       obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
+        obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));

 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)

-       obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
-
-      /* Experimental feature: display the look-ahead tokens. */
-      if (report_flag & report_look_ahead_tokens)
-       {
-         /* 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->look_ahead_tokens && redno != -1)
-           {
-             bitset_iterator biter;
-             int k;
-             char const *sep = "";
-             obstack_sgrow (oout, "[");
-             BITSET_FOR_EACH (biter, reds->look_ahead_tokens[redno], k, 0)
-               {
-                 obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
-                 sep = ", ";
-               }
-             obstack_sgrow (oout, "]");
-           }
-       }
+        obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
+
+      /* Experimental feature: display the lookahead tokens. */
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
+        {
+          /* 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->lookahead_tokens && redno != -1)
+            {
+              bitset_iterator biter;
+              int k;
+              char const *sep = "";
+              obstack_1grow (oout, '[');
+              BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
+                {
+                  obstack_sgrow (oout, sep);
+                  obstack_sgrow (oout, escape (symbols[k]->tag));
+                  sep = ", ";
+                }
+              obstack_1grow (oout, ']');
+            }
+        }
+      obstack_sgrow (oout, "\\l");

     }
 }
 
     }
 }
 


@@ -120,42 +114,36 @@ 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;
+  /* Display reductions. */
+  output_red (s, s->reductions, fgraph);

 
 

-  if (!trans->num && !reds)
+  if (!trans->num && !s->reductions)

     return;
 
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i))
       {
     return;
 
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i))
       {

-       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);
+        state *s1 = trans->states[i];
+        symbol_number sym = s1->accessing_symbol;
+
+        /* 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)
+            && STRNEQ (symbols[sym]->tag, "error"))
+          abort ();
+        output_edge (s->number, s1->number,
+                     TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
+                     style, fgraph);

       }
 }
 
       }
 }
 


@@ -166,29 +154,18 @@ 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);
   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_finish0 (&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,32 +173,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);
-
-  static_graph.display_edge_labels = yes;
-
-  static_graph.port_sharing = no;
-  static_graph.finetuning = 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);
 }