Get rid of the ad hoc handling of token_buffer in the scanner: use

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 60c7c2e8f0a8d93f5e7deda289bcadf5f507d5d2..c5be01feab1f43c23c3dfdbade3fff8decb8cf6c 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,5 +1,5 @@
 /* Grammar reduction for Bison.
 /* Grammar reduction for Bison.

-   Copyright (C) 1988, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1988, 1989, 2000 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -401,10 +401,11 @@ print_results (void)
 
   if (nuseless_nonterminals > 0)
     {
 
   if (nuseless_nonterminals > 0)
     {

-      fprintf (foutput, _("Useless nonterminals:\n\n"));
+      obstack_sgrow (&output_obstack, _("Useless nonterminals:"));
+      obstack_sgrow (&output_obstack, "\n\n");

       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))
       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))

-         fprintf (foutput, "   %s\n", tags[i]);
+         obstack_fgrow1 (&output_obstack, "   %s\n", tags[i]);

     }
   b = FALSE;
   for (i = 0; i < ntokens; i++)
     }
   b = FALSE;
   for (i = 0; i < ntokens; i++)


@@ -413,32 +414,35 @@ print_results (void)
        {
          if (!b)
            {
        {
          if (!b)
            {

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

              b = TRUE;
            }
              b = TRUE;
            }

-         fprintf (foutput, "   %s\n", tags[i]);
+         obstack_fgrow1 (&output_obstack, "   %s\n", tags[i]);

        }
     }
 
   if (nuseless_productions > 0)
     {
        }
     }
 
   if (nuseless_productions > 0)
     {

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

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

-             fprintf (foutput, "#%-4d  ", i);
-             fprintf (foutput, "%s :\t", tags[rlhs[i]]);
+             obstack_fgrow1 (&output_obstack, "#%-4d  ", i);
+             obstack_fgrow1 (&output_obstack, "%s :\t", tags[rlhs[i]]);

              for (r = &ritem[rrhs[i]]; *r >= 0; r++)
              for (r = &ritem[rrhs[i]]; *r >= 0; r++)

-               {
-                 fprintf (foutput, " %s", tags[*r]);
-               }
-             fprintf (foutput, ";\n");
+               obstack_fgrow1 (&output_obstack, " %s", tags[*r]);
+             obstack_sgrow (&output_obstack, ";\n");

            }
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)
            }
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)

-    fprintf (foutput, "\n\n");
+    obstack_sgrow (&output_obstack, "\n\n");

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


@@ -448,35 +452,38 @@ dump_grammar (void)
   int i;
   rule r;
 
   int i;
   rule r;
 

-  fprintf (foutput,
-          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
-          ntokens, nvars, nsyms, nrules, nitems);
-  fprintf (foutput, _("Variables\n---------\n\n"));
-  fprintf (foutput, _("Value  Sprec    Sassoc    Tag\n"));
+  obstack_fgrow5 (&output_obstack,
+        "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
+        ntokens, nvars, nsyms, nrules, nitems);
+  obstack_sgrow (&output_obstack,
+                      _("Variables\n---------\n\n"));
+  obstack_sgrow (&output_obstack,
+                      _("Value  Sprec    Sassoc    Tag\n"));

   for (i = ntokens; i < nsyms; i++)
   for (i = ntokens; i < nsyms; i++)

-    fprintf (foutput, "%5d  %5d  %5d  %s\n", i, sprec[i], sassoc[i], tags[i]);
-  fprintf (foutput, "\n\n");
-  fprintf (foutput, _("Rules\n-----\n\n"));
+    obstack_fgrow4 (&output_obstack,
+                   "%5d  %5d  %5d  %s\n", i, sprec[i], sassoc[i], tags[i]);
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_sgrow (&output_obstack, _("Rules\n-----\n\n"));

   for (i = 1; i <= nrules; i++)
     {
   for (i = 1; i <= nrules; i++)
     {

-      fprintf (foutput, "%-5d(%5d%5d)%5d : (@%-5d)",
-              i, rprec[i], rassoc[i], rlhs[i], rrhs[i]);
+      obstack_fgrow5 (&output_obstack, "%-5d(%5d%5d)%5d : (@%-5d)",
+                     i, rprec[i], rassoc[i], rlhs[i], rrhs[i]);

       for (r = &ritem[rrhs[i]]; *r > 0; r++)
       for (r = &ritem[rrhs[i]]; *r > 0; r++)

-       fprintf (foutput, "%5d", *r);
-      fprintf (foutput, " [%d]\n", -(*r));
+       obstack_fgrow1 (&output_obstack, "%5d", *r);
+      obstack_fgrow1 (&output_obstack, " [%d]\n", -(*r));

     }
     }

-  fprintf (foutput, "\n\n");
-  fprintf (foutput, _("Rules interpreted\n-----------------\n\n"));
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_sgrow (&output_obstack,
+                      _("Rules interpreted\n-----------------\n\n"));

   for (i = 1; i <= nrules; i++)
     {
   for (i = 1; i <= nrules; i++)
     {

-      fprintf (foutput, "%-5d  %s :", i, tags[rlhs[i]]);
+      obstack_fgrow2 (&output_obstack, "%-5d  %s :", i, tags[rlhs[i]]);

       for (r = &ritem[rrhs[i]]; *r > 0; r++)
       for (r = &ritem[rrhs[i]]; *r > 0; r++)

-       fprintf (foutput, " %s", tags[*r]);
-      fprintf (foutput, "\n");
+       obstack_fgrow1 (&output_obstack, " %s", tags[*r]);
+      obstack_grow1 (&output_obstack, '\n');

     }
     }

-  fprintf (foutput, "\n\n");
+  obstack_sgrow (&output_obstack, "\n\n");

 }
 }

-

 #endif
 
 
 #endif
 
 


@@ -539,7 +546,7 @@ reduce_grammar (void)
 #if 0
   if (verbose_flag)
     {
 #if 0
   if (verbose_flag)
     {

-      fprintf (foutput, "REDUCED GRAMMAR\n\n");
+      obstack_fgrow1 (&output_obstack, "REDUCED GRAMMAR\n\n");

       dump_grammar ();
     }
 #endif
       dump_grammar ();
     }
 #endif