X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d4e7d3a1919c20a6dbf5eb4cfa62cb6228a0e48d..c0cac722f7e5d7498528a67a37477cdf9ed1745c:/src/print.c?ds=inline

diff --git a/src/print.c b/src/print.c
index cfc047f1..6fbe2c9a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -47,20 +47,20 @@ print_token (int extnum, int token)
 }
 #endif
 
-static inline const char *
-escape (const char *s)
-{
-  return quotearg_n_style (1, escape_quoting_style, s);
-}
+
+
+/*---------------------------------------.
+| *WIDTH := max (*WIDTH, strlen (STR)).  |
+`---------------------------------------*/
 
-/* Be cautious not to use twice the same slot in a single expression. */
-static inline const char *
-escape2 (const char *s)
+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;
 }
 
-
 /*--------------------------------.
 | Report information on a state.  |
 `--------------------------------*/
@@ -71,301 +71,358 @@ print_core (FILE *out, state_t *state)
   int i;
   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, snritems);
       sitems = itemset;
       snritems = nritemset;
     }
 
-  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_t *sp;
+      item_number_t *sp1;
+      int rule;
 
-	  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);
+      rule = item_number_as_rule_number (*sp);
 
-	  for (/* Nothing */; *sp >= 0; ++sp)
-	    fprintf (out, " %s", escape (symbols[*sp]->tag));
+      rule_lhs_print (&rules[rule], previous_lhs, out);
+      previous_lhs = rules[rule].lhs;
 
-	  /* Experimental feature: display the lookaheads. */
-	  if (trace_flag && state->nlookaheads)
-	    {
-	      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[rule].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 lookaheads?  */
+      if (report_flag & report_lookaheads)
+	state_rule_lookaheads_print (state, &rules[rule], out);
 
       fputc ('\n', out);
     }
 }
 
 
+/*----------------------------------------------------------------.
+| Report the shifts iff DISPLAY_SHIFTS_P or the gotos of STATE on |
+| OUT.                                                            |
+`----------------------------------------------------------------*/
+
 static void
-print_shifts (FILE *out, state_t *state)
+print_transitions (state_t *state, FILE *out, bool display_transitions_p)
 {
+  transitions_t *transitions = state->transitions;
+  size_t width = 0;
   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 lookaheads column.  */
+  for (i = 0; i < transitions->num; i++)
+    if (!TRANSITION_IS_DISABLED (transitions, i)
+	&& TRANSITION_IS_SHIFT (transitions, i) == display_transitions_p)
       {
-	int state1 = shiftp->shifts[i];
-	token_number_t symbol = states[state1]->accessing_symbol;
-	fprintf (out,
-		 _("    %-4s\tshift, and go to state %d\n"),
-		 escape (symbols[symbol]->tag), state1);
+	symbol_t *symbol = symbols[TRANSITION_SYMBOL (transitions, i)];
+	max_length (&width, symbol->tag);
       }
 
-  if (i > 0)
-    fputc ('\n', out);
+  /* Nothing to report. */
+  if (!width)
+    return;
+
+  fputc ('\n', out);
+  width += 2;
+
+  /* Report lookaheads and shifts.  */
+  for (i = 0; i < transitions->num; i++)
+    if (!TRANSITION_IS_DISABLED (transitions, i)
+	&& TRANSITION_IS_SHIFT (transitions, i) == display_transitions_p)
+      {
+	symbol_t *symbol = symbols[TRANSITION_SYMBOL (transitions, i)];
+	const char *tag = symbol->tag;
+	state_t *state1 = transitions->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"), state1->number);
+	else
+	  fprintf (out, _("go to state %d\n"), state1->number);
+      }
 }
 
 
+/*------------------------------------------------------------.
+| Report the explicit errors of STATE raised from %nonassoc.  |
+`------------------------------------------------------------*/
+
 static void
 print_errs (FILE *out, state_t *state)
 {
-  errs *errp = state->errs;
+  errs_t *errp = state->errs;
+  size_t width = 0;
   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));
+  /* Compute the width of the lookaheads column.  */
+  for (i = 0; i < errp->num; ++i)
+    if (errp->symbols[i])
+      max_length (&width, errp->symbols[i]->tag);
+
+  /* Nothing to report. */
+  if (!width)
+    return;
+
+  fputc ('\n', out);
+  width += 2;
 
-  if (i > 0)
-    fputc ('\n', out);
+  /* Report lookaheads and errors.  */
+  for (i = 0; i < errp->num; ++i)
+    if (errp->symbols[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);
+      }
 }
 
 
