Display items as we display rules.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 72b4cd0a4f89b30943853946c46c5892bb11c2be..76e5f740186286daa67c4b19c26ee5af04a3b573 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,6 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

-   Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002
+   Free Software Foundation, Inc.

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


@@ -33,9 +34,10 @@
 #include "print.h"
 #include "reduce.h"
 #include "closure.h"
 #include "print.h"
 #include "reduce.h"
 #include "closure.h"

+#include "bitset.h"

 
 

-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;
+static bitset shiftset;
+static bitset lookaheadset;

 
 #if 0
 static void
 
 #if 0
 static void


@@ -45,19 +47,6 @@ 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.  |
 \f
 /*--------------------------------.
 | Report information on a state.  |


@@ -67,48 +56,51 @@ static void
 print_core (FILE *out, state_t *state)
 {
   int i;
 print_core (FILE *out, state_t *state)
 {
   int i;

-  short *sitems = state->items;
-  int snitems   = state->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;
+  symbol_t *previous_lhs = NULL;

 
 

-  /* New experimental feature: if TRACE_FLAGS output all the items of
-     a state, not only its kernel.  */
-  if (trace_flag)
+  /* Output all the items of a state, not only its kernel.  */
+  if (report_flag & report_itemsets)

     {
     {

-      closure (sitems, snitems);
+      closure (sitems, snritems);

       sitems = itemset;
       sitems = itemset;

-      snitems = nitemset;
+      snritems = nritemset;

     }
 
     }
 

-  if (snitems)
-    {
-      for (i = 0; i < snitems; i++)
-       {
-         short *sp;
-         short *sp1;
-         int rule;
+  if (!snritems)
+    return;

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-         fputc ('.', out);
+      rule_lhs_print (&rules[rule], previous_lhs, out);
+      previous_lhs = rules[rule].lhs;

 
 

-         for (/* Nothing */; *sp >= 0; ++sp)
-           fprintf (out, " %s", escape (symbols[*sp]->tag));
+      for (sp = rules[rule].rhs; sp < sp1; sp++)
+       fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
+      fputs (" .", out);
+      for (/* Nothing */; *sp >= 0; ++sp)
+       fprintf (out, " %s", symbol_tag_get (symbols[*sp]));

 
 

-         fprintf (out, _("   (rule %d)"), rule - 1);
-         fputc ('\n', out);
-       }
+      /* Display the lookaheads?  */
+      if (report_flag & report_lookaheads)
+       state_rule_lookaheads_print (state, &rules[rule], out);

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

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

 }
 
 
 }
 
 


@@ -116,16 +108,16 @@ static void
 print_shifts (FILE *out, state_t *state)
 {
   int i;
 print_shifts (FILE *out, state_t *state)
 {
   int i;

-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;

 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
 
   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;
+       state_number_t state1 = shiftp->shifts[i];
+       symbol_number_t symbol = states[state1]->accessing_symbol;

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

-                escape (symbols[symbol]->tag), state1);
+                symbol_tag_get (symbols[symbol]), state1);

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


