* lib/memchr.c, lib/stpcpy.c, lib/strndup.c, lib/strnlen.c:

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 061a0fee9aa2d96ec37d448d018b88c68436e1b0..a5be5737bb349e7bd3dfa31bb3cd4e025fdac77b 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,5 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

-   Copyright (C) 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 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.
 


@@ -20,69 +20,29 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

-#include "alloc.h"
+#include "xalloc.h"

 #include "files.h"
 #include "gram.h"
 #include "files.h"
 #include "gram.h"

-#include "state.h"
+#include "LR0.h"

 #include "lalr.h"
 #include "conflicts.h"
 #include "lalr.h"
 #include "conflicts.h"

+#include "getargs.h"
+#include "state.h"
+#include "reader.h"
+#include "print.h"

 
 

-extern char **tags;
-extern int nstates;
-extern int final_state;
-
-extern void terse PARAMS ((void));
-extern void verbose PARAMS ((void));
-
-#if 0                          /* XXX currently unused.  */
-static void print_token PARAMS ((int, int));
-#endif
-
-static void print_state PARAMS ((int));
-static void print_core PARAMS ((int));
-static void print_actions PARAMS ((int));
-static void print_grammar PARAMS ((void));
-
-void
-terse (void)
-{
-  if (any_conflicts)
-    print_conflicts ();
-}
-
-
-void
-verbose (void)
-{
-  int i;
-
-  if (any_conflicts)
-    print_conflicts ();
-
-  print_grammar ();
-
-  for (i = 0; i < nstates; i++)
-    print_state (i);
-}
-
-
-#if 0                          /* XXX currently unused.  */
+#if 0

 static void
 print_token (int extnum, int token)
 {
 static void
 print_token (int extnum, int token)
 {

-  fprintf (foutput, _(" type %d is %s\n"), extnum, tags[token]);
+  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);

 }
 #endif
 
 }
 #endif
 

-
-static void
-print_state (int state)
-{
-  fprintf (foutput, _("\n\nstate %d\n\n"), state);
-  print_core (state);
-  print_actions (state);
-}
-
+\f
+/*================================\
+| Report information on a state.  |
+\================================*/

 
 static void
 print_core (int state)
 
 static void
 print_core (int state)


@@ -108,29 +68,28 @@ print_core (int state)
        sp++;
 
       rule = -(*sp);
        sp++;
 
       rule = -(*sp);

-      fprintf (foutput, "    %s  ->  ", tags[rlhs[rule]]);
+      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);

 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
        {
 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
        {

-         fprintf (foutput, "%s ", tags[*sp]);
+         obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);

        }
 
        }
 

-      putc ('.', foutput);
+      obstack_1grow (&output_obstack, '.');

 
       while (*sp > 0)
        {
 
       while (*sp > 0)
        {

-         fprintf (foutput, " %s", tags[*sp]);
+         obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);

          sp++;
        }
 
          sp++;
        }
 

-      fprintf (foutput, _("   (rule %d)"), rule);
-      putc ('\n', foutput);
+      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
+      obstack_1grow (&output_obstack, '\n');

     }
 
     }
 

-  putc ('\n', foutput);
+  obstack_1grow (&output_obstack, '\n');

 }
 
 }
 

-

 static void
 print_actions (int state)
 {
 static void
 print_actions (int state)
 {


@@ -150,9 +109,9 @@ print_actions (int state)
   if (!shiftp && !redp)
     {
       if (final_state == state)
   if (!shiftp && !redp)
     {
       if (final_state == state)

-       fprintf (foutput, _("    $default\taccept\n"));
+       obstack_sgrow (&output_obstack, _("    $default\taccept\n"));

       else
       else

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

       return;
     }
 
       return;
     }
 


@@ -170,14 +129,16 @@ print_actions (int state)
          if (ISVAR (symbol))
            break;
          if (symbol == 0)      /* I.e. strcmp(tags[symbol],"$")==0 */
          if (ISVAR (symbol))
            break;
          if (symbol == 0)      /* I.e. strcmp(tags[symbol],"$")==0 */

-           fprintf (foutput, _("    $   \tgo to state %d\n"), state1);
+           obstack_fgrow1 (&output_obstack,
+                           _("    $   \tgo to state %d\n"), state1);

          else
          else

-           fprintf (foutput, _("    %-4s\tshift, and go to state %d\n"),
-                    tags[symbol], state1);
+           obstack_fgrow2 (&output_obstack,
+                           _("    %-4s\tshift, and go to state %d\n"),
+                           tags[symbol], state1);

        }
 
       if (i > 0)
        }
 
       if (i > 0)

