lr.default-reductions: rename "full" value to "most".

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index bcf71cc6deff48a7404f246e5b76c4370e503c45..7e9c58046c2b681d96e9fb619b2d0f0db143e123 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,43 +1,45 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2011 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
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    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.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program 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
    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, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

 #include "system.h"
 #include "system.h"

-#include "quotearg.h"
-#include "files.h"
-#include "symtab.h"
-#include "gram.h"
+
+#include <bitset.h>
+#include <quotearg.h>
+

 #include "LR0.h"
 #include "LR0.h"

-#include "lalr.h"
+#include "closure.h"

 #include "conflicts.h"
 #include "conflicts.h"

+#include "files.h"

 #include "getargs.h"
 #include "getargs.h"

-#include "state.h"
-#include "reader.h"
+#include "gram.h"
+#include "lalr.h"
+#include "muscle-tab.h"

 #include "print.h"
 #include "print.h"

+#include "reader.h"

 #include "reduce.h"
 #include "reduce.h"

-#include "closure.h"
-#include "bitset.h"
+#include "state.h"
+#include "symtab.h"
+#include "tables.h"

 
 

-static bitset shiftset;
-static bitset lookaheadset;
+static bitset no_reduce_set;

 
 #if 0
 static void
 
 #if 0
 static void


@@ -47,327 +49,337 @@ 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);
-}
+\f

 
 

-/* Be cautious not to use twice the same slot in a single expression. */
-static inline const char *
-escape2 (const char *s)
+/*---------------------------------------.
+| *WIDTH := max (*WIDTH, strlen (STR)).  |
+`---------------------------------------*/
+
+static void
+max_length (size_t *width, const char *str)

 {
 {

-  return quotearg_n_style (2, escape_quoting_style, s);
+  size_t len = strlen (str);
+  if (len > *width)
+    *width = len;

 }
 
 }
 

-\f

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

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

 {
 {

-  int i;
-  item_number_t *sitems = state->items;
-  int snritems   = state->nitems;
+  size_t i;
+  item_number *sitems = s->items;
+  size_t snritems = s->nitems;
+  symbol *previous_lhs = NULL;

 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
       sitems = itemset;
 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
       sitems = itemset;

-      snritems = nritemset;
+      snritems = nitemset;

     }
 
     }
 

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

 
 

-         sp1 = sp = ritem + sitems[i];
+  fputc ('\n', out);

 
 

-         while (*sp >= 0)
-           sp++;
+  for (i = 0; i < snritems; i++)
+    {
+      item_number *sp;
+      item_number *sp1;
+      rule_number r;

 
 

-         rule = -(*sp);
-         fprintf (out, "    %s  ->  ", escape (rules[rule].lhs->tag));
+      sp1 = sp = ritem + sitems[i];

 
 

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

 
 

-         fputc ('.', out);
+      r = item_number_as_rule_number (*sp);

 
 

-         for (/* Nothing */; *sp >= 0; ++sp)
-           fprintf (out, " %s", escape (symbols[*sp]->tag));
+      rule_lhs_print (&rules[r], previous_lhs, out);
+      previous_lhs = rules[r].lhs;

 
 

-         /* Display the lookaheads?  */
-         if (report_flag & report_lookaheads)
-           {
-             int j, k;
-             int nlookaheads = 0;
-             /* Look for lookaheads corresponding to this rule. */
-             for (j = 0; j < state->nlookaheads; ++j)
-               for (k = 0; k < ntokens; ++k)
-                 if (bitset_test (LA[state->lookaheadsp + j], k)
-                     && LArule[state->lookaheadsp + j]->number == rule)
-                   nlookaheads++;
-             if (nlookaheads)
-               {
-                 fprintf (out, "  [");
-                 for (j = 0; j < state->nlookaheads; ++j)
-                   for (k = 0; k < ntokens; ++k)
-                     if (bitset_test (LA[state->lookaheadsp + j], k)
-                         && LArule[state->lookaheadsp + j]->number == rule)
-                       fprintf (out, "%s%s",
-                                quotearg_style (escape_quoting_style,
-                                                symbols[k]->tag),
-                                --nlookaheads ? ", " : "");
-                 fprintf (out, "]");
-               }
-           }
+      for (sp = rules[r].rhs; sp < sp1; sp++)
+       fprintf (out, " %s", symbols[*sp]->tag);
+      fputs (" .", out);
+      for (/* Nothing */; *sp >= 0; ++sp)
+       fprintf (out, " %s", symbols[*sp]->tag);

 
 

-         fprintf (out, _("   (rule %d)"), rule - 1);
-         fputc ('\n', out);
-       }
+      /* Display the lookahead tokens?  */
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
+       state_rule_lookahead_tokens_print (s, &rules[r], out);

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

