More ignores.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 489379d1235388ba16fcc1238409f3ee1605c199..ccafbdc645388b0463f645fac5cbd08ea7ac5e37 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,114 +1,63 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

-   Copyright (C) 1984, 1986, 1989 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.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 
 
 

-#include <stdio.h>

 #include "system.h"
 #include "system.h"

-#include "machine.h"
-#include "new.h"

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

+#include "LR0.h"
+#include "lalr.h"
+#include "conflicts.h"
+#include "getargs.h"

 #include "state.h"
 #include "state.h"

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

 
 

-
-extern char **tags;
-extern int nstates;
-extern short *accessing_symbol;
-extern core **state_table;
-extern shifts **shift_table;
-extern errs **err_table;
-extern reductions **reduction_table;
-extern char *consistent;
-extern char any_conflicts;
-extern char *conflicts;
-extern int final_state;
-
-extern void conflict_log();
-extern void verbose_conflict_log();
-extern void print_reductions();
-
-void print_token();
-void print_state();
-void print_core();
-void print_actions();
-void print_grammar();
-
-void
-terse()
+#if 0
+static void
+print_token (int extnum, int token)

 {
 {

-  if (any_conflicts)
-    {
-      conflict_log();
-    }
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);

 }
 }

+#endif

 
 

+\f
+/*--------------------------------.
+| Report information on a state.  |
+`--------------------------------*/

 
 

-void
-verbose()
+static void
+print_core (FILE *out, int state)

 {
 {

-  register int i;
-
-  if (any_conflicts)
-    verbose_conflict_log();
-
-  print_grammar();
-
-  for (i = 0; i < nstates; i++)
-    {
-      print_state(i);
-    }
-}
-
-
-void
-print_token(extnum, token)
-int extnum, token;
-{
-  fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);
-}
-
-
-void
-print_state(state)
-int state;
-{
-  fprintf(foutput, _("\n\nstate %d\n\n"), state);
-  print_core(state);
-  print_actions(state);
-}
-
-
-void
-print_core(state)
-int state;
-{
-  register int i;
-  register int k;
-  register int rule;
-  register core *statep;
-  register short *sp;
-  register short *sp1;
+  int i;
+  int k;
+  int rule;
+  core *statep;
+  short *sp;
+  short *sp1;

 
   statep = state_table[state];
   k = statep->nitems;
 
 
   statep = state_table[state];
   k = statep->nitems;
 

-  if (k == 0) return;
+  if (k == 0)
+    return;

 
   for (i = 0; i < k; i++)
     {
 
   for (i = 0; i < k; i++)
     {


@@ -118,41 +67,39 @@ int state;
        sp++;
 
       rule = -(*sp);
        sp++;
 
       rule = -(*sp);

-      fprintf(foutput, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %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]);
+         fprintf (out, "%s ", tags[*sp]);

        }
 
        }
 

-      putc('.', foutput);
+      fputc ('.', out);

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

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

          sp++;
        }
 
          sp++;
        }
 

-      fprintf (foutput, _("   (rule %d)"), rule);
-      putc('\n', foutput);
+      fprintf (out, _("   (rule %d)"), rule);
+      fputc ('\n', out);

     }
 
     }
 

-  putc('\n', foutput);
+  fputc ('\n', out);

 }
 
 }
 

-
-void
-print_actions(state)
-int state;
+static void
+print_actions (FILE *out, int state)

 {
 {

-  register int i;
-  register int k;
-  register int state1;
-  register int symbol;
-  register shifts *shiftp;
-  register errs *errp;
-  register reductions *redp;
-  register int rule;
+  int i;
+  int k;
+  int state1;
+  int symbol;
+  shifts *shiftp;
+  errs *errp;
+  reductions *redp;
+  int rule;

 
   shiftp = shift_table[state];
   redp = reduction_table[state];
 
   shiftp = shift_table[state];
   redp = reduction_table[state];


@@ -161,9 +108,9 @@ int state;
   if (!shiftp && !redp)
     {
       if (final_state == state)
   if (!shiftp && !redp)
     {
       if (final_state == state)

-       fprintf(foutput, _("    $default\taccept\n"));
+       fprintf (out, _("    $default\taccept\n"));

       else
       else

-       fprintf(foutput, _("    NO ACTIONS\n"));
+       fprintf (out, _("    NO ACTIONS\n"));

       return;
     }
 
       return;
     }
 


@@ -173,20 +120,24 @@ int state;
 
       for (i = 0; i < k; i++)
        {
 
       for (i = 0; i < k; i++)
        {

-         if (! shiftp->shifts[i]) continue;
+         if (!shiftp->shifts[i])
+           continue;

          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
          /* The following line used to be turned off.  */
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
          /* The following line used to be turned off.  */

-         if (ISVAR(symbol)) break;
-          if (symbol==0)      /* I.e. strcmp(tags[symbol],"$")==0 */
-            fprintf(foutput, _("    $   \tgo to state %d\n"), state1);
-          else
-            fprintf(foutput, _("    %-4s\tshift, and go to state %d\n"),
-                    tags[symbol], state1);
+         if (ISVAR (symbol))
+           break;
+         if (symbol == 0)      /* I.e. strcmp(tags[symbol],"$")==0 */
+           fprintf (out,
+                    _("    $   \tgo to state %d\n"), state1);
+         else
+           fprintf (out,
+                    _("    %-4s\tshift, and go to state %d\n"),
+                    tags[symbol], state1);

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

-       putc('\n', foutput);
+       fputc ('\n', out);

     }
   else
     {
     }
   else
     {


@@ -202,120 +153,119 @@ int state;
 
       for (j = 0; j < nerrs; j++)
        {
 
       for (j = 0; j < nerrs; j++)
        {

-         if (! errp->errs[j]) continue;
+         if (!errp->errs[j])
+           continue;

          symbol = errp->errs[j];
          symbol = errp->errs[j];

-         fprintf(foutput, _("    %-4s\terror (nonassociative)\n"), tags[symbol]);
+         fprintf (out, _("    %-4s\terror (nonassociative)\n"),
+                  tags[symbol]);

        }
 
       if (j > 0)
        }
 
       if (j > 0)

-       putc('\n', foutput);
+       fputc ('\n', out);

     }
 
   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]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+              rule, tags[symbol]);

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

-      print_reductions(state);
+      print_reductions (state);

     }
 
   if (i < k)
     {
       for (; i < k; i++)
        {
     }
 
   if (i < k)
     {
       for (; i < k; i++)
        {

-         if (! shiftp->shifts[i]) continue;
+         if (!shiftp->shifts[i])
+           continue;

          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];

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

        }
 
        }
 

