Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 04:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

For the XML output's terminal element, rename @number to @token-number,

Browse Source 
and add @symbol-number.  In the nonterminal element, rename @number to
@symbol-number.  Discussed starting at
<http://lists.gnu.org/archive/html/bison-patches/2007-10/msg00040.html>.
* data/xslt/xml2text.xsl (xsl:template match="terminal"): Update for
renames.
(xsl:template match="nonterminal"): Likewise.
* data/xslt/xml2xhtml.xsl (xsl:template match="terminal"): Likewise.
(xsl:template match="nonterminal"): Likewise.
* src/print-xml.c (print_grammar): Implement.
This commit is contained in:
Joel E. Denny
2007-10-28 00:24:22 +00:00
parent 255a6b901a
commit 32f19b6b47
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2007-10-27 Joel E. Denny <jdenny@ces.clemson.edu>
For the XML output's terminal element, rename @number to @token-number,
and add @symbol-number. In the nonterminal element, rename @number to
@symbol-number. Discussed starting at
<http://lists.gnu.org/archive/html/bison-patches/2007-10/msg00040.html>.
* data/xslt/xml2text.xsl (xsl:template match="terminal"): Update for
renames.
(xsl:template match="nonterminal"): Likewise.
* data/xslt/xml2xhtml.xsl (xsl:template match="terminal"): Likewise.
(xsl:template match="nonterminal"): Likewise.
* src/print-xml.c (print_grammar): Implement.
2007-10-21 Joel E. Denny <jdenny@ces.clemson.edu>
* data/xslt/xml2dot.xsl (xsl:template match="automaton/state"): After

4
data/xslt/xml2text.xsl
View File

@@ -127,7 +127,7 @@
</xsl:with-param>
<xsl:with-param name="line-length" select="66" />
<xsl:with-param name="text">
<xsl:value-of select="concat(' (', @number, ')')"/>
<xsl:value-of select="concat(' (', @token-number, ')')"/>
<xsl:apply-templates select="rule" />
</xsl:with-param>
</xsl:call-template>
@@ -140,7 +140,7 @@
<xsl:template match="nonterminal">
<xsl:value-of select="@name"/>
<xsl:value-of select="concat(' (', @number, ')')"/>
<xsl:value-of select="concat(' (', @symbol-number, ')')"/>
<xsl:text>&#10;</xsl:text>
<xsl:variable name="output">
<xsl:call-template name="line-wrap">

4
data/xslt/xml2xhtml.xsl
View File

@@ -298,7 +298,7 @@
<xsl:template match="terminal">
<b><xsl:value-of select="@name"/></b>
<xsl:value-of select="concat(' (', @number, ')')"/>
<xsl:value-of select="concat(' (', @token-number, ')')"/>
<xsl:apply-templates select="rule"/>
<xsl:text>&#10;</xsl:text>
</xsl:template>
@@ -315,7 +315,7 @@
<xsl:template match="nonterminal">
<b><xsl:value-of select="@name"/></b>
<xsl:value-of select="concat(' (', @number, ')')"/>
<xsl:value-of select="concat(' (', @symbol-number, ')')"/>
<xsl:text>&#10; </xsl:text>
<xsl:if test="left/rule">
<xsl:text>on left:</xsl:text>

7
src/print-xml.c
View File

@@ -429,8 +429,9 @@ print_grammar (FILE *out, int level)
item_number *rhsp;
xml_printf (out, level + 2,
"<terminal number=\"%d\" name=\"%s\">",
i, xml_escape (tag));
"<terminal symbol-number=\"%d\" token-number=\"%d\""
" name=\"%s\">",
token_translations[i], i, xml_escape (tag));
for (r = 0; r < nrules; r++)
for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
@@ -465,7 +466,7 @@ print_grammar (FILE *out, int level)
}
xml_printf (out, level + 2,
"<nonterminal number=\"%d\" name=\"%s\">",
"<nonterminal symbol-number=\"%d\" name=\"%s\">",
i, xml_escape (tag));
if (left_count > 0)