+/*------------------------------------------------------------.
+| Report the shifts iff DISPLAY_SHIFTS_P or the gotos of S on |
+| OUT.                                                        |
+`------------------------------------------------------------*/
+

 static void
 static void

-print_shifts (FILE *out, state_t *state)
+print_transitions (state *s, FILE *out, bool display_transitions_p)

 {
 {

+  transitions *trans = s->transitions;
+  size_t width = 0;

   int i;
   int i;

-  shifts *shiftp = state->shifts;

 
 

-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
+  /* Compute the width of the lookahead token column.  */
+  for (i = 0; i < trans->num; i++)
+    if (!TRANSITION_IS_DISABLED (trans, i)
+       && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)

       {
       {

-       int state1 = shiftp->shifts[i];
-       symbol_number_t symbol = states[state1]->accessing_symbol;
-       fprintf (out,
-                _("    %-4s\tshift, and go to state %d\n"),
-                escape (symbols[symbol]->tag), state1);
+       symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
+       max_length (&width, sym->tag);

       }
 
       }
 

-  if (i > 0)
-    fputc ('\n', out);
-}
-
-
-static void
-print_errs (FILE *out, state_t *state)
-{
-  errs *errp = state->errs;
-  int i;
+  /* Nothing to report. */
+  if (!width)
+    return;

 
 

-  for (i = 0; i < errp->nerrs; ++i)
-    if (errp->errs[i])
-      fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-              escape (symbols[errp->errs[i]]->tag));
+  fputc ('\n', out);
+  width += 2;

 
 

-  if (i > 0)
-    fputc ('\n', out);
+  /* Report lookahead tokens and shifts.  */
+  for (i = 0; i < trans->num; i++)
+    if (!TRANSITION_IS_DISABLED (trans, i)
+       && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)
+      {
+       symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
+       const char *tag = sym->tag;
+       state *s1 = trans->states[i];
+       int j;
+
+       fprintf (out, "    %s", tag);
+       for (j = width - strlen (tag); j > 0; --j)
+         fputc (' ', out);
+       if (display_transitions_p)
+         fprintf (out, _("shift, and go to state %d\n"), s1->number);
+       else
+         fprintf (out, _("go to state %d\n"), s1->number);
+      }

 }
 
 
 }
 
 

-static void
-print_gotos (FILE *out, state_t *state)
-{
-  int i;
-  shifts *shiftp = state->shifts;
-
-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    /* Skip token shifts.  */;
-
-  if (i < shiftp->nshifts)
-    {
-      for (; i < shiftp->nshifts; i++)
-       if (!SHIFT_IS_DISABLED (shiftp, i))
-         {
-           int state1 = shiftp->shifts[i];
-           symbol_number_t symbol = states[state1]->accessing_symbol;
-           fprintf (out, _("    %-4s\tgo to state %d\n"),
-                    escape (symbols[symbol]->tag), state1);
-         }
-
-      fputc ('\n', out);
-    }
-}
+/*--------------------------------------------------------.
+| Report the explicit errors of S raised from %nonassoc.  |
+`--------------------------------------------------------*/

 
 static void
 
 static void

