(yytname): Do not assume that the user defines YYDEBUG to a properly

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index d9f38ca9f355a0ad2d27fb58815adeb01600017e..d7d04eab4e9bbeeb7b5750d23650becf2cc57be4 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 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc.

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


@@ -29,6 +29,8 @@
 #include "state.h"
 #include "reader.h"
 #include "print.h"
 #include "state.h"
 #include "reader.h"
 #include "print.h"

+#include "reduce.h"
+#include "closure.h"

 
 #if 0
 static void
 
 #if 0
 static void


@@ -47,65 +49,60 @@ static void
 print_core (FILE *out, int state)
 {
   int i;
 print_core (FILE *out, int state)
 {
   int i;

-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
+  short *sitems = state_table[state]->items;
+  int snitems   = state_table[state]->nitems;

 
 

-  statep = state_table[state];
-  k = statep->nitems;
-
-  if (k == 0)
-    return;
+  /* New experimental feature: if TRACE_FLAGS output all the items of
+     a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snitems);
+      sitems = itemset;
+      snitems = nitemset;
+    }

 
 

-  for (i = 0; i < k; i++)
+  if (snitems)

     {
     {

-      sp1 = sp = ritem + statep->items[i];
+      for (i = 0; i < snitems; i++)
+       {
+         short *sp;
+         short *sp1;
+         int rule;

 
 

-      while (*sp > 0)
-       sp++;
+         sp1 = sp = ritem + sitems[i];

 
 

-      rule = -(*sp);
-      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);
+         while (*sp > 0)
+           sp++;

 
 

-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-       {
-         fprintf (out, "%s ", tags[*sp]);
-       }
+         rule = -(*sp);
+         fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);

 
 

-      fputc ('.', out);
+         for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
+           fprintf (out, "%s ", tags[*sp]);

 
 

-      while (*sp > 0)
-       {
-         fprintf (out, " %s", tags[*sp]);
-         sp++;
+         fputc ('.', out);
+
+         for (/* Nothing */; *sp > 0; ++sp)
+           fprintf (out, " %s", tags[*sp]);
+
+         fprintf (out, _("   (rule %d)"), rule);
+         fputc ('\n', out);

        }
 
        }
 

-      fprintf (out, _("   (rule %d)"), rule);

       fputc ('\n', out);
     }
       fputc ('\n', out);
     }

-
-  fputc ('\n', out);

 }
 
 static void
 print_actions (FILE *out, int state)
 {
   int i;
 }
 
 static void
 print_actions (FILE *out, int state)
 {
   int i;

-  int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
-  int rule;
-
-  shiftp = shift_table[state];
-  redp = reduction_table[state];
-  errp = err_table[state];
-
-  if (!shiftp && !redp)
+
+  shifts   *shiftp = state_table[state]->shifts;
+  reductions *redp = state_table[state]->reductions;
+  errs       *errp = state_table[state]->errs;
+
+  if (!shiftp->nshifts && !redp)

     {
       if (final_state == state)
        fprintf (out, _("    $default\taccept\n"));
     {
       if (final_state == state)
        fprintf (out, _("    $default\taccept\n"));


@@ -114,48 +111,27 @@ print_actions (FILE *out, int state)
       return;
     }
 
       return;
     }
 

-  if (shiftp)
-    {
-      k = shiftp->nshifts;
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      {
+       int state1 = shiftp->shifts[i];
+       int symbol = state_table[state1]->accessing_symbol;
+       fprintf (out,
+                _("    %-4s\tshift, and go to state %d\n"),
+                tags[symbol], state1);
+      }

 
 

-      for (i = 0; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         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 (out,
-                    _("    $   \tgo to state %d\n"), state1);
-         else
-           fprintf (out,
-                    _("    %-4s\tshift, and go to state %d\n"),
-                    tags[symbol], state1);
-       }
-
-      if (i > 0)
-       fputc ('\n', out);
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  if (i > 0)
+    fputc ('\n', out);

 
   if (errp)
     {
 
   if (errp)
     {

-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
+      int j;
+      for (j = 0; j < errp->nerrs; j++)

        {
        {

-         if (!errp->errs[j])
+         int symbol = errp->errs[j];
+         if (!symbol)

            continue;
            continue;

-         symbol = errp->errs[j];

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


@@ -164,10 +140,10 @@ print_actions (FILE *out, int state)
        fputc ('\n', out);
     }
 
        fputc ('\n', out);
     }
 

-  if (consistent[state] && redp)
+  if (state_table[state]->consistent && redp)

     {
     {

-      rule = redp->rules[0];
-      symbol = rlhs[rule];
+      int rule = redp->rules[0];
+      int symbol = rule_table[rule].lhs;

       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule, tags[symbol]);
     }
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule, tags[symbol]);
     }


@@ -176,17 +152,16 @@ print_actions (FILE *out, int state)
       print_reductions (out, state);
     }
 
       print_reductions (out, state);
     }
 

