From 32f19b6b47b41c46fdeb66b26cc67b609f8ae48c Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <jdenny@ces.clemson.edu>
Date: Sun, 28 Oct 2007 00:24:22 +0000
Subject: [PATCH] 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.

---
 ChangeLog               | 13 +++++++++++++
 data/xslt/xml2text.xsl  |  4 ++--
 data/xslt/xml2xhtml.xsl |  4 ++--
 src/print-xml.c         |  7 ++++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d8e62d84..e666d588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 291045ad..9271e8c7 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -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">
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index 891aa68f..ff850455 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -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>
diff --git a/src/print-xml.c b/src/print-xml.c
index 73a18af5..da8bfcab 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -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)
-- 
2.45.2