-print_reductions (FILE *out, state_t *state)
+print_errs (FILE *out, state *s)

 {
 {

+  errs *errp = s->errs;
+  size_t width = 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;
+  /* Compute the width of the lookahead token column.  */
+  for (i = 0; i < errp->num; ++i)
+    if (errp->symbols[i])
+      max_length (&width, errp->symbols[i]->tag);

 
 

-  if (state->consistent)
-    {
-      int rule = redp->rules[0];
-      symbol_number_t symbol = rules[rule].lhs->number;
-      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-              rule - 1, escape (symbols[symbol]->tag));
-      return;
-    }
+  /* Nothing to report. */
+  if (!width)
+    return;

 
 

-  bitset_zero (shiftset);
+  fputc ('\n', out);
+  width += 2;

 
 

-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
+  /* Report lookahead tokens and errors.  */
+  for (i = 0; i < errp->num; ++i)
+    if (errp->symbols[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;
-       bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
+       const char *tag = errp->symbols[i]->tag;
+       int j;
+       fprintf (out, "    %s", tag);
+       for (j = width - strlen (tag); j > 0; --j)
+         fputc (' ', out);
+       fputs (_("error (nonassociative)\n"), out);

       }
       }

+}

 
 

-  for (i = 0; i < errp->nerrs; i++)
-    if (errp->errs[i])
-      bitset_set (shiftset, errp->errs[i]);

 
 

-  if (state->nlookaheads == 1 && !nodefault)
-    {
-      rule_t *default_rule = LArule[state->lookaheadsp];
+/*-------------------------------------------------------------------------.
+| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be `default').  |
+| If not ENABLED, the rule is masked by a shift or a reduce (S/R and       |
+| R/R conflicts).                                                          |
+`-------------------------------------------------------------------------*/

 
 

-      bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);
+static void
+print_reduction (FILE *out, size_t width,
+                const char *lookahead_token,
+                rule *r, bool enabled)
+{
+  int j;
+  fprintf (out, "    %s", lookahead_token);
+  for (j = width - strlen (lookahead_token); j > 0; --j)
+    fputc (' ', out);
+  if (!enabled)
+    fputc ('[', out);
+  if (r->number)
+    fprintf (out, _("reduce using rule %d (%s)"), r->number, r->lhs->tag);
+  else
+    fprintf (out, _("accept"));
+  if (!enabled)
+    fputc (']', out);
+  fputc ('\n', out);
+}

 
 

-      for (i = 0; i < ntokens; i++)
-       if (bitset_test (lookaheadset, i))
-         fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
-                  escape (symbols[i]->tag),
-                  default_rule->number - 1,
-                  escape2 (default_rule->lhs->tag));

 
 

-      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-              default_rule->number - 1,
-              escape (default_rule->lhs->tag));
-    }
-  else if (state->nlookaheads >= 1)
-    {
-      int cmax = 0;
-      int default_LA = -1;
-      rule_t *default_rule = NULL;
+/*-------------------------------------------.
+| Report on OUT the reduction actions of S.  |
+`-------------------------------------------*/

 
 

-      if (!nodefault)
-       for (i = 0; i < state->nlookaheads; ++i)
-         {
-           int count = 0;
-           int j;
+static void
+print_reductions (FILE *out, state *s)
+{
+  transitions *trans = s->transitions;
+  reductions *reds = s->reductions;
+  rule *default_reduction = NULL;
+  size_t width = 0;
+  int i, j;
+  bool default_reduction_only = true;
+
+  if (reds->num == 0)
+    return;

 
 

-           bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);
+  if (yydefact[s->number] != 0)
+    default_reduction = &rules[yydefact[s->number] - 1];

 
 

-           for (j = 0; j < ntokens; j++)
-             if (bitset_test (lookaheadset, j))
-               count++;
+  bitset_zero (no_reduce_set);
+  FOR_EACH_SHIFT (trans, i)
+    bitset_set (no_reduce_set, TRANSITION_SYMBOL (trans, i));
+  for (i = 0; i < s->errs->num; ++i)
+    if (s->errs->symbols[i])
+      bitset_set (no_reduce_set, s->errs->symbols[i]->number);

 
 

-           if (count > cmax)
-             {
-               cmax = count;
-               default_LA = state->lookaheadsp + i;
-               default_rule = LArule[state->lookaheadsp + i];
-             }
+  /* Compute the width of the lookahead token column.  */
+  if (default_reduction)
+    width = strlen (_("$default"));

 
 

-           bitset_or (shiftset, shiftset, lookaheadset);
-         }
+  if (reds->lookahead_tokens)
+    for (i = 0; i < ntokens; i++)
+      {
+       bool count = bitset_test (no_reduce_set, i);

 
 

-      bitset_zero (shiftset);
+       for (j = 0; j < reds->num; ++j)
+         if (bitset_test (reds->lookahead_tokens[j], i))
+           {
+             if (! count)
+               {
+                 if (reds->rules[j] != default_reduction)
+                   max_length (&width, symbols[i]->tag);
+                 count = true;
+               }
+             else
+               {
+                 max_length (&width, symbols[i]->tag);
+               }
+           }
+      }

 
 

-      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));
+  /* Nothing to report. */
+  if (!width)
+    return;

 
 