-static void
-print_gotos (FILE *out, state_t *state)
+/*----------------------------------------------------------.
+| Return the default rule of this STATE if it has one, NULL |
+| otherwise.                                                |
+`----------------------------------------------------------*/
+
+static rule_t *
+state_default_rule (state_t *state)
 {
+  reductions_t *redp = state->reductions;
+  rule_t *default_rule = NULL;
+  int cmax = 0;
   int i;
-  shifts *shiftp = state->shifts;
 
-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    /* Skip token shifts.  */;
+  /* No need for a lookahead.  */
+  if (state->consistent)
+    return redp->rules[0];
 
-  if (i < shiftp->nshifts)
+  /* 1. Each reduction is possibly masked by the lookaheads on which
+     we shift (S/R conflicts)...  */
+  bitset_zero (shiftset);
+  {
+    transitions_t *transitions = state->transitions;
+    FOR_EACH_SHIFT (transitions, i)
+      {
+	/* If this state has a shift for the error token, don't use a
+	     default rule.  */
+	if (TRANSITION_IS_ERROR (transitions, i))
+	  return NULL;
+	bitset_set (shiftset, TRANSITION_SYMBOL (transitions, 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->num; i++)
+      if (errp->symbols[i])
+	bitset_set (shiftset, errp->symbols[i]->number);
+  }
+
+  for (i = 0; i < redp->num; ++i)
     {
-      for (; i < shiftp->nshifts; i++)
-	if (!SHIFT_IS_DISABLED (shiftp, i))
-	  {
-	    int state1 = shiftp->shifts[i];
-	    token_number_t symbol = states[state1]->accessing_symbol;
-	    fprintf (out, _("    %-4s\tgo to state %d\n"),
-		     escape (symbols[symbol]->tag), state1);
-	  }
-
-      fputc ('\n', out);
-    }
-}
+      int count = 0;
 
-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;
+      /* How many non-masked lookaheads are there for this reduction?
+	 */
+      bitset_andn (lookaheadset, redp->lookaheads[i], shiftset);
+      count = bitset_count (lookaheadset);
 
-  if (redp->nreds == 0)
-    return;
+      if (count > cmax)
+	{
+	  cmax = count;
+	  default_rule = redp->rules[i];
+	}
 
-  if (state->consistent)
-    {
-      int rule = redp->rules[0];
-      token_number_t symbol = rules[rule].lhs->number;
-      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-	       rule - 1, escape (symbols[symbol]->tag));
-      return;
+      /* 3. And finally, each reduction is possibly masked by previous
+	 reductions (in R/R conflicts, we keep the first reductions).
+	 */
+      bitset_or (shiftset, shiftset, redp->lookaheads[i]);
     }
 
-  bitset_zero (shiftset);
+  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;
-	bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
-      }
 
-  for (i = 0; i < errp->nerrs; i++)
-    if (errp->errs[i])
-      bitset_set (shiftset, errp->errs[i]);
+/*--------------------------------------------------------------------.
+| Report a reduction of RULE on LOOKAHEADS (which can be `default').  |
+| If not ENABLED, the rule is masked by a shift or a reduce (S/R and  |
+| R/R conflicts).                                                     |
+`--------------------------------------------------------------------*/
 
-  if (state->nlookaheads == 1 && !nodefault)
-    {
-      rule_t *default_rule = LArule[state->lookaheadsp];
+static void
+print_reduction (FILE *out, size_t width,
+		 const char *lookahead,
+		 rule_t *rule, bool enabled)
+{
+  int j;
+  fprintf (out, "    %s", lookahead);
+  for (j = width - strlen (lookahead); j > 0; --j)
+    fputc (' ', out);
+  if (!enabled)
+    fputc ('[', out);
+  if (rule->number)
+    fprintf (out, _("reduce using rule %d (%s)"),
+	     rule->number, rule->lhs->tag);
+  else
+    fprintf (out, _("accept"));
+  if (!enabled)
+    fputc (']', out);
+  fputc ('\n', out);
+}
 
-      bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);
 
-      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));
+/*----------------------------------------------------.
+| Report on OUT the reduction actions of this STATE.  |
+`----------------------------------------------------*/
 
-      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;
+static void
+print_reductions (FILE *out, state_t *state)
+{
+  transitions_t *transitions = state->transitions;
+  reductions_t *redp = state->reductions;
+  rule_t *default_rule = NULL;
+  size_t width = 0;
+  int i, j;
 
-      if (!nodefault)
-	for (i = 0; i < state->nlookaheads; ++i)
-	  {
-	    int count = 0;
-	    int j;
+  if (redp->num == 0)
+    return;
 
-	    bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);
+  default_rule = state_default_rule (state);
 
-	    for (j = 0; j < ntokens; j++)
-	      if (bitset_test (lookaheadset, j))
-		count++;
+  bitset_zero (shiftset);
+  FOR_EACH_SHIFT (transitions, i)
+    bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));
 
-	    if (count > cmax)
-	      {
-		cmax = count;
-		default_LA = state->lookaheadsp + i;
-		default_rule = LArule[state->lookaheadsp + i];
-	      }
+  /* Compute the width of the lookaheads column.  */
+  if (default_rule)
+    width = strlen (_("$default"));
 
-	    bitset_or (shiftset, shiftset, lookaheadset);
-	  }
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+	int count = bitset_test (shiftset, i);
 
