X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/90b4416b5b154710407d10d6ed995c83a889a9df..4b7a4c1b1c8c18e9ad2517c117442b9b7d7e671a:/src/print_graph.c?ds=sidebyside
diff --git a/src/print_graph.c b/src/print_graph.c
index 55eb702c..86877c35 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,295 +1,185 @@
-/* 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, 2007, 2009 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
+
#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 "obstack.h"
+#include "gram.h"
+#include "graphviz.h"
+#include "lalr.h"
#include "print_graph.h"
-#include "vcg.h"
-#include "quotearg.h"
-
-static graph_t graph;
-static FILE *fgraph = NULL;
+#include "reader.h"
+#include "state.h"
+#include "symtab.h"
-static size_t node_output_size = 0;
-/* Return an unambiguous printable representated, allocated in slot 0,
- for NAME, suitable for C strings. */
-static char const *
-quote (char const *name)
-{
- return quotearg_n_style (0, escape_quoting_style, name);
-}
+/*----------------------------.
+| Construct the node labels. |
+`----------------------------*/
-/* This part will construct the label of nodes. */
static void
-print_core (int state, struct obstack *node_obstack)
+print_core (struct obstack *oout, state *s)
{
- int i;
- int k;
- int rule;
- core *statep;
- short *sp;
- short *sp1;
-
- statep = state_table[state].state;
- k = statep->nitems;
+ size_t i;
+ item_number *sitems = s->items;
+ size_t snritems = s->nitems;
- if (k == 0)
- return;
+ /* Output all the items of a state, not only its kernel. */
+ if (report_flag & report_itemsets)
+ {
+ closure (sitems, snritems);
+ sitems = itemset;
+ snritems = nitemset;
+ }
- for (i = 0; i < k; i++)
+ obstack_fgrow1 (oout, "%d", s->number);
+ for (i = 0; i < snritems; i++)
{
- if (i)
- obstack_sgrow (node_obstack, "\\n");
+ item_number *sp;
+ item_number *sp1;
+ rule_number r;
- sp1 = sp = ritem + statep->items[i];
+ sp1 = sp = ritem + sitems[i];
- while (*sp > 0)
+ while (*sp >= 0)
sp++;
- rule = -(*sp);
+ r = item_number_as_rule_number (*sp);
+
+ obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag);
- obstack_fgrow1 (node_obstack, "%d: ", rule);
- obstack_fgrow1 (node_obstack, " %s -> ", quote (tags[rlhs[rule]]));
+ for (sp = rules[r].rhs; sp < sp1; sp++)
+ obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
- for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
- obstack_fgrow1 (node_obstack, "%s ", quote (tags[*sp]));
+ obstack_1grow (oout, '.');
- obstack_1grow (node_obstack, '.');
+ for (/* Nothing */; *sp >= 0; ++sp)
+ obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
- while (*sp > 0)
- obstack_fgrow1 (node_obstack, " %s", quote (tags[*sp++]));
+ /* 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, "]");
+ }
+ }
}
}
-/* Output in graph_obstack edges specifications in incidence with current
- node. */
+
+/*---------------------------------------------------------------.
+| Output in graph_obstack edges specifications in incidence with |
+| current node. |
+`---------------------------------------------------------------*/
+
static void
-print_actions (int state, const char *node_name, struct obstack *node_obstack)
+print_actions (state const *s, FILE *fgraph)
{
int i;
- int k;
- int state1;
- int symbol;
- shifts *shiftp;
- errs *errp;
- reductions *redp;
- int rule;
- static char buff[10];
- edge_t edge;
-
- shiftp = state_table[state].shift_table;
- redp = state_table[state].reduction_table;
- errp = err_table[state];
-
- if (!shiftp && !redp)
- {
- if (final_state == state)
- obstack_sgrow (node_obstack, "$default: accept");
- else
- obstack_sgrow (node_obstack, "NO ACTIONS");
- return;
- }
- if (shiftp)
- {
- k = shiftp->nshifts;
+ transitions const *trans = s->transitions;
- for (i = 0; i < k; i++)
- {
- if (!shiftp->shifts[i])
- continue;
- state1 = shiftp->shifts[i];
- symbol = state_table[state1].accessing_symbol;
-
- if (ISVAR (symbol))
- break;
-
- {
- 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;
- edge.color = (symbol == 0) ? red : blue;
- /* FIXME: Be aware that quote uses static memory. The string
- must be output immediately (which is the case here). */
- edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
- output_edge (&edge, fgraph);
- close_edge (fgraph);
- }
- }
- }
- else
- {
- i = 0;
- k = 0;
- }
-
- if (errp)
- {
- int j, nerrs;
+ if (!trans->num && !s->reductions)
+ return;
- nerrs = errp->nerrs;
+ 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)
+ && strcmp (symbols[sym]->tag, "error") != 0)
+ abort ();
+ output_edge (s->number, s1->number,
+ TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
+ style, fgraph);
+ }
+}
- 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_sgrow (node_obstack, "\\n");
- }
- if (consistent[state] && redp)
- {
- rule = redp->rules[0];
- symbol = rlhs[rule];
- 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]);
- }
+/*-------------------------------------------------------------.
+| Output in FGRAPH the current node specifications and exiting |
+| edges. |
+`-------------------------------------------------------------*/
- if (i < k)
- {
- for (; i < k; i++)
- {
- if (!shiftp->shifts[i])
- continue;
- state1 = shiftp->shifts[i];
- symbol = state_table[state1].accessing_symbol;
-
- new_edge (&edge);
- open_edge (&edge, fgraph);
- edge.sourcename = node_name;
- sprintf (buff, "%d", state1);
- edge.targetname = buff;
- edge.color = red;
- edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
- output_edge (&edge, fgraph);
- close_edge (fgraph);
- }
- }
-}
-
-/* Output in GRAPH_OBSTACK the current node specifications and edges
- which go out from that node. */
static void
-print_state (int state)
+print_state (state *s, FILE *fgraph)
{
- static char name[10];
struct obstack node_obstack;
- node_t node;
+ /* A node's label contains its items. */
obstack_init (&node_obstack);
- new_node (&node); /* Set node attributs default value. */
- sprintf (name, "%d", state);
- node.title = name; /* Give a name to the node. */
-
- {
- /* Here we begin to compute the node label. */
- obstack_sgrow (&node_obstack, "\t\tlabel:\t\""); /* Open Label */
-
- /* Keep the size of NODE_OBSTACK before computing the label. It is
- useful to format the label. */
- node_output_size = obstack_object_size (&node_obstack);
-
- /* Compute the labels of nodes on the fly. */
- print_core (state, &node_obstack);
- /* Compute edges and additionnal parts of node label. */
- print_actions (state, node.title, &node_obstack);
-
- obstack_sgrow (&node_obstack, "\"\n"); /* Close Label. */
- }
-
- open_node (fgraph);
- /* Output a VCG formatted attributs list. */
- output_node (&node, fgraph);
- /* Save the node label. */
- fwrite (obstack_base (&node_obstack),
- obstack_object_size (&node_obstack), 1, fgraph);
- close_node (fgraph);
-
+ 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);
}
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 (nritems);
for (i = 0; i < nstates; i++)
- /* Output nodes & edges. */
- print_state (i);
+ print_state (states[i], fgraph);
+ free_closure ();
- /* Close graph. */
- close_graph (&graph, fgraph);
+ finish_graph (fgraph);
xfclose (fgraph);
}