tests: minor fixes/simplifications

[bison.git] / data / xslt / xml2text.xsl

diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 621599a3267e6eefb0bd27c8cb5356da0b755ae3..d776bb17e9a435224875b42f39a9fb31bda20ca4 100644 (file)
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -2,9 +2,8 @@
 
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
 
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.

-    $Id$

 
 

-    Copyright (C) 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007-2012 Free Software Foundation, Inc.

 
     This file is part of Bison, the GNU Compiler Compiler.
 
 
     This file is part of Bison, the GNU Compiler Compiler.
 


@@ -36,73 +35,95 @@
 </xsl:template>
 
 <xsl:template match="bison-xml-report">
 </xsl:template>
 
 <xsl:template match="bison-xml-report">

-  <xsl:apply-templates select="reductions"/>
-  <xsl:apply-templates select="rules-never-reduced"/>
+  <xsl:apply-templates select="grammar" mode="reductions"/>
+  <xsl:apply-templates select="grammar" mode="useless-in-parser"/>

   <xsl:apply-templates select="automaton" mode="conflicts"/>
   <xsl:apply-templates select="grammar"/>
   <xsl:apply-templates select="automaton"/>
 </xsl:template>
 
   <xsl:apply-templates select="automaton" mode="conflicts"/>
   <xsl:apply-templates select="grammar"/>
   <xsl:apply-templates select="automaton"/>
 </xsl:template>
 

-<xsl:template match="rules-never-reduced">
-  <xsl:if test="rule">
-    <xsl:text>Rules never reduced&#10;</xsl:text>
-    <xsl:apply-templates select="rule">
-      <xsl:with-param name="pad" select="'3'"/>
-    </xsl:apply-templates>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
+<xsl:template match="grammar" mode="reductions">
+  <xsl:apply-templates select="nonterminals" mode="useless-in-grammar"/>
+  <xsl:apply-templates select="terminals" mode="unused-in-grammar"/>
+  <xsl:apply-templates select="rules" mode="useless-in-grammar"/>

 </xsl:template>
 
 </xsl:template>
 

-<xsl:template match="reductions">
-  <xsl:apply-templates select="useless/nonterminals"/>
-  <xsl:apply-templates select="unused/terminals"/>
-  <xsl:apply-templates select="useless/rules"/>
+<xsl:template match="nonterminals" mode="useless-in-grammar">
+  <xsl:if test="nonterminal[@usefulness='useless-in-grammar']">
+    <xsl:text>Nonterminals useless in grammar&#10;&#10;</xsl:text>
+    <xsl:for-each select="nonterminal[@usefulness='useless-in-grammar']">
+      <xsl:text>   </xsl:text>
+      <xsl:value-of select="@name"/>
+      <xsl:text>&#10;</xsl:text>
+    </xsl:for-each>
+    <xsl:text>&#10;&#10;</xsl:text>
+  </xsl:if>

 </xsl:template>
 
 </xsl:template>
 

-<xsl:template match="useless/nonterminals">
-  <xsl:if test="nonterminal">
-    <xsl:text>Useless nonterminals&#10;&#10;</xsl:text>
-    <xsl:for-each select="nonterminal">
+<xsl:template match="terminals" mode="unused-in-grammar">
+  <xsl:if test="terminal[@usefulness='unused-in-grammar']">
+    <xsl:text>Terminals unused in grammar&#10;&#10;</xsl:text>
+    <xsl:for-each select="terminal[@usefulness='unused-in-grammar']">
+      <xsl:sort select="@symbol-number" data-type="number"/>

       <xsl:text>   </xsl:text>
       <xsl:text>   </xsl:text>

-      <xsl:value-of select="."/>
+      <xsl:value-of select="@name"/>

       <xsl:text>&#10;</xsl:text>
     </xsl:for-each>
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
       <xsl:text>&#10;</xsl:text>
     </xsl:for-each>
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 