-      bitset_zero (shiftset);
+	for (j = 0; j < redp->num; ++j)
+	  if (bitset_test (redp->lookaheads[j], i))
+	    {
+	      if (count == 0)
+		{
+		  if (redp->rules[j] != default_rule)
+		    max_length (&width, symbols[i]->tag);
+		  count++;
+		}
+	      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 lookaheads (or $default) and reductions.  */
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+	int defaulted = 0;
+	int count = bitset_test (shiftset, i);
 
-      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 < redp->num; ++j)
+	  if (bitset_test (redp->lookaheads[j], i))
+	    {
+	      if (count == 0)
+		{
+		  if (redp->rules[j] != default_rule)
+		    print_reduction (out, width,
+				     symbols[i]->tag,
+				     redp->rules[j], TRUE);
+		  else
+		    defaulted = 1;
+		  count++;
+		}
+	      else
+		{
+		  if (defaulted)
+		    print_reduction (out, width,
+				     symbols[i]->tag,
+				     default_rule, TRUE);
+		  defaulted = 0;
+		  print_reduction (out, width,
+				   symbols[i]->tag,
+				   redp->rules[j], FALSE);
+		}
+	    }
+      }
+
+  if (default_rule)
+    print_reduction (out, width,
+		     _("$default"), default_rule, TRUE);
 }
 
 
+/*--------------------------------------------------------------.
+| 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)
 {
-  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 shifts.  */
+  print_transitions (state, out, TRUE);
   print_errs (out, state);
   print_reductions (out, state);
-  print_gotos (out, state);
+  /* Print gotos.  */
+  print_transitions (state, out, FALSE);
 }
 
+
+/*--------------------------------------.
+| Report all the data on STATE on OUT.  |
+`--------------------------------------*/
+
 static void
 print_state (FILE *out, state_t *state)
 {
-  fprintf (out, _("state %d"), state->number);
   fputs ("\n\n", out);
+  fprintf (out, _("state %d"), state->number);
+  fputc ('\n', out);
   print_core (out, state);
   print_actions (out, state);
-  fputs ("\n\n", out);
+  if ((report_flag & report_solved_conflicts)
+      && state->solved_conflicts)
+    fputs (state->solved_conflicts, out);
 }
 
 /*-----------------------------------------.
@@ -386,47 +443,33 @@ do {						\
 static void
 print_grammar (FILE *out)
 {
-  token_number_t i;
-  int j;
-  item_number_t *rule;
+  symbol_number_t i;
   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].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)
       {
+	const char *tag = symbols[token_translations[i]]->tag;
+	rule_number_t r;
+	item_number_t *rhsp;
+
 	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);
 
-	for (j = 1; j < nrules + 1; j++)
-	  for (rule = rules[j].rhs; *rule >= 0; rule++)
-	    if (item_number_as_token_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);
-		sprintf (buffer + strlen (buffer), " %d", j - 1);
+		sprintf (buffer + strlen (buffer), " %d", r);
 		break;
 	      }
 	fprintf (out, "%s\n", buffer);
@@ -438,13 +481,16 @@ print_grammar (FILE *out)
   for (i = ntokens; i < nsyms; i++)
     {
       int left_count = 0, right_count = 0;
+      rule_number_t 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_t *rhsp;
+	  if (rules[r].lhs->number == i)
 	    left_count++;
-	  for (rule = rules[j].rhs; *rule >= 0; rule++)
-	    if (item_number_as_token_number (*rule) == i)
+	  for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+	    if (item_number_as_symbol_number (*rhsp) == i)
 	      {
 		right_count++;
 		break;
@@ -452,8 +498,8 @@ print_grammar (FILE *out)
 	}
 
       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);
 
@@ -462,11 +508,11 @@ print_grammar (FILE *out)
 	  END_TEST (50);
 	  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)
+		sprintf (buffer + strlen (buffer), " %d", r);
 	    }
 	}
 
@@ -476,47 +522,41 @@ print_grammar (FILE *out)
 	    sprintf (buffer + strlen (buffer), ",");
 	  END_TEST (50);
 	  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_token_number (*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);
-		    sprintf (buffer + strlen (buffer), " %d", j - 1);
+		    sprintf (buffer + strlen (buffer), " %d", r);
 		    break;
 		  }
 	    }
 	}
       fprintf (out, "%s\n", buffer);
     }
-  fputs ("\n\n", out);
 }
 
 void
 print_results (void)
 {
-  size_t 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");
 
-  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);
+  grammar_rules_partial_print (out,
+			       _("Rules never reduced"), rule_never_reduced_p);
   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.  */
   shiftset =  bitset_create (ntokens, BITSET_FIXED);
@@ -525,7 +565,7 @@ print_results (void)
     print_state (out, states[i]);
   bitset_free (shiftset);
   bitset_free (lookaheadset);
-  if (trace_flag)
+  if (report_flag & report_itemsets)
     free_closure ();
 
   xfclose (out);