Generalize the display of semantic values and locations in traces.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index dd77a766078be0b54cc795ff5c736cdd824de0b9..4636f4e14c11d286c9ee6a9f588b09a156aa286e 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -247,24 +247,23 @@ grammar_dump (FILE *out, const char *title)
           ntokens, nvars, nsyms, nrules, nritems);
 
 
-  fputs (("Variables\n---------\n\n"
-         "Value  Sprec  Sassoc  Tag\n"),
-        out);
+  fprintf (out, "Variables\n---------\n\n");
   {
     symbol_number i;
+    fprintf (out, "Value  Sprec  Sassoc  Tag\n");
+
     for (i = ntokens; i < nsyms; i++)
       fprintf (out, "%5d  %5d   %5d  %s\n",
               i,
               symbols[i]->prec, symbols[i]->assoc,
               symbols[i]->tag);
+    fprintf (out, "\n\n");
   }
-  fputs ("\n\n", out);
 
-  fputs (("Rules\n-----\n\n"
-         "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"),
-        out);
+  fprintf (out, "Rules\n-----\n\n");
   {
     rule_number i;
+    fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
     for (i = 0; i < nrules + nuseless_productions; i++)
       {
        rule *rule_i = &rules[i];
@@ -288,9 +287,9 @@ grammar_dump (FILE *out, const char *title)
        fprintf (out, "  [%d]\n", item_number_as_rule_number (*rp));
       }
   }
-  fputs ("\n\n", out);
+  fprintf (out, "\n\n");
 
-  fputs ("Rules interpreted\n-----------------\n\n", out);
+  fprintf (out, "Rules interpreted\n-----------------\n\n");
   {
     rule_number r;
     for (r = 0; r < nrules + nuseless_productions; r++)
@@ -299,7 +298,7 @@ grammar_dump (FILE *out, const char *title)
        rule_print (&rules[r], out);
       }
   }
-  fputs ("\n\n", out);
+  fprintf (out, "\n\n");
 }