-<xsl:template match="useless/rules">
-  <xsl:if test="rule">
-    <xsl:text>Useless rules&#10;</xsl:text>
-    <xsl:apply-templates select="rule">
-      <xsl:with-param name="pad" select="'3'"/>
-    </xsl:apply-templates>
+<xsl:template match="rules" mode="useless-in-grammar">
+  <xsl:variable name="set" select="rule[@usefulness='useless-in-grammar']"/>
+  <xsl:if test="$set">
+    <xsl:text>Rules useless in grammar&#10;</xsl:text>
+    <xsl:call-template name="style-rule-set">
+      <xsl:with-param name="rule-set" select="$set"/>
+    </xsl:call-template>

     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 

-<xsl:template match="unused/terminals">
-  <xsl:if test="terminal">
-    <xsl:text>Terminals which are not used&#10;&#10;</xsl:text>
-    <xsl:for-each select="terminal">
-      <xsl:text>   </xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>&#10;</xsl:text>
-    </xsl:for-each>
+<xsl:template match="grammar" mode="useless-in-parser">
+  <xsl:variable
+    name="set" select="rules/rule[@usefulness='useless-in-parser']"
+  />
+  <xsl:if test="$set">
+    <xsl:text>Rules useless in parser due to conflicts&#10;</xsl:text>
+    <xsl:call-template name="style-rule-set">
+      <xsl:with-param name="rule-set" select="$set"/>
+    </xsl:call-template>

     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="grammar">
   <xsl:text>Grammar&#10;</xsl:text>
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="grammar">
   <xsl:text>Grammar&#10;</xsl:text>

-  <xsl:apply-templates select="rules/rule">
-    <xsl:with-param name="pad" select="'3'"/>
-  </xsl:apply-templates>
+  <xsl:call-template name="style-rule-set">
+    <xsl:with-param
+      name="rule-set" select="rules/rule[@usefulness!='useless-in-grammar']"
+    />
+  </xsl:call-template>

   <xsl:text>&#10;&#10;</xsl:text>
   <xsl:apply-templates select="terminals"/>
   <xsl:apply-templates select="nonterminals"/>
 </xsl:template>
 
   <xsl:text>&#10;&#10;</xsl:text>
   <xsl:apply-templates select="terminals"/>
   <xsl:apply-templates select="nonterminals"/>
 </xsl:template>
 

+<xsl:template name="style-rule-set">
+  <xsl:param name="rule-set"/>
+  <xsl:for-each select="$rule-set">
+    <xsl:apply-templates select=".">
+      <xsl:with-param name="pad" select="'3'"/>
+      <xsl:with-param name="prev-lhs">
+        <xsl:if test="position()>1">
+          <xsl:variable name="position" select="position()"/>
+          <xsl:value-of select="$rule-set[$position - 1]/lhs"/>
+        </xsl:if>
+      </xsl:with-param>
+    </xsl:apply-templates>
+  </xsl:for-each>
+</xsl:template>
+

 <xsl:template match="grammar/terminals">
   <xsl:text>Terminals, with rules where they appear&#10;&#10;</xsl:text>
   <xsl:apply-templates select="terminal"/>
 <xsl:template match="grammar/terminals">
   <xsl:text>Terminals, with rules where they appear&#10;&#10;</xsl:text>
   <xsl:apply-templates select="terminal"/>


@@ -111,59 +132,60 @@
 
 <xsl:template match="grammar/nonterminals">
   <xsl:text>Nonterminals, with rules where they appear&#10;&#10;</xsl:text>
 
 <xsl:template match="grammar/nonterminals">
   <xsl:text>Nonterminals, with rules where they appear&#10;&#10;</xsl:text>

-  <xsl:apply-templates select="nonterminal"/>
+  <xsl:apply-templates select="nonterminal[@usefulness!='useless-in-grammar']"/>

 </xsl:template>
 
 <xsl:template match="terminal">
   <xsl:value-of select="@name"/>
   <xsl:call-template name="line-wrap">
 </xsl:template>
 
 <xsl:template match="terminal">
   <xsl:value-of select="@name"/>
   <xsl:call-template name="line-wrap">

