* src/gram.c: Remove comments that duplicate comments in gram.h.

When reporting useless rules and nonterminals, say "useless in grammar"
instead of "useless", and say "useless in parser" instead of "never
reduced".  Discussed starting at
<http://lists.gnu.org/archive/html/bison-patches/2007-10/msg00033.html>.
* NEWS (2.3a+): Mention this change.
* data/xslt/xml2text.xsl: Update output text and expected input XML
element names to match changes below.
* data/xslt/xml2xhtml.xsl: Likewise.
(xsl:template match="bison-xml-report"): Add missing entry in Table of
Contents: "Rules useless in parser due to conflicts".
* doc/bison.texinfo (Decl Summary): Reword a little.
(Understanding): Update example output for changes below.
* src/gram.c: (rule_useful_p): Rename to...
(rule_useful_in_grammar_p): ... this.
(rule_useless_p): Rename to...
(rule_useless_in_grammar_p): ... this.
(rule_never_reduced_p): Rename to...
(rule_useless_in_parser_p): ... this.
(grammar_rules_print): Update for renames.
(grammar_rules_print_xml): Update for renames.
(grammar_rules_never_reduced_report): Rename to...
(grammar_rules_useless_report): ... this since it is used for either
kind of useless rule.
* src/gram.h: Reword comments and update function names in prototypes.
* src/main.c (main): Say "rule useless in parser due to conflicts".
* src/print-xml.c (print_rules_never_reduced): Rename to...
(print_rules_useless_in_parser): ... this, and rename output XML
element "rules-never-reduced" to "rules-useless-in-parser".
(print_xml): Update for rename.
* src/print.c (print_results): Say "Rules useless in parser due to
conflicts".
* src/reduce.c (reduce_grammar_tables): Say "rule useless in grammar".
(nonterminals_reduce): Say "nonterminal useless in grammar".
(reduce_output): Say "Nonterminals useless in grammar".
Say "Rules useless in grammar".
(reduce_xml): Rename output XML element "useless" to
"useless-in-grammar".
(reduce_print): Don't report the count of grammatically useless rules
as "rules never reduced" just because %yacc is specified.
In the correct report of this count, say nonterminal(s) and rule(s)
"useless in grammar".
* tests/conflicts.at (S/R in initial): Update expected output.
(Defaulted Conflicted Reduction): Likewise.
(Unreachable States After Conflict Resolution): Likewise.
* tests/existing.at (GNU pic Grammar): Likewise.
* tests/reduce.at (Useless Nonterminals): Likewise.
(Useless Rules): Likewise.
(Reduced Automaton): Likewise.
(Underivable Rules): Likewise.
(Empty Language): Likewise.

2 files changed, 27 insertions, 24 deletions

diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 9271e8c7..b2c73eac 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -37,15 +37,15 @@
 
 <xsl:template match="bison-xml-report">
   <xsl:apply-templates select="reductions"/>
-  <xsl:apply-templates select="rules-never-reduced"/>
+  <xsl:apply-templates select="rules-useless-in-parser"/>
   <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:template match="rules-useless-in-parser">
   <xsl:if test="rule">
-    <xsl:text>Rules never reduced&#10;</xsl:text>
+    <xsl:text>Rules useless in parser due to conflicts&#10;</xsl:text>
     <xsl:apply-templates select="rule">
       <xsl:with-param name="pad" select="'3'"/>
     </xsl:apply-templates>
@@ -54,14 +54,14 @@
 </xsl:template>
 
 <xsl:template match="reductions">
-  <xsl:apply-templates select="useless/nonterminals"/>
+  <xsl:apply-templates select="useless-in-grammar/nonterminals"/>
   <xsl:apply-templates select="unused/terminals"/>
-  <xsl:apply-templates select="useless/rules"/>
+  <xsl:apply-templates select="useless-in-grammar/rules"/>
 </xsl:template>
 