-      for (i = 0; i < ntokens; i++)
-       {
-         int j;
-         int defaulted = 0;
-         int count = bitset_test (shiftset, i);
+  fputc ('\n', out);
+  width += 2;

 
 

-         for (j = 0; j < state->nlookaheads; ++j)
-           if (bitset_test (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),
-                              LArule[state->lookaheadsp + j]->number - 1,
-                              escape2 (LArule[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),
-                              LArule[default_LA]->number - 1,
-                              escape2 (LArule[default_LA]->lhs->tag));
-                   defaulted = 0;
-                   fprintf (out,
-                            _("    %-4s\t[reduce using rule %d (%s)]\n"),
-                            escape (symbols[i]->tag),
-                            LArule[state->lookaheadsp + j]->number - 1,
-                            escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
-                 }
-             }
-       }
+  /* Report lookahead tokens (or $default) and reductions.  */
+  if (reds->lookahead_tokens)
+    for (i = 0; i < ntokens; i++)
+      {
+       bool defaulted = false;
+       bool count = bitset_test (no_reduce_set, i);
+        if (count)
+          default_reduction_only = false;

 
 

-      if (default_LA >= 0)
-       fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
-                default_rule->number - 1,
-                escape (default_rule->lhs->tag));
+       for (j = 0; j < reds->num; ++j)
+         if (bitset_test (reds->lookahead_tokens[j], i))
+           {
+             if (! count)
+               {
+                 if (reds->rules[j] != default_reduction)
+                    {
+                      default_reduction_only = false;
+                      print_reduction (out, width,
+                                       symbols[i]->tag,
+                                       reds->rules[j], true);
+                    }
+                 else
+                   defaulted = true;
+                 count = true;
+               }
+             else
+               {
+                  default_reduction_only = false;
+                 if (defaulted)
+                   print_reduction (out, width,
+                                    symbols[i]->tag,
+                                    default_reduction, true);
+                 defaulted = false;
+                 print_reduction (out, width,
+                                  symbols[i]->tag,
+                                  reds->rules[j], false);
+               }
+           }
+      }
+
+  if (default_reduction)
+    {
+      char *default_reductions =
+        muscle_percent_define_get ("lr.default-reductions");
+      print_reduction (out, width, _("$default"), default_reduction, true);
+      aver (0 == strcmp (default_reductions, "most")
+            || (0 == strcmp (default_reductions, "consistent")
+                && default_reduction_only)
+            || (reds->num == 1 && reds->rules[0]->number == 0));
+      free (default_reductions);

     }
 }
 
 
     }
 }
 
 

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

 static void
 static void

