From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 13 Nov 2012 09:59:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/maint'
X-Git-Tag: v2.7.90~272
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/06ec0105b12cdfa2994283e345154e6720354808

Merge remote-tracking branch 'origin/maint'

* origin/maint:
  tests: close files in glr-regression
  xml: match DOT output and xml2dot.xsl processing
  xml: factor xslt space template
  graph: fix a memory leak
  xml: documentation
  output: capitalize State
---

06ec0105b12cdfa2994283e345154e6720354808
diff --cc src/print_graph.c
index 918a3df8,f4742b16..31e0e382
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@@ -152,22 -148,24 +149,24 @@@ print_actions (state const *s, FILE *fg
    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);
  }