-    <xsl:with-param
-      name="first-line-length" select="66 - string-length(@name)"
-    />
+    <xsl:with-param name="first-line-length">
+      <xsl:choose>
+        <xsl:when test="string-length(@name) &gt; 66">0</xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="66 - string-length(@name)" />
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:with-param>

     <xsl:with-param name="line-length" select="66" />
     <xsl:with-param name="text">
     <xsl:with-param name="line-length" select="66" />
     <xsl:with-param name="text">

-      <xsl:value-of select="concat(' (', @number, ')')"/>
-      <xsl:apply-templates select="rule" />
+      <xsl:value-of select="concat(' (', @token-number, ')')"/>
+      <xsl:for-each select="key('bison:ruleByRhs', @name)">
+        <xsl:value-of select="concat(' ', @number)"/>
+      </xsl:for-each>

     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>
 
     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>
 

-<xsl:template match="terminal/rule">
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="."/>
-</xsl:template>
-

 <xsl:template match="nonterminal">
   <xsl:value-of select="@name"/>
 <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">
       <xsl:with-param name="line-length" select="66" />
       <xsl:with-param name="text">
         <xsl:text>    </xsl:text>
   <xsl:text>&#10;</xsl:text>
   <xsl:variable name="output">
     <xsl:call-template name="line-wrap">
       <xsl:with-param name="line-length" select="66" />
       <xsl:with-param name="text">
         <xsl:text>    </xsl:text>

-        <xsl:if test="left/rule">
+        <xsl:if test="key('bison:ruleByLhs', @name)">

           <xsl:text>on@left:</xsl:text>
           <xsl:text>on@left:</xsl:text>

+          <xsl:for-each select="key('bison:ruleByLhs', @name)">
+            <xsl:value-of select="concat(' ', @number)"/>
+          </xsl:for-each>

         </xsl:if>
         </xsl:if>

-        <xsl:apply-templates select="left/rule"/>
-        <xsl:if test="left/rule and right/rule">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-        <xsl:if test="right/rule">
+        <xsl:if test="key('bison:ruleByRhs', @name)">
+          <xsl:if test="key('bison:ruleByLhs', @name)">
+            <xsl:text>, </xsl:text>
+          </xsl:if>

           <xsl:text>on@right:</xsl:text>
           <xsl:text>on@right:</xsl:text>

+          <xsl:for-each select="key('bison:ruleByRhs', @name)">
+            <xsl:value-of select="concat(' ', @number)"/>
+          </xsl:for-each>

         </xsl:if>
         </xsl:if>

-        <xsl:apply-templates select="right/rule"/>

       </xsl:with-param>
     </xsl:call-template>
   </xsl:variable>
   <xsl:value-of select="translate($output, '@', ' ')" />
 </xsl:template>
 
       </xsl:with-param>
     </xsl:call-template>
   </xsl:variable>
   <xsl:value-of select="translate($output, '@', ' ')" />
 </xsl:template>
 

-<xsl:template match="nonterminal/left/rule|nonterminal/right/rule">
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="."/>
-</xsl:template>
-

 <xsl:template match="automaton" mode="conflicts">
   <xsl:variable name="conflict-report">
     <xsl:apply-templates select="state" mode="conflicts"/>
 <xsl:template match="automaton" mode="conflicts">
   <xsl:variable name="conflict-report">
     <xsl:apply-templates select="state" mode="conflicts"/>


@@ -231,9 +253,9 @@
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="transition[@type = $type]">
       <xsl:with-param name="pad">
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="transition[@type = $type]">
       <xsl:with-param name="pad">

-       <xsl:call-template name="max-width-symbol">
-         <xsl:with-param name="node" select="transition[@type = $type]"/>
-       </xsl:call-template>
+        <xsl:call-template name="max-width-symbol">
+          <xsl:with-param name="node" select="transition[@type = $type]"/>
+        </xsl:call-template>

       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>
       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>


@@ -244,9 +266,9 @@
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="error">
       <xsl:with-param name="pad">
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="error">
       <xsl:with-param name="pad">

-       <xsl:call-template name="max-width-symbol">
-         <xsl:with-param name="node" select="error"/>
-       </xsl:call-template>
+        <xsl:call-template name="max-width-symbol">
+          <xsl:with-param name="node" select="error"/>
+        </xsl:call-template>

       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>
       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>


