* src/derives.c, src/print.c, src/reduce.c: To ease the

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 001b9109308a86fb232db40976b039c224fce6d7..164dc72e869a8395028d7449348b76bddf8b64dd 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -401,7 +401,8 @@ print_results (void)
 
   if (nuseless_nonterminals > 0)
     {
 
   if (nuseless_nonterminals > 0)
     {

-      fprintf (foutput, _("Useless nonterminals:\n\n"));
+      fputs (_("Useless nonterminals:"), foutput);
+      fputs ("\n\n", foutput);

       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))
          fprintf (foutput, "   %s\n", tags[i]);
       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))
          fprintf (foutput, "   %s\n", tags[i]);


@@ -413,7 +414,9 @@ print_results (void)
        {
          if (!b)
            {
        {
          if (!b)
            {

-             fprintf (foutput, _("\n\nTerminals which are not used:\n\n"));
+             fputs ("\n\n", foutput);
+             fprintf (foutput, _("Terminals which are not used:"));
+             fputs ("\n\n", foutput);

              b = TRUE;
            }
          fprintf (foutput, "   %s\n", tags[i]);
              b = TRUE;
            }
          fprintf (foutput, "   %s\n", tags[i]);


@@ -422,7 +425,9 @@ print_results (void)
 
   if (nuseless_productions > 0)
     {
 
   if (nuseless_productions > 0)
     {

-      fprintf (foutput, _("\n\nUseless rules:\n\n"));
+      fputs ("\n\n", foutput);
+      fprintf (foutput, _("Useless rules:"));
+      fputs ("\n\n", foutput);

       for (i = 1; i <= nrules; i++)
        {
          if (!BITISSET (P, i))
       for (i = 1; i <= nrules; i++)
        {
          if (!BITISSET (P, i))


@@ -438,7 +443,7 @@ print_results (void)
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)

-    fprintf (foutput, "\n\n");
+    fputs ("\n\n", foutput);

 }
 \f
 #if 0                          /* XXX currently unused.  */
 }
 \f
 #if 0                          /* XXX currently unused.  */


@@ -483,7 +488,7 @@ dump_grammar (void)
 static void
 print_notices (void)
 {
 static void
 print_notices (void)
 {

-  if (fixed_outfiles && nuseless_productions)
+  if (yacc_flag && nuseless_productions)

     fprintf (stderr, _("%d rules never reduced\n"), nuseless_productions);
 
   fprintf (stderr, _("%s contains "), infile);
     fprintf (stderr, _("%d rules never reduced\n"), nuseless_productions);
 
   fprintf (stderr, _("%s contains "), infile);


@@ -523,7 +528,7 @@ reduce_grammar (void)
 
   reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
 
 
   reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
 

-  if (verboseflag)
+  if (verbose_flag)

     print_results ();
 
   if (reduced == FALSE)
     print_results ();
 
   if (reduced == FALSE)


@@ -537,14 +542,14 @@ reduce_grammar (void)
 
   reduce_grammar_tables ();
 #if 0
 
   reduce_grammar_tables ();
 #if 0

-  if (verboseflag)
+  if (verbose_flag)

     {
       fprintf (foutput, "REDUCED GRAMMAR\n\n");
       dump_grammar ();
     }
 #endif
 
     {
       fprintf (foutput, "REDUCED GRAMMAR\n\n");
       dump_grammar ();
     }
 #endif
 

-  if (statisticsflag)
+  if (statistics_flag)

     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,
     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,