From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 26 Nov 2013 15:20:52 +0000 (+0100)
Subject: xml: also display %empty for empty right-hand sides
X-Git-Tag: v3.0.2~7
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/f3d2a1b2ac717cd9faabd5106ff2bc366c49bd6a

xml: also display %empty for empty right-hand sides

* data/xslt/xml2dot.xsl, data/xslt/xml2text.xsl: Display %empty where needed.
---

diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index 93bec599..7b62d6e2 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -201,6 +201,8 @@
   <xsl:if test="$point = 0">
     <xsl:text> .</xsl:text>
   </xsl:if>
+
+  <!-- RHS -->
   <xsl:for-each select="rhs/symbol|rhs/empty">
     <xsl:apply-templates select="."/>
     <xsl:if test="$point = position()">
@@ -214,7 +216,9 @@
   <xsl:value-of select="."/>
 </xsl:template>
 
-<xsl:template match="empty"/>
+<xsl:template match="empty">
+  <xsl:text> %empty</xsl:text>
+</xsl:template>
 
 <xsl:template match="lookaheads">
   <xsl:text>  [</xsl:text>
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 2626f566..4d34be16 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -350,12 +350,7 @@
     <xsl:if test="position() = $point + 1">
       <xsl:text> .</xsl:text>
     </xsl:if>
-    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="$itemset != 'true'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
+    <xsl:apply-templates select="."/>
     <xsl:if test="position() = last() and position() = $point">
       <xsl:text> .</xsl:text>
     </xsl:if>