* lib/quote.h, lib/quote.c, lib/quotearg.h, lib/quotearg.c:

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 9a8485370ad7f16ef71696fdb37e67f5496bbe81..5f9ad9b6ff14b91bcaa8eb07f550c98c43021023 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -20,7 +20,7 @@
 
 
 #include "system.h"
-#include "alloc.h"
+#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -29,7 +29,7 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
-
+#include "print.h"
 
 #if 0
 static void
@@ -194,7 +194,9 @@ print_actions (int state)
 static void
 print_state (int state)
 {
-  fprintf (foutput, _("\n\nstate %d\n\n"), state);
+  fputs ("\n\n", foutput);
+  fprintf (foutput, _("state %d"), state);
+  fputs ("\n\n", foutput);
   print_core (state);
   print_actions (state);
 }
@@ -222,7 +224,9 @@ print_grammar (void)
   int column = 0;
 
   /* rule # : LHS -> RHS */
-  fputs (_("\nGrammar\n"), foutput);
+  putc ('\n', foutput);
+  fputs (_("Grammar"), foutput);
+  putc ('\n', foutput);
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
@@ -238,7 +242,9 @@ print_grammar (void)
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
-  fputs (_("\nTerminals, with rules where they appear\n\n"), foutput);
+  fputs ("\n", foutput);
+  fputs (_("Terminals, with rules where they appear"), foutput);
+  fputs ("\n\n", foutput);
   fprintf (foutput, "%s (-1)\n", tags[0]);
   if (translations)
     {
@@ -286,7 +292,9 @@ print_grammar (void)
        fprintf (foutput, "%s\n", buffer);
       }
 
-  fputs (_("\nNonterminals, with rules where they appear\n\n"), foutput);
+  fputs ("\n", foutput);
+  fputs (_("Nonterminals, with rules where they appear"), foutput);
+  fputs ("\n\n", foutput);
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
@@ -351,10 +359,10 @@ print_results (void)
   if (any_conflicts)
     print_conflicts ();
 
-  if (verboseflag)
+  if (verbose_flag)
     print_grammar ();
 
-  if (verboseflag)
+  if (verbose_flag)
     for (i = 0; i < nstates; i++)
       print_state (i);
 }