Re: <reductions>

[Wojciech Polak]

I committed this.

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1738
diff -p -u -r1.1738 ChangeLog
--- ChangeLog   17 Oct 2007 04:35:34 -0000      1.1738
+++ ChangeLog   17 Oct 2007 18:06:14 -0000
@@ -1,3 +1,13 @@
+2007-10-17  Wojciech Polak  <address@hidden>
+
+       * src/print-xml.c (print_grammar): Renamed
+       <terminal> and <nonterminal> attributes:
+       "type" to "number" and "symbol" to "name".
+       * data/xslt/xml2text.xsl (xsl:template match="terminal"):
+       Use new attribute names.
+       (xsl:template match="nonterminal"): Likewise.
+       * data/xslt/xml2xhtml.xsl: Likewise.
+
 2007-10-17  Joel E. Denny  <address@hidden>
 
        * doc/bison.texinfo (Bison Options): Add entry for --print-datadir.
Index: data/xslt/xml2text.xsl
===================================================================
RCS file: /sources/bison/bison/data/xslt/xml2text.xsl,v
retrieving revision 1.3
diff -p -u -r1.3 xml2text.xsl
--- data/xslt/xml2text.xsl      11 Oct 2007 16:38:41 -0000      1.3
+++ data/xslt/xml2text.xsl      17 Oct 2007 18:06:14 -0000
@@ -115,14 +115,14 @@
 </xsl:template>
 
 <xsl:template match="terminal">
-  <xsl:value-of select="@symbol"/>
+  <xsl:value-of select="@name"/>
   <xsl:call-template name="line-wrap">
     <xsl:with-param
-      name="first-line-length" select="66 - string-length(@symbol)"
+      name="first-line-length" select="66 - string-length(@name)"
     />
     <xsl:with-param name="line-length" select="66" />
     <xsl:with-param name="text">
-      <xsl:value-of select="concat(' (', @type, ')')"/>
+      <xsl:value-of select="concat(' (', @number, ')')"/>
       <xsl:apply-templates select="rule" />
     </xsl:with-param>
   </xsl:call-template>
@@ -134,8 +134,8 @@
 </xsl:template>
 
 <xsl:template match="nonterminal">
-  <xsl:value-of select="@symbol"/>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <xsl:value-of select="@name"/>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:text>&#10;</xsl:text>
   <xsl:variable name="output">
     <xsl:call-template name="line-wrap">
Index: data/xslt/xml2xhtml.xsl
===================================================================
RCS file: /sources/bison/bison/data/xslt/xml2xhtml.xsl,v
retrieving revision 1.3
diff -p -u -r1.3 xml2xhtml.xsl
--- data/xslt/xml2xhtml.xsl     11 Oct 2007 16:38:42 -0000      1.3
+++ data/xslt/xml2xhtml.xsl     17 Oct 2007 18:06:14 -0000
@@ -297,8 +297,8 @@
 </xsl:template>
 
 <xsl:template match="terminal">
-  <b><xsl:value-of select="@symbol"/></b>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <b><xsl:value-of select="@name"/></b>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:apply-templates select="rule"/>
   <xsl:text>&#10;</xsl:text>
 </xsl:template>
@@ -314,8 +314,8 @@
 </xsl:template>
 
 <xsl:template match="nonterminal">
-  <b><xsl:value-of select="@symbol"/></b>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <b><xsl:value-of select="@name"/></b>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:text>&#10;    </xsl:text>
   <xsl:if test="left/rule">
     <xsl:text>on left:</xsl:text>
Index: src/print-xml.c
===================================================================
RCS file: /sources/bison/bison/src/print-xml.c,v
retrieving revision 1.7
diff -p -u -r1.7 print-xml.c
--- src/print-xml.c     17 Oct 2007 04:35:35 -0000      1.7
+++ src/print-xml.c     17 Oct 2007 18:06:15 -0000
@@ -429,7 +429,7 @@ print_grammar (FILE *out, int level)
        item_number *rhsp;
 
        xml_printf (out, level + 2,
-                   "<terminal type=\"%d\" symbol=\"%s\">",
+                   "<terminal number=\"%d\" name=\"%s\">",
                    i, xml_escape (tag));
 
        for (r = 0; r < nrules; r++)
@@ -465,7 +465,7 @@ print_grammar (FILE *out, int level)
        }
 
       xml_printf (out, level + 2,
-                 "<nonterminal type=\"%d\" symbol=\"%s\">",
+                 "<nonterminal number=\"%d\" name=\"%s\">",
                  i, xml_escape (tag));
 
       if (left_count > 0)