@@ -257,9 +279,9 @@
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="reduction">
       <xsl:with-param name="pad">
     <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="reduction">
       <xsl:with-param name="pad">

-       <xsl:call-template name="max-width-symbol">
-         <xsl:with-param name="node" select="reduction"/>
-       </xsl:call-template>
+        <xsl:call-template name="max-width-symbol">
+          <xsl:with-param name="node" select="reduction"/>
+        </xsl:call-template>

       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>
       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:if>


@@ -268,12 +290,16 @@
 <xsl:template match="item">
   <xsl:param name="pad"/>
   <xsl:param name="prev-rule-number"
 <xsl:template match="item">
   <xsl:param name="pad"/>
   <xsl:param name="prev-rule-number"

-            select="preceding-sibling::item[1]/@rule-number"/>
-  <xsl:apply-templates select="key('bison:ruleNumber', current()/@rule-number)">
+             select="preceding-sibling::item[1]/@rule-number"/>
+  <xsl:apply-templates
+    select="key('bison:ruleByNumber', current()/@rule-number)"
+  >

     <xsl:with-param name="itemset" select="'true'"/>
     <xsl:with-param name="pad" select="$pad"/>
     <xsl:with-param name="itemset" select="'true'"/>
     <xsl:with-param name="pad" select="$pad"/>

-    <xsl:with-param name="prev-lhs"
-                   select="key('bison:ruleNumber', $prev-rule-number)/lhs[text()]"/>
+    <xsl:with-param
+      name="prev-lhs"
+      select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]"
+   />

     <xsl:with-param name="point" select="@point"/>
     <xsl:with-param name="lookaheads">
       <xsl:apply-templates select="lookaheads"/>
     <xsl:with-param name="point" select="@point"/>
     <xsl:with-param name="lookaheads">
       <xsl:apply-templates select="lookaheads"/>


@@ -288,8 +314,7 @@
   <xsl:param name="point"/>
   <xsl:param name="lookaheads"/>
 
   <xsl:param name="point"/>
   <xsl:param name="lookaheads"/>
 

-  <xsl:if test="$itemset != 'true'
-               and not(preceding-sibling::rule[1]/lhs[text()] = lhs[text()])">
+  <xsl:if test="$itemset != 'true' and not($prev-lhs = lhs[text()])">

     <xsl:text>&#10;</xsl:text>
   </xsl:if>
 
     <xsl:text>&#10;</xsl:text>
   </xsl:if>
 


@@ -302,17 +327,16 @@
 
   <!-- LHS -->
   <xsl:choose>
 
   <!-- LHS -->
   <xsl:choose>

-    <xsl:when test="$itemset != 'true'
-                   and preceding-sibling::rule[1]/lhs[text()] = lhs[text()]">
+    <xsl:when test="$itemset != 'true' and $prev-lhs = lhs[text()]">

       <xsl:call-template name="lpad">
       <xsl:call-template name="lpad">

-       <xsl:with-param name="str" select="'|'"/>
-       <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>
+        <xsl:with-param name="str" select="'|'"/>
+        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>

       </xsl:call-template>
     </xsl:when>
     <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]">
       <xsl:call-template name="lpad">
       </xsl:call-template>
     </xsl:when>
     <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]">
       <xsl:call-template name="lpad">

-       <xsl:with-param name="str" select="'|'"/>
-       <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>
+        <xsl:with-param name="str" select="'|'"/>
+        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>

       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>


@@ -418,7 +442,7 @@
       <xsl:value-of select="@rule"/>
       <xsl:text> (</xsl:text>
       <xsl:value-of
       <xsl:value-of select="@rule"/>
       <xsl:text> (</xsl:text>
       <xsl:value-of

-         select="key('bison:ruleNumber', current()/@rule)/lhs[text()]"/>
+          select="key('bison:ruleByNumber', current()/@rule)/lhs[text()]"/>

       <xsl:text>)</xsl:text>
     </xsl:otherwise>
   </xsl:choose>
       <xsl:text>)</xsl:text>
     </xsl:otherwise>
   </xsl:choose>


