X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2e729273d633f1ddaf1b6affdca53f3e63f3715c..cb9ec4fada480554cf47810fee736997d64e7427:/src/print_graph.c
diff --git a/src/print_graph.c b/src/print_graph.c
index 5045ed0f..d37afb2c 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,80 +1,106 @@
-/* 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.
- 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
- 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
- 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 . */
+#include
#include "system.h"
-#include "files.h"
-#include "gram.h"
+
#include "LR0.h"
-#include "lalr.h"
-#include "conflicts.h"
+#include "closure.h"
#include "complain.h"
+#include "conflicts.h"
+#include "files.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 "vcg.h"
+#include "reader.h"
+#include "state.h"
+#include "symtab.h"
-static graph_t graph;
-static FILE *fgraph = NULL;
-/* This part will construct the label of nodes. */
+/*----------------------------.
+| Construct the node labels. |
+`----------------------------*/
+
static void
-print_core (int state, struct obstack *node_obstack)
+print_core (struct obstack *oout, state *s)
{
- int i;
- short *sitems = state_table[state]->items;
- int snitems = state_table[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. */
- closure (sitems, snitems);
- sitems = itemset;
- snitems = nitemset;
+ if (report_flag & report_itemsets)
+ {
+ closure (sitems, snritems);
+ sitems = itemset;
+ snritems = nitemset;
+ }
- obstack_fgrow1 (node_obstack, "%2d: ", state);
- for (i = 0; i < snitems; i++)
+ obstack_printf (oout, "%d", s->number);
+ for (i = 0; i < snritems; i++)
{
- short *sp;
- short *sp1;
- int rule;
+ item_number *sp;
+ item_number *sp1;
+ rule_number r;
sp1 = sp = ritem + sitems[i];
- while (*sp > 0)
- sp++;
-
- rule = -(*sp);
-
- if (i)
- obstack_sgrow (node_obstack, "\n ");
- obstack_fgrow1 (node_obstack, " %s -> ",
- tags[rule_table[rule].lhs]);
-
- for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
- obstack_fgrow1 (node_obstack, "%s ", tags[*sp]);
-
- obstack_1grow (node_obstack, '.');
-
- for (/* Nothing */; *sp > 0; ++sp)
- obstack_fgrow1 (node_obstack, " %s", tags[*sp]);
+ 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, "]");
+ }
+ }
}
}
@@ -85,88 +111,34 @@ print_core (int state, struct obstack *node_obstack)
`---------------------------------------------------------------*/
static void
-print_actions (int state, const char *node_name)
+print_actions (state const *s, FILE *fgraph)
{
int i;
- shifts *shiftp = state_table[state]->shifts;
- reductions *redp = state_table[state]->reductions;
-#if 0
- errs *errp = state_table[state]->errs;
-#endif
+ transitions const *trans = s->transitions;
- 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;
- }
+ if (!trans->num && !s->reductions)
+ 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];
- int symbol = state_table[state1]->accessing_symbol;
-
- new_edge (&edge);
-
- if (state > 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 red. */
- edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red;
- edge.label = tags[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);
}
-
-#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
}
@@ -176,72 +148,35 @@ print_actions (int state, const char *node_name)
`-------------------------------------------------------------*/
static void
-print_state (int state)
+print_state (state *s, FILE *fgraph)
{
- static char name[10];
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);
- new_node (&node);
- sprintf (name, "%d", state);
- node.title = name;
- print_core (state, &node_obstack);
+ print_core (&node_obstack, s);
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. */
- print_actions (state, name);
-
- obstack_free (&node_obstack, 0);
+ print_actions (s, fgraph);
}
void
print_graph (void)
{
- int i;
-
- if (!graph_flag)
- return;
-
- /* 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 (nitems);
+ new_closure (nritems);
for (i = 0; i < nstates; i++)
- print_state (i);
+ print_state (states[i], fgraph);
free_closure ();
- /* Close graph. */
- close_graph (&graph, fgraph);
+ finish_graph (fgraph);
xfclose (fgraph);
}