@@ -136,13 +128,13 @@ print_shifts (FILE *out, state_t *state)
 static void
 print_errs (FILE *out, state_t *state)
 {
 static void
 print_errs (FILE *out, state_t *state)
 {

-  errs *errp = state->errs;
+  errs_t *errp = state->errs;

   int i;
 
   for (i = 0; i < errp->nerrs; ++i)
     if (errp->errs[i])
       fprintf (out, _("    %-4s\terror (nonassociative)\n"),
   int i;
 
   for (i = 0; i < errp->nerrs; ++i)
     if (errp->errs[i])
       fprintf (out, _("    %-4s\terror (nonassociative)\n"),

-              escape (symbols[errp->errs[i]]->tag));
+              symbol_tag_get (symbols[errp->errs[i]]));

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


@@ -153,7 +145,7 @@ static void
 print_gotos (FILE *out, state_t *state)
 {
   int i;
 print_gotos (FILE *out, state_t *state)
 {
   int i;

-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;

 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     /* Skip token shifts.  */;
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     /* Skip token shifts.  */;


@@ -163,170 +155,170 @@ print_gotos (FILE *out, state_t *state)
       for (; i < shiftp->nshifts; i++)
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {
       for (; i < shiftp->nshifts; i++)
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {

-           int state1 = shiftp->shifts[i];
-           int symbol = states[state1]->accessing_symbol;
+           state_number_t state1 = shiftp->shifts[i];
+           symbol_number_t symbol = states[state1]->accessing_symbol;

            fprintf (out, _("    %-4s\tgo to state %d\n"),
            fprintf (out, _("    %-4s\tgo to state %d\n"),

-                    escape (symbols[symbol]->tag), state1);
+                    symbol_tag_get (symbols[symbol]), state1);

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

-static void
-print_reductions (FILE *out, state_t *state)
+
+/*----------------------------------------------------------.
+| Return the default rule of this STATE if it has one, NULL |
+| otherwise.                                                |
+`----------------------------------------------------------*/
+
+static rule_t *
+state_default_rule_compute (state_t *state)

 {
 {

+  reductions_t *redp = state->reductions;
+  rule_t *default_rule = NULL;
+  int cmax = 0;

   int i;
   int i;

-  shifts *shiftp = state->shifts;
-  reductions *redp = state->reductions;
-  errs *errp = state->errs;
-  int nodefault = 0;
-
-  if (redp->nreds == 0)
-    return;

 
 

+  /* No need for a lookahead.  */

   if (state->consistent)
   if (state->consistent)

+    return &rules[redp->rules[0]];
+
+  /* 1. Each reduction is possibly masked by the lookaheads on which
+     we shift (S/R conflicts)...  */
+  bitset_zero (shiftset);
+  {
+    shifts_t *shiftp = state->shifts;
+    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))
+           return NULL;
+         bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
+       }
+  }
+
+  /* 2. Each reduction is possibly masked by the lookaheads on which
+     we raise an error (due to %nonassoc).  */
+  {
+    errs_t *errp = state->errs;
+    for (i = 0; i < errp->nerrs; i++)
+      if (errp->errs[i])
+       bitset_set (shiftset, errp->errs[i]);
+  }
+
+  for (i = 0; i < state->nlookaheads; ++i)

     {
     {

-      int rule = redp->rules[0];
-      int symbol = rules[rule].lhs;
-      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-              rule - 1, escape (symbols[symbol]->tag));
-      return;
+      int count = 0;
+
+      /* How many non-masked lookaheads are there for this reduction?
+        */
+      bitset_andn (lookaheadset, state->lookaheads[i], shiftset);
+      count = bitset_count (lookaheadset);
+
+      if (count > cmax)
+       {
+         cmax = count;
+         default_rule = state->lookaheads_rule[i];
+       }
+
+      /* 3. And finally, each reduction is possibly masked by previous
+        reductions (in R/R conflicts, we keep the first reductions).
+        */
+      bitset_or (shiftset, shiftset, state->lookaheads[i]);

     }
 
     }
 

-  for (i = 0; i < tokensetsize; i++)
-    shiftset[i] = 0;
+  return default_rule;
+}

 
 

-  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]);
+/*----------------------------------------------------.
+| Report on OUT the reduction actions of this STATE.  |
+`----------------------------------------------------*/

 
 

-  if (state->nlookaheads == 1 && !nodefault)
-    {
-      int k;
-      int default_rule = LAruleno[state->lookaheadsp];
+static void
+print_reductions (FILE *out, state_t *state)
+{
+  int i;
+  shifts_t *shiftp = state->shifts;
+  reductions_t *redp = state->reductions;
+  rule_t *default_rule = NULL;

 
 

-      for (k = 0; k < tokensetsize; ++k)
-       lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+  if (redp->nreds == 0)
+    return;

 
 

-      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));
+  default_rule = state_default_rule_compute (state);

 
 

-      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)
+  bitset_zero (shiftset);
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
+
+  for (i = 0; i < ntokens; i++)

     {
     {

-      int cmax = 0;
-      int default_LA = -1;
-      int default_rule = 0;
+      int j;
+      int defaulted = 0;
+      int count = bitset_test (shiftset, i);

 
 

-      if (!nodefault)
-       for (i = 0; i < state->nlookaheads; ++i)
+      for (j = 0; j < state->nlookaheads; ++j)
+       if (bitset_test (state->lookaheads[j], 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))
+           if (count == 0)
+             {
+               if (state->lookaheads_rule[j] != default_rule)
+                 fprintf (out,
+                          _("    %-4s\treduce using rule %d (%s)\n"),
+                          symbol_tag_get (symbols[i]),
+                          state->lookaheads_rule[j]->number - 1,
+                          symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));
+               else
+                 defaulted = 1;

                count++;
                count++;

-
-           if (count > cmax)
+             }
+           else

              {
              {

-               cmax = count;
-               default_LA = state->lookaheadsp + i;
-               default_rule = LAruleno[state->lookaheadsp + i];
+               if (defaulted)
+                 fprintf (out,
+                          _("    %-4s\treduce using rule %d (%s)\n"),
+                          symbol_tag_get (symbols[i]),
+                          default_rule->number - 1,
+                          symbol_tag_get_n (default_rule->lhs, 1));
+               defaulted = 0;
+               fprintf (out,
+                        _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                        symbol_tag_get (symbols[i]),
+                        state->lookaheads_rule[j]->number - 1,
+                        symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));

              }
              }

