Fix the previous test.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 9ac1feb3b34c5e8bf365a46262696d3a9bd33357..72b4cd0a4f89b30943853946c46c5892bb11c2be 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -20,7 +20,9 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "quotearg.h"

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

+#include "symtab.h"

 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"


@@ -30,6 +32,10 @@
 #include "reader.h"
 #include "print.h"
 #include "reduce.h"
 #include "reader.h"
 #include "print.h"
 #include "reduce.h"

+#include "closure.h"
+
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;

 
 #if 0
 static void
 
 #if 0
 static void


@@ -39,149 +45,301 @@ print_token (int extnum, int token)
 }
 #endif
 
 }
 #endif
 

+static inline const char *
+escape (const char *s)
+{
+  return quotearg_n_style (1, escape_quoting_style, s);
+}
+
+/* Be cautious not to use twice the same slot in a single expression. */
+static inline const char *
+escape2 (const char *s)
+{
+  return quotearg_n_style (2, escape_quoting_style, s);
+}
+

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

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

 {
   int i;
 {
   int i;

-  core *statep = state_table[state].state;
+  short *sitems = state->items;
+  int snitems   = state->nitems;

 
 

-  if (!statep->nitems)
-    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 < statep->nitems; i++)
+  if (snitems)

     {
     {

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

 
 

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

 
 

-      while (*sp > 0)
-       sp++;
+         rule = -(*sp);
+         fprintf (out, "    %s  ->  ", escape (symbols[rules[rule].lhs]->tag));

 
 

-      rule = -(*sp);
-      fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
+         for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+           fprintf (out, "%s ", escape (symbols[*sp]->tag));

 
 

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

 
 

-      fputc ('.', out);
+         for (/* Nothing */; *sp >= 0; ++sp)
+           fprintf (out, " %s", escape (symbols[*sp]->tag));

 
 

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

 
 

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

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

+}
+
+
+static void
+print_shifts (FILE *out, state_t *state)
+{
+  int i;
+  shifts *shiftp = state->shifts;
+
+  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 = states[state1]->accessing_symbol;
+       fprintf (out,
+                _("    %-4s\tshift, and go to state %d\n"),
+                escape (symbols[symbol]->tag), state1);
+      }

 
 

-  fputc ('\n', out);
+  if (i > 0)
+    fputc ('\n', out);

 }
 
 }
 

+

 static void
 static void

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

 {
 {

+  errs *errp = state->errs;

   int i;
   int i;

-  int k;

 
 

-  shifts   *shiftp = state_table[state].shift_table;
-  reductions *redp = state_table[state].reduction_table;
-  errs       *errp = err_table[state];
+  for (i = 0; i < errp->nerrs; ++i)
+    if (errp->errs[i])
+      fprintf (out, _("    %-4s\terror (nonassociative)\n"),
+              escape (symbols[errp->errs[i]]->tag));

 
 

-  if (!shiftp && !redp)
-    {
-      if (final_state == state)
-       fprintf (out, _("    $default\taccept\n"));
-      else
-       fprintf (out, _("    NO ACTIONS\n"));
-      return;
-    }
+  if (i > 0)
+    fputc ('\n', out);
+}

 
 

-  if (shiftp)
-    {
-      k = shiftp->nshifts;

 
 

-      for (i = 0; i < k; i++)
-       {
-         int symbol;
-         int state1 = shiftp->shifts[i];
-         if (!state1)
-           continue;
-         symbol = state_table[state1].accessing_symbol;
-         /* 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);
-       }
+static void
+print_gotos (FILE *out, state_t *state)
+{
+  int i;
+  shifts *shiftp = state->shifts;

 
 

-      if (i > 0)
-       fputc ('\n', out);
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    /* Skip token shifts.  */;

 
 

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

     {
     {

-      int j;
-      for (j = 0; j < errp->nerrs; j++)
-       {
-         int symbol = errp->errs[j];
-         if (!symbol)
-           continue;
-         fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-                  tags[symbol]);
-       }
+      for (; i < shiftp->nshifts; i++)
+       if (!SHIFT_IS_DISABLED (shiftp, i))
+         {
+           int state1 = shiftp->shifts[i];
+           int symbol = states[state1]->accessing_symbol;
+           fprintf (out, _("    %-4s\tgo to state %d\n"),
+                    escape (symbols[symbol]->tag), state1);
+         }

 
 

-      if (j > 0)
-       fputc ('\n', out);
+      fputc ('\n', out);

     }
     }

+}
+
+static void
+print_reductions (FILE *out, state_t *state)
+{
+  int i;
+  shifts *shiftp = state->shifts;
+  reductions *redp = state->reductions;
+  errs *errp = state->errs;
+  int nodefault = 0;

 
 

-  if (state_table[state].consistent && redp)
+  if (redp->nreds == 0)
+    return;
+
+  if (state->consistent)

     {
       int rule = redp->rules[0];
     {
       int rule = redp->rules[0];

-      int symbol = rule_table[rule].lhs;
+      int symbol = rules[rule].lhs;

       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),

-              rule, tags[symbol]);
+              rule - 1, escape (symbols[symbol]->tag));
+      return;

     }
     }