-print_actions (FILE *out, state_t *state)
+print_actions (FILE *out, state *s)

 {
 {

-  reductions *redp = state->reductions;
-  shifts *shiftp = state->shifts;
+  /* Print shifts.  */
+  print_transitions (s, out, true);
+  print_errs (out, s);
+  print_reductions (out, s);
+  /* Print gotos.  */
+  print_transitions (s, out, false);
+}

 
 

-  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);
-}
+/*----------------------------------.
+| Report all the data on S on OUT.  |
+`----------------------------------*/

 
 static void
 
 static void

-print_state (FILE *out, state_t *state)
+print_state (FILE *out, state *s)

 {
 {

-  fprintf (out, _("state %d"), state->number);
-  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);
   fputs ("\n\n", out);

+  fprintf (out, _("state %d"), s->number);
+  fputc ('\n', out);
+  print_core (out, s);
+  print_actions (out, s);
+  if ((report_flag & report_solved_conflicts) && s->solved_conflicts)
+    {
+      fputc ('\n', out);
+      fputs (s->solved_conflicts, out);
+    }

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


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

-  symbol_number_t i;
-  int j;
-  item_number_t *rule;
+  symbol_number 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 (j = 1; j < nrules + 1; j++)
-    {
-      fprintf (out, "  %3d %3d %s ->",
-              j - 1, rules[j].location.first_line,
-              escape (rules[j].lhs->tag));
-      rule = rules[j].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"));
   for (i = 0; i < max_user_token_number + 1; i++)
     if (token_translations[i] != undeftoken->number)
       {
 
   /* 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 + 1; i++)
     if (token_translations[i] != undeftoken->number)
       {

+       const char *tag = symbols[token_translations[i]]->tag;
+       rule_number r;
+       item_number *rhsp;
+

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

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

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

-       for (j = 1; j < nrules + 1; j++)
-         for (rule = rules[j].rhs; *rule >= 0; rule++)
-           if (item_number_as_symbol_number (*rule) == token_translations[i])
+       for (r = 0; r < nrules; 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);

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


@@ -441,13 +438,16 @@ print_grammar (FILE *out)
   for (i = ntokens; i < nsyms; i++)
     {
       int left_count = 0, right_count = 0;
   for (i = ntokens; i < nsyms; i++)
     {
       int left_count = 0, right_count = 0;

+      rule_number r;
+      const char *tag = symbols[i]->tag;

 
 

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

        {
        {

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

            left_count++;
            left_count++;

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

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


@@ -455,21 +455,23 @@ 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);
 
       if (left_count > 0)
        {
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
 
       if (left_count > 0)
        {

-         END_TEST (50);
+         END_TEST (65);

          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          sprintf (buffer + strlen (buffer), _(" on left:"));
 

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

            {
            {

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

            }
        }
 
            }
        }
 


@@ -477,34 +479,37 @@ print_grammar (FILE *out)
        {
          if (left_count > 0)
            sprintf (buffer + strlen (buffer), ",");
        {
          if (left_count > 0)
            sprintf (buffer + strlen (buffer), ",");

-         END_TEST (50);
+         END_TEST (65);

          sprintf (buffer + strlen (buffer), _(" on right:"));
          sprintf (buffer + strlen (buffer), _(" on right:"));

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

            {
            {

-             for (rule = rules[j].rhs; *rule >= 0; rule++)
-               if (item_number_as_symbol_number (*rule) == i)
+             item_number *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);

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

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

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

-  size_t i;
+  state_number 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");
 
   reduce_output (out);
 
   /* 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");
 
   reduce_output (out);

+  grammar_rules_partial_print (out,
+                              _("Rules useless in parser due to conflicts"),
+                                 rule_useless_in_parser_p);

   conflicts_output (out);
 
   print_grammar (out);
   conflicts_output (out);
 
   print_grammar (out);


@@ -514,12 +519,10 @@ print_results (void)
   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */

-  shiftset =  bitset_create (ntokens, BITSET_FIXED);
-  lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+  no_reduce_set =  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]);

-  bitset_free (shiftset);
-  bitset_free (lookaheadset);
+  bitset_free (no_reduce_set);

   if (report_flag & report_itemsets)
     free_closure ();
 
   if (report_flag & report_itemsets)
     free_closure ();