-      putc('\n', foutput);
+      fputc ('\n', out);

     }
 }
 
     }
 }
 

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

 {
   int i, j;
 {
   int i, j;

-  short* rule;
+  short *rule;

   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */

-  fputs(_("\nGrammar\n"), foutput);
+  fprintf (out, "\n%s\n", _("Grammar"));

   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]]);
+       fprintf (out, _("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++]);
+           fprintf (out, " %s", tags[*rule++]);

        else
        else

-         fputs (_("            /* empty */"), foutput);
-       putc('\n', foutput);
+         fprintf (out, "               /* %s */\n", _("empty"));

       }
 
   /* 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]);
-  if (translations)
-    {
-      for (i = 0; i <= max_user_token_number; i++)
-       if (token_translations[i] != 2)
-         {
-           buffer[0] = 0;
-           column = strlen (tags[token_translations[i]]);
-           fprintf(foutput, "%s", tags[token_translations[i]]);
-           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);
-         }
-    }
-  else
-    for (i = 1; i < ntokens; i++)
+  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);
+
+  for (i = 0; i <= max_user_token_number; i++)
+    if (token_translations[i] != 2)

       {
        buffer[0] = 0;
       {
        buffer[0] = 0;

-       column = strlen (tags[i]);
-       fprintf(foutput, "%s", tags[i]);
+       column = strlen (tags[token_translations[i]]);
+       fputs (tags[token_translations[i]], out);

        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 == 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;
+             }
+       fprintf (out, "%s\n", buffer);

       }
 
       }
 

-  fputs(_("\nNonterminals, with rules where they appear\n\n"), foutput);
+  fprintf (out, "\n%s\n\n",
+          _("Nonterminals, with rules where they appear"));

   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;


@@ -333,7 +283,7 @@ print_grammar()
        }
 
       buffer[0] = 0;
        }
 
       buffer[0] = 0;

-      fprintf(foutput, "%s", tags[i]);
+      fputs (tags[i], out);

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


@@ -341,33 +291,60 @@ print_grammar()
       if (left_count > 0)
        {
          END_TEST (50);
       if (left_count > 0)
        {
          END_TEST (50);

-         sprintf (buffer + strlen(buffer), _(" on left:"));
+         sprintf (buffer + strlen (buffer), _(" on left:"));

 
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);
              if (rlhs[j] == i)
 
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);
              if (rlhs[j] == i)

-               sprintf (buffer + strlen(buffer), " %d", j);
+               sprintf (buffer + strlen (buffer), " %d", j);

            }
        }
 
       if (right_count > 0)
        {
          if (left_count > 0)
            }
        }
 
       if (right_count > 0)
        {
          if (left_count > 0)

-           sprintf (buffer + strlen(buffer), ",");
+           sprintf (buffer + strlen (buffer), ",");

          END_TEST (50);
          END_TEST (50);

-         sprintf (buffer + strlen(buffer), _(" on right:"));
+         sprintf (buffer + strlen (buffer), _(" on right:"));

          for (j = 1; j <= nrules; j++)
            {
              for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
                if (*rule == i)
                  {
                    END_TEST (65);
          for (j = 1; j <= nrules; j++)
            {
              for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
                if (*rule == i)
                  {
                    END_TEST (65);

-                   sprintf (buffer + strlen(buffer), " %d", j);
+                   sprintf (buffer + strlen (buffer), " %d", j);

                    break;
                  }
            }
        }
                    break;
                  }
            }
        }

-      fprintf (foutput, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);
+    }
+}
+\f
+void
+print_results (void)
+{
+  if (verbose_flag)
+    {
+      int i;
+
+      /* We used to use just .out if spec_name_prefix (-p) was used, but
+        that conflicts with Posix.  */
+      FILE *out = xfopen (spec_verbose_file, "w");
+
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);
+
+      if (any_conflicts)
+       print_conflicts (out);
+
+      print_grammar (out);
+
+      for (i = 0; i < nstates; i++)
+       print_state (out, i);
+
+      xfclose (out);

     }
     }

+  obstack_free (&output_obstack, NULL);

 }
 }