-  else if (redp)
+
+  for (i = 0; i < tokensetsize; i++)
+    shiftset[i] = 0;
+
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      {
+       /* if this state has a shift for the error token, don't use a
+          default rule.  */
+       if (SHIFT_IS_ERROR (shiftp, i))
+         nodefault = 1;
+       SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+      }
+
+  for (i = 0; i < errp->nerrs; i++)
+    if (errp->errs[i])
+      SETBIT (shiftset, errp->errs[i]);
+
+  if (state->nlookaheads == 1 && !nodefault)

     {
     {

-      print_reductions (out, state);
-    }
+      int k;
+      int default_rule = LAruleno[state->lookaheadsp];

 
 

-  if (i < k)
+      for (k = 0; k < tokensetsize; ++k)
+       lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+
+      for (i = 0; i < ntokens; i++)
+       if (BITISSET (lookaheadset, i))
+         fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                  escape (symbols[i]->tag), default_rule - 1,
+                  escape2 (symbols[rules[default_rule].lhs]->tag));
+
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+              default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag));
+    }
+  else if (state->nlookaheads >= 1)

     {
     {

-      for (; i < k; i++)
+      int cmax = 0;
+      int default_LA = -1;
+      int default_rule = 0;
+
+      if (!nodefault)
+       for (i = 0; i < state->nlookaheads; ++i)
+         {
+           int count = 0;
+           int j, k;
+
+           for (k = 0; k < tokensetsize; ++k)
+             lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
+
+           for (j = 0; j < ntokens; j++)
+             if (BITISSET (lookaheadset, j))
+               count++;
+
+           if (count > cmax)
+             {
+               cmax = count;
+               default_LA = state->lookaheadsp + i;
+               default_rule = LAruleno[state->lookaheadsp + i];
+             }
+
+           for (k = 0; k < tokensetsize; ++k)
+             shiftset[k] |= lookaheadset[k];
+         }
+
+      for (i = 0; i < tokensetsize; i++)
+       shiftset[i] = 0;
+
+      for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+       if (!SHIFT_IS_DISABLED (shiftp, i))
+         SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+
+      for (i = 0; i < ntokens; i++)

        {
        {

-         int symbol;
-         int state1 = shiftp->shifts[i];
-         if (!state1)
-           continue;
-         symbol = state_table[state1].accessing_symbol;
-         fprintf (out, _("    %-4s\tgo to state %d\n"),
-                  tags[symbol], state1);
+         int j;
+         int defaulted = 0;
+         int count = BITISSET (shiftset, i);
+
+         for (j = 0; j < state->nlookaheads; ++j)
+           {
+             if (BITISSET (LA (state->lookaheadsp + j), i))
+               {
+                 if (count == 0)
+                   {
+                     if (state->lookaheadsp + j != default_LA)
+                       fprintf (out,
+                                _("    %-4s\treduce using rule %d (%s)\n"),
+                                escape (symbols[i]->tag),
+                                LAruleno[state->lookaheadsp + j] - 1,
+                                escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
+                     else
+                       defaulted = 1;
+
+                     count++;
+                   }
+                 else
+                   {
+                     if (defaulted)
+                       fprintf (out,
+                                _("    %-4s\treduce using rule %d (%s)\n"),
+                                escape (symbols[i]->tag),
+                                LAruleno[default_LA] - 1,
+                                escape2 (symbols[rules[LAruleno[default_LA]].lhs]->tag));
+                     defaulted = 0;
+                     fprintf (out,
+                              _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                              escape (symbols[i]->tag),
+                              LAruleno[state->lookaheadsp + j] - 1,
+                              escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
+                   }
+               }
+           }

        }
 
        }
 

-      fputc ('\n', out);
+      if (default_LA >= 0)
+       fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
+                default_rule - 1,
+                escape (symbols[rules[default_rule].lhs]->tag));

     }
 }
 
     }
 }
 

