X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/273a74fa89392c33ef4912036c290ad47e535da6..b25d88f6d2e2f4b59927aacecdc0a9e44a34b5d9:/src/reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 986aecd0..699f45a4 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -71,8 +71,8 @@ useful_production (rule_number_t r, bitset N0)
 
   for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
     if (ISVAR (*rhsp) && !bitset_test (N0, *rhsp - ntokens))
-      return FALSE;
-  return TRUE;
+      return false;
+  return true;
 }
 
 
@@ -235,15 +235,8 @@ reduce_grammar_tables (void)
   {
     rule_number_t r;
     for (r = 0; r < nrules; r++)
-      {
-	rules[r].useful = bitset_test (P, r);
-	if (!rules[r].useful)
-	  {
-	    LOCATION_PRINT (stderr, rules[r].location);
-	    fprintf (stderr, ": %s: %s: ", _("warning"), _("useless rule"));
-	    rule_print (&rules[r], stderr);
-	  }
-      }
+      rules[r].useful = bitset_test (P, r);
+    grammar_rules_never_reduced_report (_("useless rule"));
   }
 
   /* Map the nonterminals to their new index: useful first, useless
@@ -353,21 +346,21 @@ reduce_output (FILE *out)
   if (nuseless_nonterminals > 0)
     {
       int i;
-      fprintf (out, "%s\n\n", _("Useless nonterminals:"));
+      fprintf (out, "%s\n\n", _("Useless nonterminals"));
       for (i = 0; i < nuseless_nonterminals; ++i)
 	fprintf (out, "   %s\n", symbols[nsyms + i]->tag);
       fputs ("\n\n", out);
     }
 
   {
-    bool b = FALSE;
+    bool b = false;
     int i;
     for (i = 0; i < ntokens; i++)
       if (!bitset_test (V, i) && !bitset_test (V1, i))
 	{
 	  if (!b)
-	    fprintf (out, "%s\n\n", _("Terminals which are not used:"));
-	  b = TRUE;
+	    fprintf (out, "%s\n\n", _("Terminals which are not used"));
+	  b = true;
 	  fprintf (out, "   %s\n", symbols[i]->tag);
 	}
     if (b)
@@ -376,8 +369,7 @@ reduce_output (FILE *out)
 
   if (nuseless_productions > 0)
     grammar_rules_partial_print (out, _("Useless rules"),
-				 nrules,
-				 nrules + nuseless_productions);
+				 rule_useless_p);
 }
 
 
@@ -397,7 +389,7 @@ reduce_print (void)
 			       nuseless_productions),
 	     nuseless_productions);
 
-  fprintf (stderr, "%s: %s: ", infile, _("warning"));
+  fprintf (stderr, "%s: %s: ", grammar_file, _("warning"));
 
   if (nuseless_nonterminals > 0)
     fprintf (stderr, ngettext ("%d useless nonterminal",
@@ -457,7 +449,7 @@ reduce_grammar (void)
 
       fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals\
 , and %d productions.\n",
-	       infile, ntokens, nvars, nrules);
+	       grammar_file, ntokens, nvars, nrules);
     }
 }