More ignores.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 9a8485370ad7f16ef71696fdb37e67f5496bbe81..ccafbdc645388b0463f645fac5cbd08ea7ac5e37 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,7 +20,6 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

-#include "alloc.h"

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


@@ -29,23 +28,23 @@
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"
 #include "getargs.h"
 #include "state.h"
 #include "reader.h"

-
+#include "print.h"

 
 #if 0
 static void
 print_token (int extnum, int token)
 {
 
 #if 0
 static void
 print_token (int extnum, int token)
 {

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

 }
 #endif
 
 \f
 }
 #endif
 
 \f

-/*================================\
+/*--------------------------------.

 | Report information on a state.  |
 | Report information on a state.  |

-\================================*/
+`--------------------------------*/

 
 static void
 
 static void

-print_core (int state)
+print_core (FILE *out, int state)

 {
   int i;
   int k;
 {
   int i;
   int k;


@@ -68,30 +67,30 @@ print_core (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);

 }
 
 static void
 }
 
 static void

-print_actions (int state)
+print_actions (FILE *out, int state)

 {
   int i;
   int k;
 {
   int i;
   int k;


@@ -109,9 +108,9 @@ print_actions (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;
     }
 


@@ -129,14 +128,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);
+           fprintf (out,
+                    _("    $   \tgo to state %d\n"), state1);

          else
          else

-           fprintf (foutput, _("    %-4s\tshift, and go to state %d\n"),
+           fprintf (out,
+                    _("    %-4s\tshift, and go to state %d\n"),

                     tags[symbol], state1);
        }
 
       if (i > 0)
                     tags[symbol], state1);
        }
 
       if (i > 0)

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

     }
   else
     {
     }
   else
     {


@@ -155,19 +156,19 @@ 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"),
+         fprintf (out, _("    %-4s\terror (nonassociative)\n"),

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

               rule, tags[symbol]);
     }
   else if (redp)
               rule, tags[symbol]);
     }
   else if (redp)


@@ -183,38 +184,41 @@ 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);
+         fprintf (out, _("    %-4s\tgo to state %d\n"),
+                  tags[symbol], state1);

        }
 
        }
 

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

     }
 }
 
 static void
     }
 }
 
 static void

-print_state (int state)
+print_state (FILE *out, int state)

 {
 {

-  fprintf (foutput, _("\n\nstate %d\n\n"), state);
-  print_core (state);
-  print_actions (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.  |
 `-----------------------------------------*/
 
 }
 \f
 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 

-#define END_TEST(end)                          \
-  do {                                         \
-    if (column + strlen(buffer) > (end)) {     \
-      fprintf (foutput, "%s\n   ", buffer);    \
+#define END_TEST(End)                          \
+do {                                           \
+  if (column + strlen(buffer) > (End))         \
+    {                                          \
+      fprintf (out, "%s\n   ", buffer);                \

       column = 3;                              \
       buffer[0] = 0;                           \
     }                                          \
       column = 3;                              \
       buffer[0] = 0;                           \
     }                                          \

-  } while (0)
+} while (0)

 
 
 static void
 
 
 static void

-print_grammar (void)
+print_grammar (FILE *out)

 {
   int i, j;
   short *rule;
 {
   int i, j;
   short *rule;


@@ -222,71 +226,46 @@ print_grammar (void)
   int column = 0;
 
   /* rule # : LHS -> RHS */
   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;


@@ -304,7 +283,7 @@ print_grammar (void)
        }
 
       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);


@@ -339,22 +318,33 @@ print_grammar (void)
                  }
            }
        }
                  }
            }
        }

-      fprintf (foutput, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);

     }
 }
 \f
 void
 print_results (void)
 {
     }
 }
 \f
 void
 print_results (void)
 {

-  int i;
+  if (verbose_flag)
+    {
+      int i;

 
 

-  if (any_conflicts)
-    print_conflicts ();
+      /* 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");

 
 

-  if (verboseflag)
-    print_grammar ();
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);

 
 

-  if (verboseflag)
-    for (i = 0; i < nstates; i++)
-      print_state (i);
+      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);

 }
 }