Merge remote-tracking branch 'origin/maint'

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index e0aa0c31acb7660b7813c3bfb9e95af37355dc30..61d3651297342ef40bdd1d69a5fc5297f2dbe0ae 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,42 +1,38 @@
-/* Output a VCG description on generated parser, for Bison,
-   Copyright 2001 Free Software Foundation, Inc.
+/* Output a graph of the generated parser, for Bison.
+
+   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

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

-#include "quotearg.h"
-#include "files.h"
-#include "symtab.h"
-#include "gram.h"
+

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

-#include "lalr.h"
-#include "conflicts.h"
+#include "closure.h"

 #include "complain.h"
 #include "complain.h"

+#include "conflicts.h"
+#include "files.h"

 #include "getargs.h"
 #include "getargs.h"

-#include "state.h"
-#include "reader.h"
-#include "closure.h"
-#include "obstack.h"
+#include "gram.h"
+#include "graphviz.h"
+#include "lalr.h"

 #include "print_graph.h"
 #include "print_graph.h"

-#include "vcg.h"
-
-static graph_t graph;
-static FILE *fgraph = NULL;
+#include "reader.h"
+#include "state.h"
+#include "symtab.h"

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


@@ -44,71 +40,67 @@ static FILE *fgraph = NULL;
 `----------------------------*/
 
 static void
 `----------------------------*/
 
 static void

-print_core (struct obstack *oout, state_t *state)
+print_core (struct obstack *oout, state *s)

 {
 {

-  int i;
-  item_number_t *sitems = state->items;
-  int snritems   = state->nitems;
+  size_t i;
+  item_number *sitems = s->items;
+  size_t snritems = s->nitems;

 
   /* Output all the items of a state, not only its kernel.  */
 
   /* Output all the items of a state, not only its kernel.  */

-  if (trace_flag)
+  if (report_flag & report_itemsets)

     {
       closure (sitems, snritems);
       sitems = itemset;
     {
       closure (sitems, snritems);
       sitems = itemset;

-      snritems = nritemset;
+      snritems = nitemset;

     }
 
     }
 

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

   for (i = 0; i < snritems; i++)
     {
   for (i = 0; i < snritems; i++)
     {

-      item_number_t *sp;
-      item_number_t *sp1;
-      int rule;
+      item_number *sp;
+      item_number *sp1;
+      rule_number r;

 
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
 
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)

-       sp++;
+        sp++;

 
 

-      rule = -(*sp);
+      r = item_number_as_rule_number (*sp);

 
 

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

 
 

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

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

-       obstack_fgrow1 (oout, " %s", symbol_tag_get (symbols[*sp]));
-
-      /* Experimental feature: display the lookaheads. */
-      if (trace_flag && state->nlookaheads)
-       {
-         int j, k;
-         int nlookaheads = 0;
-         /* Look for lookaheads corresponding to this rule. */
-         for (j = 0; j < state->nlookaheads; ++j)
-           for (k = 0; k < ntokens; ++k)
-             if (bitset_test (state->lookaheads[j], k)
-                 && state->lookaheads_rule[j]->number == rule)
-               nlookaheads++;
-         if (nlookaheads)
-           {
-             obstack_sgrow (oout, "  [");
-             for (j = 0; j < state->nlookaheads; ++j)
-               for (k = 0; k < ntokens; ++k)
-                 if (bitset_test (state->lookaheads[j], k)
-                     && state->lookaheads_rule[j]->number == rule)
-                   obstack_fgrow2 (oout, "%s%s",
-                                   symbol_tag_get (symbols[k]),
-                                   --nlookaheads ? ", " : "");
-             obstack_sgrow (oout, "]");
-           }
-       }
+        obstack_fgrow1 (oout, " %s", 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_sgrow (oout, "[");
+              BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
+                {
+                  obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
+                  sep = ", ";
+                }
+              obstack_sgrow (oout, "]");
+            }
+        }

     }
 }
 
     }
 }
 


@@ -119,42 +111,33 @@ print_core (struct obstack *oout, state_t *state)
 `---------------------------------------------------------------*/
 
 static void
 `---------------------------------------------------------------*/
 
 static void

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

 {
   int i;
 
 {
   int i;
 

-  shifts   *shiftp = state->shifts;
-  reductions *redp = state->reductions;
-
-  static char buff[10];
-  edge_t edge;
+  transitions const *trans = s->transitions;

 
 

-  if (!shiftp->nshifts && !redp)
+  if (!trans->num && !s->reductions)

     return;
 
     return;
 

-  for (i = 0; i < shiftp->nshifts; i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
+  for (i = 0; i < trans->num; i++)
+    if (!TRANSITION_IS_DISABLED (trans, i))

       {
       {

-       int state1 = shiftp->shifts[i];
-       symbol_number_t symbol = states[state1]->accessing_symbol;
-
-       new_edge (&edge);
-
-       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;
-       /* 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 = symbol_tag_get (symbols[symbol]);
-       output_edge (&edge, 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);

       }
 }
 
       }
 }
 


@@ -165,69 +148,35 @@ print_actions (state_t *state, const char *node_name)
 `-------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------*/
 
 static void

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

 {
 {

-  static char name[10];

   struct obstack node_obstack;
   struct obstack node_obstack;

-  node_t node;

 
 

-  /* 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 (&node);
-  sprintf (name, "%d", state->number);
-  node.title = name;
-  print_core (&node_obstack, state);
+  print_core (&node_obstack, s);

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

-  node.label = obstack_finish (&node_obstack);
-
-  open_node (fgraph);
-  output_node (&node, 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 (state, name);
-
-  obstack_free (&node_obstack, 0);
+  print_actions (s, fgraph);

 }
 \f
 
 void
 print_graph (void)
 {
 }
 \f
 
 void
 print_graph (void)
 {

-  size_t i;
-
-  /* Output file.  */
-  fgraph = xfopen (spec_graph_file, "w");
-
-  new_graph (&graph);
-
-#if 0
-  graph.smanhattan_edges = yes;
-  graph.manhattan_edges = yes;
-#endif
-
-  graph.display_edge_labels = yes;
-  graph.layoutalgorithm = normal;
-
-  graph.port_sharing = no;
-  graph.finetuning = yes;
-  graph.straight_phase = yes;
-  graph.priority_phase = yes;
-  graph.splines = yes;
-
-  graph.crossing_weight = median;
-
-  /* Output graph options. */
-  open_graph (fgraph);
-  output_graph (&graph, fgraph);
+  state_number i;
+  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 (&graph, fgraph);
+  finish_graph (fgraph);

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