-  if (i < k)
+  if (i < shiftp->nshifts)

     {
     {

-      for (; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         state1 = shiftp->shifts[i];
-         symbol = accessing_symbol[state1];
-         fprintf (out, _("    %-4s\tgo to state %d\n"),
-                  tags[symbol], state1);
-       }
+      for (; i < shiftp->nshifts; i++)
+       if (!SHIFT_IS_DISABLED (shiftp, i))
+         {
+           int state1 = shiftp->shifts[i];
+           int symbol = state_table[state1]->accessing_symbol;
+           fprintf (out, _("    %-4s\tgo to state %d\n"),
+                    tags[symbol], state1);
+         }

 
       fputc ('\n', out);
     }
 
       fputc ('\n', out);
     }


@@ -195,11 +170,11 @@ print_actions (FILE *out, int state)
 static void
 print_state (FILE *out, int state)
 {
 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);
   fprintf (out, _("state %d"), state);
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);

+  fputs ("\n\n", out);

 }
 \f
 /*-----------------------------------------.
 }
 \f
 /*-----------------------------------------.


@@ -226,23 +201,27 @@ print_grammar (FILE *out)
   int column = 0;
 
   /* rule # : LHS -> RHS */
   int column = 0;
 
   /* rule # : LHS -> RHS */

-  fprintf (out, "\n%s\n\n", _("Grammar"));
+  fprintf (out, "%s\n\n", _("Grammar"));
+  fprintf (out, "  %s\n", _("Number, Line, Rule"));

   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */

-    if (rlhs[i] >= 0)
+    if (rule_table[i].useful)

       {
       {

-       fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
-       rule = &ritem[rrhs[i]];
+       fprintf (out, _("  %3d %3d %s ->"),
+                i, rule_table[i].line, tags[rule_table[i].lhs]);
+       rule = &ritem[rule_table[i].rhs];

        if (*rule > 0)
          while (*rule > 0)
            fprintf (out, " %s", tags[*rule++]);
        else
        if (*rule > 0)
          while (*rule > 0)
            fprintf (out, " %s", tags[*rule++]);
        else

-         fprintf (out, "               /* %s */", _("empty"));
+         fprintf (out, " /* %s */", _("empty"));

        fputc ('\n', out);
       }
        fputc ('\n', out);
       }

+  fputs ("\n\n", out);
+

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

-  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%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++)
   fprintf (out, "%s (-1)\n", tags[0]);
 
   for (i = 0; i <= max_user_token_number; i++)


@@ -255,7 +234,7 @@ print_grammar (FILE *out)
        sprintf (buffer, " (%d)", i);
 
        for (j = 1; j <= nrules; j++)
        sprintf (buffer, " (%d)", i);
 
        for (j = 1; j <= nrules; j++)

-         for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+         for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)

            if (*rule == token_translations[i])
              {
                END_TEST (65);
            if (*rule == token_translations[i])
              {
                END_TEST (65);


@@ -264,18 +243,19 @@ print_grammar (FILE *out)
              }
        fprintf (out, "%s\n", buffer);
       }
              }
        fprintf (out, "%s\n", buffer);
       }

+  fputs ("\n\n", out);
+

 
 

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

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

-         if (rlhs[j] == i)
+         if (rule_table[j].lhs == i)

            left_count++;
            left_count++;

-         for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+         for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)

            if (*rule == i)
              {
                right_count++;
            if (*rule == i)
              {
                right_count++;


@@ -297,7 +277,7 @@ print_grammar (FILE *out)
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);

-             if (rlhs[j] == i)
+             if (rule_table[j].lhs == i)

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


@@ -310,7 +290,7 @@ print_grammar (FILE *out)
          sprintf (buffer + strlen (buffer), _(" on right:"));
          for (j = 1; j <= nrules; j++)
            {
          sprintf (buffer + strlen (buffer), _(" on right:"));
          for (j = 1; j <= nrules; j++)
            {

-             for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+             for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)

                if (*rule == i)
                  {
                    END_TEST (65);
                if (*rule == i)
                  {
                    END_TEST (65);


@@ -321,30 +301,39 @@ print_grammar (FILE *out)
        }
       fprintf (out, "%s\n", buffer);
     }
        }
       fprintf (out, "%s\n", buffer);
     }

+  fputs ("\n\n", out);

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

-  if (verbose_flag)
-    {
-      int i;
+  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");
+  /* 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);
+  size_t size = obstack_object_size (&output_obstack);
+  fwrite (obstack_finish (&output_obstack), 1, size, out);
+  obstack_free (&output_obstack, NULL);

 
 

-      conflicts_output (out);
+  if (size)
+    fputs ("\n\n", out);

 
 

-      print_grammar (out);
+  reduce_output (out);
+  conflicts_output (out);

 
 

-      for (i = 0; i < nstates; i++)
-       print_state (out, i);
+  print_grammar (out);

 
 

-      xfclose (out);
-    }
-  obstack_free (&output_obstack, NULL);
+  /* New experimental feature: output all the items of a state,
+     not only its kernel.  Requires to run closure, which need
+     memory allocation/deallocation.  */
+  if (trace_flag)
+    new_closure (nitems);
+  for (i = 0; i < nstates; i++)
+    print_state (out, i);
+  if (trace_flag)
+    free_closure ();
+
+  xfclose (out);

 }
 }