-<xsl:template match="useless/nonterminals">
+<xsl:template match="useless-in-grammar/nonterminals">
   <xsl:if test="nonterminal">
-    <xsl:text>Useless nonterminals&#10;&#10;</xsl:text>
+    <xsl:text>Nonterminals useless in grammar&#10;&#10;</xsl:text>
     <xsl:for-each select="nonterminal">
       <xsl:text>   </xsl:text>
       <xsl:value-of select="."/>
@@ -71,9 +71,9 @@
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="useless/rules">
+<xsl:template match="useless-in-grammar/rules">
   <xsl:if test="rule">
-    <xsl:text>Useless rules&#10;</xsl:text>
+    <xsl:text>Rules useless in grammar&#10;</xsl:text>
     <xsl:apply-templates select="rule">
       <xsl:with-param name="pad" select="'3'"/>
     </xsl:apply-templates>
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index ff850455..62776637 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -108,9 +108,12 @@
     <li>
       <a href="#reductions">Reductions</a>
       <ul class="lower-alpha">
-	<li><a href="#useless_nonterminals">Useless nonterminal symbols</a></li>
-	<li><a href="#unused_terminals">Unused terminal symbols</a></li>
-	<li><a href="#useless_rules">Useless rules</a></li>
+	<li><a href="#nonterminals_useless_in_grammar">Nonterminals useless in grammar</a></li>
+	<li><a href="#unused_terminals">Unused terminals</a></li>
+	<li><a href="#rules_useless_in_grammar">Rules useless in grammar</a></li>
+	<xsl:if test="rules-useless-in-parser/rule">
+	  <li><a href="#rules_useless_in_parser">Rules useless in parser due to conflicts</a></li>
+	</xsl:if>
       </ul>
     </li>
     <li><a href="#conflicts">Conflicts</a></li>
@@ -125,17 +128,17 @@
     <li><a href="#automaton">Automaton</a></li>
   </ul>
   <xsl:apply-templates select="reductions"/>
-  <xsl:apply-templates select="rules-never-reduced"/>
+  <xsl:apply-templates select="rules-useless-in-parser"/>
   <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:template match="rules-useless-in-parser">
   <xsl:if test="rule">
     <h2>
-      <a name="rules_never_reduced"/>
-      <xsl:text> Rules never reduced</xsl:text>
+      <a name="rules_useless_in_parser"/>
+      <xsl:text> Rules useless in parser due to conflicts</xsl:text>
     </h2>
     <xsl:text>&#10;</xsl:text>
     <p class="pre">
@@ -152,15 +155,15 @@
     <a name="reductions"/>
     <xsl:text> Reductions</xsl:text>
   </h2>
-  <xsl:apply-templates select="useless/nonterminals"/>
+  <xsl:apply-templates select="useless-in-grammar/nonterminals"/>
   <xsl:apply-templates select="unused/terminals"/>
-  <xsl:apply-templates select="useless/rules"/>
+  <xsl:apply-templates select="useless-in-grammar/rules"/>
 </xsl:template>
 
-<xsl:template match="useless/nonterminals">
+<xsl:template match="useless-in-grammar/nonterminals">
   <h3>
-    <a name="useless_nonterminals"/>
-    <xsl:text> Useless nonterminals</xsl:text>
+    <a name="nonterminals_useless_in_grammar"/>
+    <xsl:text> Nonterminals useless in grammar</xsl:text>
   </h3>
   <xsl:text>&#10;&#10;</xsl:text>
   <xsl:if test="nonterminal">
@@ -175,10 +178,10 @@
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="useless/rules">
+<xsl:template match="useless-in-grammar/rules">
   <h3>
-    <a name="useless_rules"/>
-    <xsl:text> Useless rules</xsl:text>
+    <a name="rules_useless_in_grammar"/>
+    <xsl:text> Rules useless in grammar</xsl:text>
   </h3>
   <xsl:text>&#10;</xsl:text>
   <xsl:if test="rule">