-       putc ('\n', foutput);
+       obstack_1grow (&output_obstack, '\n');

     }
   else
     {
     }
   else
     {


@@ -196,20 +157,21 @@ print_actions (int state)
          if (!errp->errs[j])
            continue;
          symbol = errp->errs[j];
          if (!errp->errs[j])
            continue;
          symbol = errp->errs[j];

-         fprintf (foutput, _("    %-4s\terror (nonassociative)\n"),
+         obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),

                   tags[symbol]);
        }
 
       if (j > 0)
                   tags[symbol]);
        }
 
       if (j > 0)

-       putc ('\n', foutput);
+       obstack_1grow (&output_obstack, '\n');

     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];
     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];

-      fprintf (foutput, _("    $default\treduce using rule %d (%s)\n\n"),
-              rule, tags[symbol]);
+      obstack_fgrow2 (&output_obstack,
+                     _("    $default\treduce using rule %d (%s)\n\n"),
+                     rule, tags[symbol]);

     }
   else if (redp)
     {
     }
   else if (redp)
     {


@@ -224,22 +186,39 @@ print_actions (int state)
            continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
            continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];

-         fprintf (foutput, _("    %-4s\tgo to state %d\n"), tags[symbol],
-                  state1);
+         obstack_fgrow2 (&output_obstack,
+                         _("    %-4s\tgo to state %d\n"),
+                         tags[symbol], state1);

        }
 
        }
 

-      putc ('\n', foutput);
+      obstack_1grow (&output_obstack, '\n');

     }
 }
 
     }
 }
 

-#define END_TEST(end)                          \
-  do {                                         \
-    if (column + strlen(buffer) > (end)) {     \
-      fprintf (foutput, "%s\n   ", buffer);    \
-      column = 3;                              \
-      buffer[0] = 0;                           \
-    }                                          \
-  } while (0)
+static void
+print_state (int state)
+{
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_fgrow1 (&output_obstack, _("state %d"), state);
+  obstack_sgrow (&output_obstack, "\n\n");
+  print_core (state);
+  print_actions (state);
+}
+\f
+/*-----------------------------------------.
+| Print information on the whole grammar.  |
+`-----------------------------------------*/
+
+#define END_TEST(End)                                          \
+do {                                                           \
+  if (column + strlen(buffer) > (End))                         \
+    {                                                          \
+      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);     \
+      column = 3;                                              \
+      buffer[0] = 0;                                           \
+    }                                                          \
+} while (0)
+

 
 static void
 print_grammar (void)
 
 static void
 print_grammar (void)


@@ -250,24 +229,30 @@ print_grammar (void)
   int column = 0;
 
   /* rule # : LHS -> RHS */
   int column = 0;
 
   /* rule # : LHS -> RHS */

-  fputs (_("\nGrammar\n"), foutput);
+  obstack_1grow (&output_obstack, '\n');
+  obstack_sgrow (&output_obstack, _("Grammar"));
+  obstack_1grow (&output_obstack, '\n');

   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {

-       fprintf (foutput, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
+       obstack_fgrow2 (&output_obstack,
+                       _("rule %-4d %s ->"), i, tags[rlhs[i]]);

        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)
        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)

-           fprintf (foutput, " %s", tags[*rule++]);
+           obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);

        else
        else