@@ -455,9 +479,9 @@
   <xsl:variable name="longest">
     <xsl:for-each select="$node">
       <xsl:sort data-type="number" select="string-length(@symbol)"
   <xsl:variable name="longest">
     <xsl:for-each select="$node">
       <xsl:sort data-type="number" select="string-length(@symbol)"

-               order="descending"/>
+                order="descending"/>

       <xsl:if test="position() = 1">
       <xsl:if test="position() = 1">

-       <xsl:value-of select="string-length(@symbol)"/>
+        <xsl:value-of select="string-length(@symbol)"/>

       </xsl:if>
     </xsl:for-each>
   </xsl:variable>
       </xsl:if>
     </xsl:for-each>
   </xsl:variable>


@@ -474,7 +498,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="space">
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="space">

-       <xsl:with-param name="repeat" select="$diff"/>
+        <xsl:with-param name="repeat" select="$diff"/>

       </xsl:call-template>
       <xsl:value-of select="$str"/>
     </xsl:otherwise>
       </xsl:call-template>
       <xsl:value-of select="$str"/>
     </xsl:otherwise>


@@ -492,7 +516,7 @@
     <xsl:otherwise>
       <xsl:value-of select="$str"/>
       <xsl:call-template name="space">
     <xsl:otherwise>
       <xsl:value-of select="$str"/>
       <xsl:call-template name="space">

-       <xsl:with-param name="repeat" select="$diff"/>
+        <xsl:with-param name="repeat" select="$diff"/>

       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>


@@ -515,7 +539,7 @@
   <xsl:param name="first-line-length" select="$line-length"/>
   <xsl:param name="text"/> <!-- required -->
   <xsl:choose>
   <xsl:param name="first-line-length" select="$line-length"/>
   <xsl:param name="text"/> <!-- required -->
   <xsl:choose>

-    <xsl:when test="string-length($text) = 0 or normalize-space($text) = ''" />
+    <xsl:when test="normalize-space($text) = ''" />

     <xsl:when test="string-length($text) &lt;= $first-line-length">
       <xsl:value-of select="concat($text, '&#10;')" />
     </xsl:when>
     <xsl:when test="string-length($text) &lt;= $first-line-length">
       <xsl:value-of select="concat($text, '&#10;')" />
     </xsl:when>


@@ -523,7 +547,7 @@
       <xsl:variable name="break-pos">
         <xsl:call-template name="ws-search">
           <xsl:with-param name="text" select="$text" />
       <xsl:variable name="break-pos">
         <xsl:call-template name="ws-search">
           <xsl:with-param name="text" select="$text" />

-          <xsl:with-param name="pos" select="$first-line-length+1" />
+          <xsl:with-param name="start" select="$first-line-length+1" />

         </xsl:call-template>
       </xsl:variable>
       <xsl:value-of select="substring($text, 1, $break-pos - 1)" />
         </xsl:call-template>
       </xsl:variable>
       <xsl:value-of select="substring($text, 1, $break-pos - 1)" />


@@ -540,18 +564,16 @@
 
 <xsl:template name="ws-search">
   <xsl:param name="text"/> <!-- required -->
 
 <xsl:template name="ws-search">
   <xsl:param name="text"/> <!-- required -->

-  <xsl:param name="pos"/> <!-- required -->
+  <xsl:param name="start"/> <!-- required -->
+  <xsl:variable name="search-text" select="substring($text, $start)" />

   <xsl:choose>
   <xsl:choose>

-    <xsl:when
-      test="$pos &gt; string-length($text) or substring($text, $pos, 1) = ' '"
-    >
-      <xsl:value-of select="$pos" />
+    <xsl:when test="not(contains($search-text, ' '))">
+      <xsl:value-of select="string-length($text)+1" />

     </xsl:when>
     <xsl:otherwise>
     </xsl:when>
     <xsl:otherwise>

-      <xsl:call-template name="ws-search">
-        <xsl:with-param name="text" select="$text" />
-        <xsl:with-param name="pos" select="$pos+1" />
-      </xsl:call-template>
+      <xsl:value-of
+        select="$start + string-length(substring-before($search-text, ' '))"
+      />

     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>