* src/atgeneral.m4: Update from Autoconf.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 3ea8b4254446270efabfa3c17cf5a21d3ad9c0bd..373c5ffc1d0d66a3614b27ceb5cc9e61911c9e98 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,26 +1,25 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

-   Copyright (C) 1984, 1986, 1989 Free Software Foundation, Inc.
+   Copyright (C) 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 "alloc.h"
 #include "files.h"
 #include "gram.h"
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"


@@ -39,75 +38,78 @@ extern char any_conflicts;
 extern char *conflicts;
 extern int final_state;
 
 extern char *conflicts;
 extern int final_state;
 

-extern void conflict_log PARAMS((void));
-extern void verbose_conflict_log PARAMS((void));
-extern void print_reductions PARAMS((int));
+extern void conflict_log PARAMS ((void));
+extern void verbose_conflict_log PARAMS ((void));
+extern void print_reductions PARAMS ((int));

 
 

-void terse PARAMS((void));
-void verbose PARAMS((void));
-void print_token PARAMS((int, int));
-void print_state PARAMS((int));
-void print_core PARAMS((int));
-void print_actions PARAMS((int));
-void print_grammar PARAMS((void));
+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)
 
 void
 terse (void)
 {
   if (any_conflicts)

-    {
-      conflict_log();
-    }
+    conflict_log ();

 }
 
 
 void
 verbose (void)
 {
 }
 
 
 void
 verbose (void)
 {

-  register int i;
+  int i;

 
   if (any_conflicts)
 
   if (any_conflicts)

-    verbose_conflict_log();
+    verbose_conflict_log ();

 
 

-  print_grammar();
+  print_grammar ();

 
   for (i = 0; i < nstates; i++)
 
   for (i = 0; i < nstates; i++)

-    {
-      print_state(i);
-    }
+    print_state (i);

 }
 
 
 }
 
 

-void
+#if 0                          /* XXX currently unused.  */
+static void

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

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

 }
 }

+#endif

 
 
 
 

-void
+static void

 print_state (int state)
 {
 print_state (int state)
 {

-  fprintf(foutput, _("\n\nstate %d\n\n"), state);
-  print_core(state);
-  print_actions(state);
+  fprintf (foutput, _("\n\nstate %d\n\n"), state);
+  print_core (state);
+  print_actions (state);

 }
 
 
 }
 
 

-void
+static void

 print_core (int state)
 {
 print_core (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++)
     {


@@ -117,40 +119,40 @@ print_core (int state)
        sp++;
 
       rule = -(*sp);
        sp++;
 
       rule = -(*sp);

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

        }
 
        }
 

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

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

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

          sp++;
        }
 
       fprintf (foutput, _("   (rule %d)"), rule);
          sp++;
        }
 
       fprintf (foutput, _("   (rule %d)"), rule);

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

     }
 
     }
 

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

 }
 
 
 }
 
 

-void
+static void

 print_actions (int state)
 {
 print_actions (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];


@@ -159,9 +161,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 (foutput, _("    $default\taccept\n"));

       else
       else

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

       return;
     }
 
       return;
     }
 


@@ -171,20 +173,22 @@ print_actions (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 (foutput, _("    $   \tgo to state %d\n"), state1);
+         else
+           fprintf (foutput, _("    %-4s\tshift, and go to state %d\n"),
+                    tags[symbol], state1);

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

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

     }
   else
     {
     }
   else
     {


@@ -200,73 +204,81 @@ print_actions (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 (foutput, _("    %-4s\terror (nonassociative)\n"),
+                  tags[symbol]);

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

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

     }
 
   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 (foutput, _("    $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 (foutput, _("    %-4s\tgo to state %d\n"), tags[symbol],
+                  state1);

        }
 
        }
 

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

     }
 }
 
     }
 }
 

-#define END_TEST(end) \
-  if (column + strlen(buffer) > (end))                                  \
-    { fprintf (foutput, "%s\n   ", buffer); column = 3; buffer[0] = 0; } \
-  else
+#define END_TEST(end)                          \
+  do {                                         \
+    if (column + strlen(buffer) > (end)) {     \
+      fprintf (foutput, "%s\n   ", buffer);    \
+      column = 3;                              \
+      buffer[0] = 0;                           \
+    }                                          \
+  } while (0)

 
 

-void
+static void

 print_grammar (void)
 {
   int i, j;
 print_grammar (void)
 {
   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);
+  fputs (_("\nGrammar\n"), foutput);

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

        else
          fputs (_("            /* empty */"), foutput);
        else
          fputs (_("            /* empty */"), foutput);

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

       }
 
   /* 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]);
+  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 (translations)
     {
       for (i = 0; i <= max_user_token_number; i++)


@@ -274,7 +286,7 @@ 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]]);
+           fprintf (foutput, "%s", tags[token_translations[i]]);

            END_TEST (50);
            sprintf (buffer, " (%d)", i);
 
            END_TEST (50);
            sprintf (buffer, " (%d)", i);
 


@@ -284,7 +296,7 @@ print_grammar (void)
                  if (*rule == token_translations[i])
                    {
                      END_TEST (65);
                  if (*rule == token_translations[i])
                    {
                      END_TEST (65);

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

                      break;
                    }
              }
                      break;
                    }
              }


@@ -296,7 +308,7 @@ print_grammar (void)
       {
        buffer[0] = 0;
        column = strlen (tags[i]);
       {
        buffer[0] = 0;
        column = strlen (tags[i]);

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

        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 
        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 


@@ -306,14 +318,14 @@ print_grammar (void)
              if (*rule == i)
                {
                  END_TEST (65);
              if (*rule == i)
                {
                  END_TEST (65);

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

                  break;
                }
          }
        fprintf (foutput, "%s\n", buffer);
       }
 
                  break;
                }
          }
        fprintf (foutput, "%s\n", buffer);
       }
 

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

   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;


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

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

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


@@ -339,29 +351,29 @@ print_grammar (void)
       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;
                  }
            }