-         fputs (_("            /* empty */"), foutput);
-       putc ('\n', foutput);
+         obstack_sgrow (&output_obstack, _("           /* empty */"));
+       obstack_1grow (&output_obstack, '\n');

       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */

-  fputs (_("\nTerminals, with rules where they appear\n\n"), foutput);
-  fprintf (foutput, "%s (-1)\n", tags[0]);
+  obstack_sgrow (&output_obstack, "\n");
+  obstack_sgrow (&output_obstack,
+                _("Terminals, with rules where they appear"));
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);

   if (translations)
     {
       for (i = 0; i <= max_user_token_number; i++)
   if (translations)
     {
       for (i = 0; i <= max_user_token_number; i++)


@@ -275,34 +260,32 @@ print_grammar (void)
          {
            buffer[0] = 0;
            column = strlen (tags[token_translations[i]]);
          {
            buffer[0] = 0;
            column = strlen (tags[token_translations[i]]);

-           fprintf (foutput, "%s", tags[token_translations[i]]);
+           obstack_sgrow (&output_obstack, tags[token_translations[i]]);

            END_TEST (50);
            sprintf (buffer, " (%d)", i);
 
            for (j = 1; j <= nrules; j++)
            END_TEST (50);
            sprintf (buffer, " (%d)", i);
 
            for (j = 1; j <= nrules; j++)

-             {
-               for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-                 if (*rule == token_translations[i])
-                   {
-                     END_TEST (65);
-                     sprintf (buffer + strlen (buffer), " %d", j);
-                     break;
-                   }
-             }
-           fprintf (foutput, "%s\n", buffer);
+             for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+               if (*rule == token_translations[i])
+                 {
+                   END_TEST (65);
+                   sprintf (buffer + strlen (buffer), " %d", j);
+                   break;
+                 }
+           obstack_fgrow1 (&output_obstack, "%s\n", buffer);

          }
     }
   else
          }
     }
   else

-    for (i = 1; i < ntokens; i++)
-      {
-       buffer[0] = 0;
-       column = strlen (tags[i]);
-       fprintf (foutput, "%s", tags[i]);
-       END_TEST (50);
-       sprintf (buffer, " (%d)", i);
+    {
+      for (i = 1; i < ntokens; i++)
+       {
+         buffer[0] = 0;
+         column = strlen (tags[i]);
+         obstack_sgrow (&output_obstack, tags[i]);
+         END_TEST (50);
+         sprintf (buffer, " (%d)", i);

 
 

-       for (j = 1; j <= nrules; j++)
-         {
+         for (j = 1; j <= nrules; j++)

            for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
              if (*rule == i)
                {
            for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
              if (*rule == i)
                {


@@ -310,11 +293,14 @@ print_grammar (void)
                  sprintf (buffer + strlen (buffer), " %d", j);
                  break;
                }
                  sprintf (buffer + strlen (buffer), " %d", j);
                  break;
                }

-         }
-       fprintf (foutput, "%s\n", buffer);
-      }
+         obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+       }
+    }

 
 

-  fputs (_("\nNonterminals, with rules where they appear\n\n"), foutput);
+  obstack_sgrow (&output_obstack, "\n");
+  obstack_sgrow (&output_obstack,
+                _("Nonterminals, with rules where they appear"));
+  obstack_sgrow (&output_obstack, "\n\n");

   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;


@@ -332,7 +318,7 @@ print_grammar (void)
        }
 
       buffer[0] = 0;
        }
 
       buffer[0] = 0;

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

       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);


@@ -367,6 +353,22 @@ print_grammar (void)
                  }
            }
        }
                  }
            }
        }

-      fprintf (foutput, "%s\n", buffer);
+      obstack_fgrow1 (&output_obstack, "%s\n", buffer);

     }
 }
     }
 }

+\f
+void
+print_results (void)
+{
+  int i;
+
+  if (any_conflicts)
+    print_conflicts ();
+
+  if (verbose_flag)
+    print_grammar ();
+
+  if (verbose_flag)
+    for (i = 0; i < nstates; i++)
+      print_state (i);
+}