tests: fix maintainer-xml-check.

* data/xslt/xml2dot.xsl (xsl:template match="bison-xml-report"):
Update output to include comments now produced by --graph.
(xsl:template match="automaton"): As for --graph, name the
digraph after the grammar file.
* src/print-xml.c (escape_bufs): Enlarge array.
(print_xml): Add bug-report and url attributes to
bison-xml-report element.
(cherry picked from commit bc81de36b7)
This commit is contained in:
Joel E. Denny
2010-04-30 19:50:52 -04:00
parent ad6f84e550
commit ca7a59e838
3 changed files with 36 additions and 5 deletions

View File

@@ -1,3 +1,14 @@
2010-05-01 Joel E. Denny <joeldenny@joeldenny.org>
tests: fix maintainer-xml-check.
* data/xslt/xml2dot.xsl (xsl:template match="bison-xml-report"):
Update output to include comments now produced by --graph.
(xsl:template match="automaton"): As for --graph, name the
digraph after the grammar file.
* src/print-xml.c (escape_bufs): Enlarge array.
(print_xml): Add bug-report and url attributes to
bison-xml-report element.
2010-05-01 Joel E. Denny <joeldenny@joeldenny.org> 2010-05-01 Joel E. Denny <joeldenny@joeldenny.org>
In DOT output, convert from "/*" comments to "//" comments. In DOT output, convert from "/*" comments to "//" comments.

View File

@@ -35,11 +35,27 @@
</xsl:template> </xsl:template>
<xsl:template match="bison-xml-report"> <xsl:template match="bison-xml-report">
<xsl:apply-templates select="automaton"/> <xsl:text>// Generated by GNU Bison </xsl:text>
<xsl:value-of select="@version"/>
<xsl:text>.&#10;</xsl:text>
<xsl:text>// Report bugs to &lt;</xsl:text>
<xsl:value-of select="@bug-report"/>
<xsl:text>&gt;.&#10;</xsl:text>
<xsl:text>// Home page: &lt;</xsl:text>
<xsl:value-of select="@url"/>
<xsl:text>&gt;.&#10;&#10;</xsl:text>
<xsl:apply-templates select="automaton">
<xsl:with-param name="filename" select="filename"/>
</xsl:apply-templates>
</xsl:template> </xsl:template>
<xsl:template match="automaton"> <xsl:template match="automaton">
<xsl:text>digraph Automaton {&#10;</xsl:text> <xsl:param name="filename"/>
<xsl:text>digraph "</xsl:text>
<xsl:call-template name="escape">
<xsl:with-param name="subject" select="$filename"/>
</xsl:call-template>
<xsl:text>"&#10;{&#10;</xsl:text>
<xsl:apply-templates select="state"/> <xsl:apply-templates select="state"/>
<xsl:text>}&#10;</xsl:text> <xsl:text>}&#10;</xsl:text>
</xsl:template> </xsl:template>

View File

@@ -48,7 +48,7 @@ struct escape_buf
char *ptr; char *ptr;
size_t size; size_t size;
}; };
static struct escape_buf escape_bufs[2]; static struct escape_buf escape_bufs[3];
/*--------------------------------. /*--------------------------------.
@@ -505,8 +505,12 @@ print_xml (void)
FILE *out = xfopen (spec_xml_file, "w"); FILE *out = xfopen (spec_xml_file, "w");
fputs ("<?xml version=\"1.0\"?>\n\n", out); fputs ("<?xml version=\"1.0\"?>\n\n", out);
xml_printf (out, level, "<bison-xml-report version=\"%s\">", xml_printf (out, level,
xml_escape (VERSION)); "<bison-xml-report version=\"%s\" bug-report=\"%s\""
" url=\"%s\">",
xml_escape_n (0, VERSION),
xml_escape_n (1, PACKAGE_BUGREPORT),
xml_escape_n (2, PACKAGE_URL));
fputc ('\n', out); fputc ('\n', out);
xml_printf (out, level + 1, "<filename>%s</filename>", xml_printf (out, level + 1, "<filename>%s</filename>",