Merge branch 'maint'

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 4430f00da8e1ee2bd20f507ea9564073e1e0a789..d37afb2cd9d45c3fe36d208101f5941c2251f778 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,242 +1,182 @@
-/* Output a VCG description on generated parser, for bison,
-   Copyright 1984, 1986, 1989, 2000, 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 "xalloc.h"
-#include "files.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 "obstack.h"
+#include "gram.h"
+#include "graphviz.h"
+#include "lalr.h"

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

-#include "vcg.h"
+#include "reader.h"
+#include "state.h"
+#include "symtab.h"
+

 
 

-static graph_t graph;
+/*----------------------------.
+| Construct the node labels.  |
+`----------------------------*/

 
 

-/* This part will construct the label of nodes. */

 static void
 static void

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

 {
 {

-  int i;
-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
-  
-  statep = state_table[state];
-  k = statep->nitems;
-
-  if (k == 0)
-    return;
-  
-  obstack_sgrow(&graph_obstack, "\t\tlabel:\t\"");
+  size_t i;
+  item_number *sitems = s->items;
+  size_t snritems = s->nitems;

 
 

-  for (i = 0; i < k; i++)
+  /* Output all the items of a state, not only its kernel.  */
+  if (report_flag & report_itemsets)

     {
     {

-      sp1 = sp = ritem + statep->items[i];
-
-      while (*sp > 0)
-       sp++;
-
-      rule = -(*sp);
-
-      obstack_fgrow1(&graph_obstack, _("%d: "), rule);
-      obstack_fgrow1(&graph_obstack, " %s  ->  ", tags[rlhs[rule]]);  
-
-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-       obstack_fgrow1(&graph_obstack, "%s ", tags[*sp]);
+      closure (sitems, snritems);
+      sitems = itemset;
+      snritems = nitemset;
+    }

 
 

-      obstack_1grow(&graph_obstack, '.');
-  
-      while (*sp > 0)
-       obstack_fgrow1(&graph_obstack, " %s", tags[*sp++]);
-      
-      obstack_sgrow(&graph_obstack, "\\n");
+  obstack_printf (oout, "%d", s->number);
+  for (i = 0; i < snritems; i++)
+    {
+      item_number *sp;
+      item_number *sp1;
+      rule_number r;
+
+      sp1 = sp = ritem + sitems[i];
+
+      while (*sp >= 0)
+        sp++;
+
+      r = item_number_as_rule_number (*sp);
+
+      obstack_printf (oout, "\n%s -> ", rules[r].lhs->tag);
+
+      for (sp = rules[r].rhs; sp < sp1; sp++)
+        obstack_printf (oout, "%s ", symbols[*sp]->tag);
+
+      obstack_1grow (oout, '.');
+
+      for (/* Nothing */; *sp >= 0; ++sp)
+        obstack_printf (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_printf (oout, "%s%s", sep, symbols[k]->tag);
+                  sep = ", ";
+                }
+              obstack_sgrow (oout, "]");
+            }
+        }

     }
     }

-  obstack_sgrow(&graph_obstack, "\"\n");

 }
 
 }
 

+
+/*---------------------------------------------------------------.
+| Output in graph_obstack edges specifications in incidence with |
+| current node.                                                  |
+`---------------------------------------------------------------*/
+

 static void
 static void

-print_actions (int state, node_t *node)
+print_actions (state const *s, FILE *fgraph)

 {
   int i;
 {
   int i;

-  int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
-  int rule;
-  static char buff[10];
-  edge_t edge;
-  
-  shiftp = shift_table[state];
-  redp = reduction_table[state];
-  errp = err_table[state];
-
-  if (!shiftp && !redp)
-    {
-      if (final_state == state)
-       ;//fprintf(f, "    $default\taccept\n");
-      else
-       ;//fprintf(f, "    NO ACTIONS\n");
-      return;
-    }

 
 

-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         state1 = shiftp->shifts[i];
-         symbol = accessing_symbol[state1];
-
-         if (ISVAR (symbol))
-           break;
-         
-         {
-           new_edge (&edge);
-
-           if (state > state1)
-             edge.type = back_edge;
-           open_edge (&edge, &graph_obstack);
-           edge.sourcename = node->title;
-           edge.targetname = buff;
-           sprintf (edge.targetname, "%d", state1);
-           edge.color = (symbol == 0) ? blue : red; 
-           edge.label = tags[symbol];
-           output_edge (&edge, &graph_obstack);    
-           close_edge (&graph_obstack);
-         }     
-       }
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  transitions const *trans = s->transitions;

 
 

-  if (errp)
-    {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
+  if (!trans->num && !s->reductions)
+    return;

 
 

-      for (j = 0; j < nerrs; j++)
-       {
-         if (!errp->errs[j])
-           continue;
-         symbol = errp->errs[j];
-       }
-    }
-  
-  if (consistent[state] && redp)
-    {
-      rule = redp->rules[0];
-      symbol = rlhs[rule];
-    }
-  
-  if (i < k)
-    {
-      for (; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         state1 = shiftp->shifts[i];
-         symbol = accessing_symbol[state1];
-
-         new_edge (&edge);
-         open_edge (&edge, &graph_obstack);
-         edge.sourcename = node->title;
-         edge.targetname = buff;
-         edge.color = red;
-         sprintf (edge.targetname, "%d", state1);
-         edge.label = tags[symbol];
-         output_edge (&edge, &graph_obstack);
-         close_edge (&graph_obstack);
-       }
-    }
+  for (i = 0; i < trans->num; i++)
+    if (!TRANSITION_IS_DISABLED (trans, i))
+      {
+        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);
+      }

 }
 
 }
 

+
+/*-------------------------------------------------------------.
+| Output in FGRAPH the current node specifications and exiting |
+| edges.                                                       |
+`-------------------------------------------------------------*/
+

 static void
 static void

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

 {
 {

-  static char name[10];
-  node_t node;  
-
-  new_node (&node);
-  open_node (&graph_obstack);
-  
-  sprintf(name, "%d", state);
-  node.title = name;  
-  output_node (&node, &graph_obstack);
-  
-  print_core (state);   /* node label */
-  
-  close_node (&graph_obstack);
-  
-  print_actions (state, &node);        /* edges */
+  struct obstack node_obstack;
+
+  /* A node's label contains its items.  */
+  obstack_init (&node_obstack);
+  print_core (&node_obstack, s);
+  obstack_1grow (&node_obstack, '\0');
+  output_node (s->number, obstack_finish (&node_obstack), fgraph);
+  obstack_free (&node_obstack, 0);
+
+  /* Output the edges.  */
+  print_actions (s, fgraph);

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

-  int i;
-  
-  if (!graph_flag)
-    return ;
-  new_graph (&graph);
-  
-  /* graph.smanhattan_edges = yes;
-     graph.manhattan_edges = yes; */
-  
-  graph.display_edge_labels = yes;
-  graph.layoutalgorithm = 0;
-  
-  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 (&graph_obstack);
-  output_graph (&graph, &graph_obstack);
+  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++)
   for (i = 0; i < nstates; i++)

-      /* Output nodes & edges. */
-      print_state (i);
+    print_state (states[i], fgraph);
+  free_closure ();

 
 

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

 }
 }

-