X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1a2b5d37e1d44b47cd51220945f4ba29c228a419..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/print_graph.c diff --git a/src/print_graph.c b/src/print_graph.c index d32e5520..aba69028 100644 --- a/src/print_graph.c +++ b/src/print_graph.c @@ -1,5 +1,7 @@ -/* 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, 2002, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -15,78 +17,94 @@ 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 #include "system.h" -#include "quotearg.h" -#include "files.h" -#include "symtab.h" -#include "gram.h" + +#include + #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" - -static graph_t graph; -static FILE *fgraph = NULL; +#include "reader.h" +#include "state.h" +#include "symtab.h" -static inline const char * -escape (const char *s) -{ - return quotearg_n_style (1, escape_quoting_style, s); -} +/*----------------------------. +| Construct the node labels. | +`----------------------------*/ -/* This part will construct the label of nodes. */ static void -print_core (state_t *state, struct obstack *node_obstack) +print_core (struct obstack *oout, state *s) { - int i; - short *sitems = state->items; - int snitems = 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. */ - if (trace_flag) + if (report_flag & report_itemsets) { - closure (sitems, snitems); + closure (sitems, snritems); sitems = itemset; - snitems = nitemset; + snritems = nritemset; } - obstack_fgrow1 (node_obstack, "state %2d\n", state->number); - for (i = 0; i < snitems; i++) + obstack_fgrow1 (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); + r = item_number_as_rule_number (*sp); - if (i) - obstack_1grow (node_obstack, '\n'); - obstack_fgrow1 (node_obstack, " %s -> ", - escape (symbols[rules[rule].lhs]->tag)); + obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag); - for (sp = ritem + rules[rule].rhs; sp < sp1; sp++) - obstack_fgrow1 (node_obstack, "%s ", escape (symbols[*sp]->tag)); + for (sp = rules[r].rhs; sp < sp1; sp++) + obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag); - obstack_1grow (node_obstack, '.'); + obstack_1grow (oout, '.'); for (/* Nothing */; *sp >= 0; ++sp) - obstack_fgrow1 (node_obstack, " %s", escape (symbols[*sp]->tag)); + obstack_fgrow1 (oout, " %s", symbols[*sp]->tag); + + /* 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. */ + 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, "]"); + } + } } } @@ -97,42 +115,33 @@ print_core (state_t *state, struct obstack *node_obstack) `---------------------------------------------------------------*/ static void -print_actions (state_t *state, const char *node_name) +print_actions (state const *s, FILE *fgraph) { int i; - shifts *shiftp = state->shifts; - reductions *redp = state->reductions; + transitions const *trans = s->transitions; - static char buff[10]; - edge_t edge; - - if (!shiftp->nshifts && !redp) + 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->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 = escape (symbols[symbol]->tag); - 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) + && strcmp (symbols[sym]->tag, "error") != 0) + abort (); + output_edge (s->number, s1->number, + TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag, + style, fgraph); } } @@ -143,69 +152,35 @@ print_actions (state_t *state, const char *node_name) `-------------------------------------------------------------*/ static void -print_state (state_t *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->number); - 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; - - /* 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++) - print_state (state_table[i]); + print_state (states[i], fgraph); free_closure (); - /* Close graph. */ - close_graph (&graph, fgraph); + finish_graph (fgraph); xfclose (fgraph); }