-
-           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 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));
-                   }
-               }
-           }
-       }
-
-      if (default_LA >= 0)
-       fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
-                default_rule - 1,
-                escape (symbols[rules[default_rule].lhs]->tag));

     }
     }

+
+  if (default_rule)
+    fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
+            default_rule->number - 1,
+            symbol_tag_get (default_rule->lhs));
+  fputc ('\n', out);

 }
 
 
 }
 
 

+/*--------------------------------------------------------------.
+| Report on OUT all the actions (shifts, gotos, reductions, and |
+| explicit erros from %nonassoc) of STATE.                      |
+`--------------------------------------------------------------*/
+

 static void
 print_actions (FILE *out, state_t *state)
 {
 static void
 print_actions (FILE *out, state_t *state)
 {

-  reductions *redp = state->reductions;
-  shifts *shiftp = state->shifts;
+  reductions_t *redp = state->reductions;
+  shifts_t *shiftp = state->shifts;

 
   if (shiftp->nshifts == 0 && redp->nreds == 0)
     {
 
   if (shiftp->nshifts == 0 && redp->nreds == 0)
     {

-      if (final_state == state->number)
-       fprintf (out, _("    $default\taccept\n"));
+      if (state->number == final_state->number)
+       fprintf (out, _("    $default\taccept\n"));

       else
       else

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

       return;
     }
 
       return;
     }
 


@@ -336,6 +328,7 @@ print_actions (FILE *out, state_t *state)
   print_gotos (out, state);
 }
 
   print_gotos (out, state);
 }
 

+

 static void
 print_state (FILE *out, state_t *state)
 {
 static void
 print_state (FILE *out, state_t *state)
 {


@@ -343,6 +336,9 @@ print_state (FILE *out, state_t *state)
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);

+  if ((report_flag & report_solved_conflicts)
+      && state->solved_conflicts)
+    fputs (state->solved_conflicts, out);

   fputs ("\n\n", out);
 }
 \f
   fputs ("\n\n", out);
 }
 \f