+

 static void
 static void

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

 {
 {

-  fprintf (out, _("state %d"), state);
+  reductions *redp = state->reductions;
+  shifts *shiftp = state->shifts;
+
+  if (shiftp->nshifts == 0 && redp->nreds == 0)
+    {
+      if (final_state == state->number)
+       fprintf (out, _("    $default\taccept\n"));
+      else
+       fprintf (out, _("    NO ACTIONS\n"));
+      return;
+    }
+
+  print_shifts (out, state);
+  print_errs (out, state);
+  print_reductions (out, state);
+  print_gotos (out, state);
+}
+
+static void
+print_state (FILE *out, state_t *state)
+{
+  fprintf (out, _("state %d"), state->number);

   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);


@@ -216,14 +374,14 @@ print_grammar (FILE *out)
   fprintf (out, "  %s\n", _("Number, Line, Rule"));
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
   fprintf (out, "  %s\n", _("Number, Line, Rule"));
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */

-    if (rule_table[i].useful)
+    if (rules[i].useful)

       {
        fprintf (out, _("  %3d %3d %s ->"),
       {
        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++]);
+                i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag));
+       rule = &ritem[rules[i].rhs];
+       if (*rule >= 0)
+         while (*rule >= 0)
+           fprintf (out, " %s", escape (symbols[*rule++]->tag));

        else
          fprintf (out, " /* %s */", _("empty"));
        fputc ('\n', out);
        else
          fprintf (out, " /* %s */", _("empty"));
        fputc ('\n', out);


@@ -233,23 +391,21 @@ print_grammar (FILE *out)
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   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++)
     if (token_translations[i] != 2)
       {
        buffer[0] = 0;
   for (i = 0; i <= max_user_token_number; i++)
     if (token_translations[i] != 2)
       {
        buffer[0] = 0;

-       column = strlen (tags[token_translations[i]]);
-       fputs (tags[token_translations[i]], out);
+       column = strlen (escape (symbols[token_translations[i]]->tag));
+       fputs (escape (symbols[token_translations[i]]->tag), 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[rule_table[j].rhs]; *rule > 0; rule++)
+         for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)

            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 - 1);

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


@@ -264,9 +420,9 @@ print_grammar (FILE *out)
 
       for (j = 1; j <= nrules; j++)
        {
 
       for (j = 1; j <= nrules; j++)
        {

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

            left_count++;
            left_count++;

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

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


@@ -275,8 +431,8 @@ print_grammar (FILE *out)
        }
 
       buffer[0] = 0;
        }
 
       buffer[0] = 0;

-      fputs (tags[i], out);
-      column = strlen (tags[i]);
+      fputs (escape (symbols[i]->tag), out);
+      column = strlen (escape (symbols[i]->tag));

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


@@ -288,8 +444,8 @@ print_grammar (FILE *out)
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);

-             if (rule_table[j].lhs == i)
-               sprintf (buffer + strlen (buffer), " %d", j);
+             if (rules[j].lhs == i)
+               sprintf (buffer + strlen (buffer), " %d", j - 1);

            }
        }
 
            }
        }
 


@@ -301,11 +457,11 @@ 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[rule_table[j].rhs]; *rule > 0; rule++)
+             for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)

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

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

                    break;
                  }
            }
                    break;
                  }
            }


@@ -318,28 +474,38 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
 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 (size)
-       fputs ("\n\n", out);
-
-      reduce_output (out);
-      conflicts_output (out);
-
-      print_grammar (out);
+  int i;

 
 

-      for (i = 0; i < nstates; i++)
-       print_state (out, 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");

 
 

-      xfclose (out);
-    }
+  size_t size = obstack_object_size (&output_obstack);
+  fwrite (obstack_finish (&output_obstack), 1, size, out);

   obstack_free (&output_obstack, NULL);
   obstack_free (&output_obstack, NULL);

+
+  if (size)
+    fputs ("\n\n", out);
+
+  reduce_output (out);
+  conflicts_output (out);
+
+  print_grammar (out);
+
+  /* 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 (nritems);
+  /* Storage for print_reductions.  */
+  shiftset = XCALLOC (unsigned, tokensetsize);
+  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  for (i = 0; i < nstates; i++)
+    print_state (out, states[i]);
+  free (shiftset);
+  free (lookaheadset);
+  if (trace_flag)
+    free_closure ();
+
+  xfclose (out);

 }
 }