X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b09f4f48512c274a7574b6a22e4a1eac6a86fd61..7dbadca2d082e6fcded4bb6f2b42df0035c99aaf:/src/print_graph.c?ds=sidebyside
diff --git a/src/print_graph.c b/src/print_graph.c
index 8898c9aa..7e429dbd 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,30 +1,25 @@
/* Output a graph of the generated parser, for Bison.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
- Foundation, Inc.
+ Copyright (C) 2001-2007, 2009-2013 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "system.h"
-#include
-
#include "LR0.h"
#include "closure.h"
#include "complain.h"
@@ -44,14 +39,18 @@
| Construct the node labels. |
`----------------------------*/
+/* Print the lhs of a rule in such a manner that there is no vertical
+ repetition, like in *.output files. */
+
static void
print_core (struct obstack *oout, state *s)
{
+ item_number const *sitems = s->items;
+ symbol *previous_lhs = NULL;
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 just its kernel. */
if (report_flag & report_itemsets)
{
closure (sitems, snritems);
@@ -59,52 +58,60 @@ print_core (struct obstack *oout, state *s)
snritems = nitemset;
}
- obstack_fgrow1 (oout, "%d", s->number);
+ obstack_printf (oout, _("State %d"), s->number);
+ obstack_sgrow (oout, "\\n\\l");
for (i = 0; i < snritems; i++)
{
- item_number *sp;
- item_number *sp1;
- rule_number r;
-
- sp1 = sp = ritem + sitems[i];
+ item_number const *sp1 = ritem + sitems[i];
+ item_number const *sp = sp1;
+ rule *r;
- while (*sp >= 0)
- sp++;
+ while (0 <= *sp)
+ sp++;
- r = item_number_as_rule_number (*sp);
+ r = &rules[item_number_as_rule_number (*sp)];
- obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag);
+ obstack_printf (oout, "%3d ", r->number);
+ if (previous_lhs && UNIQSTR_EQ (previous_lhs->tag, r->lhs->tag))
+ obstack_printf (oout, "%*s| ",
+ (int) strlen (previous_lhs->tag), "");
+ else
+ obstack_printf (oout, "%s: ", escape (r->lhs->tag));
+ previous_lhs = r->lhs;
- for (sp = rules[r].rhs; sp < sp1; sp++)
- obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
+ for (sp = r->rhs; sp < sp1; sp++)
+ obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
obstack_1grow (oout, '.');
for (/* Nothing */; *sp >= 0; ++sp)
- obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
+ obstack_printf (oout, " %s", escape (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, "]");
- }
- }
+ 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, 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_sgrow (oout, sep);
+ obstack_sgrow (oout, escape (symbols[k]->tag));
+ sep = ", ";
+ }
+ obstack_1grow (oout, ']');
+ }
+ }
+ obstack_sgrow (oout, "\\l");
}
}
@@ -117,9 +124,8 @@ print_core (struct obstack *oout, state *s)
static void
print_actions (state const *s, FILE *fgraph)
{
- int i;
-
transitions const *trans = s->transitions;
+ int i;
if (!trans->num && !s->reductions)
return;
@@ -127,22 +133,24 @@ print_actions (state const *s, FILE *fgraph)
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);
+ 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);
}
+ /* Display reductions. */
+ output_red (s, s->reductions, fgraph);
}
@@ -159,8 +167,7 @@ print_state (state *s, FILE *fgraph)
/* 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);
+ output_node (s->number, obstack_finish0 (&node_obstack), fgraph);
obstack_free (&node_obstack, 0);
/* Output the edges. */