@@ -364,48 +360,33 @@ do {                                              \
 static void
 print_grammar (FILE *out)
 {
 static void
 print_grammar (FILE *out)
 {

-  int i, j;
-  short *rule;
+  symbol_number_t i;

   char buffer[90];
   int column = 0;
 
   char buffer[90];
   int column = 0;
 

-  /* rule # : LHS -> RHS */
-  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.  */
-    if (rules[i].useful)
-      {
-       fprintf (out, _("  %3d %3d %s ->"),
-                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);
-      }
-  fputs ("\n\n", out);
-
+  grammar_rules_print (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"));

-  for (i = 0; i <= max_user_token_number; i++)
-    if (token_translations[i] != 2)
+  for (i = 0; i < max_user_token_number + 1; i++)
+    if (token_translations[i] != undeftoken->number)

       {
       {

+       const char *tag = symbol_tag_get (symbols[token_translations[i]]);
+       rule_number_t r;
+       item_number_t *rhsp;
+

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

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

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

-       for (j = 1; j <= nrules; j++)
-         for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-           if (*rule == token_translations[i])
+       for (r = 1; r < nrules + 1; r++)
+         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+           if (item_number_as_symbol_number (*rhsp) == token_translations[i])

              {
                END_TEST (65);
              {
                END_TEST (65);

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

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


@@ -414,16 +395,19 @@ print_grammar (FILE *out)
 
 
   fprintf (out, "%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++)
+  for (i = ntokens; i < nsyms; i++)

     {
       int left_count = 0, right_count = 0;
     {
       int left_count = 0, right_count = 0;

+      rule_number_t r;
+      const char *tag = symbol_tag_get (symbols[i]);

 
 

-      for (j = 1; j <= nrules; j++)
+      for (r = 1; r < nrules + 1; r++)

        {
        {

-         if (rules[j].lhs == i)
+         item_number_t *rhsp;
+         if (rules[r].lhs->number == i)

            left_count++;
            left_count++;

-         for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-           if (*rule == i)
+         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+           if (item_number_as_symbol_number (*rhsp) == i)

              {
                right_count++;
                break;
              {
                right_count++;
                break;


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

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

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


@@ -441,11 +425,11 @@ print_grammar (FILE *out)
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on left:"));
 

-         for (j = 1; j <= nrules; j++)
+         for (r = 1; r < nrules + 1; r++)

            {
              END_TEST (65);
            {
              END_TEST (65);

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

            }
        }
 
            }
        }
 


@@ -455,13 +439,14 @@ print_grammar (FILE *out)
            sprintf (buffer + strlen (buffer), ",");
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on right:"));
            sprintf (buffer + strlen (buffer), ",");
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on right:"));

-         for (j = 1; j <= nrules; j++)
+         for (r = 1; r < nrules + 1; r++)

            {
            {

-             for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-               if (*rule == i)
+             item_number_t *rhsp;
+             for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+               if (item_number_as_symbol_number (*rhsp) == i)

                  {
                    END_TEST (65);
                  {
                    END_TEST (65);

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

                    break;
                  }
            }
                    break;
                  }
            }


@@ -474,37 +459,29 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
 void
 print_results (void)
 {

-  int i;
+  state_number_t 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);
-  obstack_free (&output_obstack, NULL);
-
-  if (size)
-    fputs ("\n\n", out);
-

   reduce_output (out);
   conflicts_output (out);
 
   print_grammar (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)
+  /* If the whole state item sets, not only the kernels, are wanted,
+     `closure' will be run, which needs memory allocation/deallocation.   */
+  if (report_flag & report_itemsets)

     new_closure (nritems);
   /* Storage for print_reductions.  */
     new_closure (nritems);
   /* Storage for print_reductions.  */

-  shiftset = XCALLOC (unsigned, tokensetsize);
-  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  shiftset =  bitset_create (ntokens, BITSET_FIXED);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);

   for (i = 0; i < nstates; i++)
     print_state (out, states[i]);
   for (i = 0; i < nstates; i++)
     print_state (out, states[i]);

-  free (shiftset);
-  free (lookaheadset);
-  if (trace_flag)
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);
+  if (report_flag & report_itemsets)

     free_closure ();
 
   xfclose (out);
     free_closure ();
 
   xfclose (out);