X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bc933ef16d171af4f27616649c7a99c77e9b75fe..b25d88f6d2e2f4b59927aacecdc0a9e44a34b5d9:/src/print.c

diff --git a/src/print.c b/src/print.c
index 9ed6919e..ae2ead9a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -48,6 +48,19 @@ print_token (int extnum, int token)
 #endif
 
 
+
+/*---------------------------------------.
+| *WIDTH := max (*WIDTH, strlen (STR)).  |
+`---------------------------------------*/
+
+static void
+max_length (size_t *width, const char *str)
+{
+  size_t len = strlen (str);
+  if (len > *width)
+    *width = len;
+}
+
 /*--------------------------------.
 | Report information on a state.  |
 `--------------------------------*/
@@ -58,6 +71,7 @@ print_core (FILE *out, state_t *state)
   int i;
   item_number_t *sitems = state->items;
   int snritems   = state->nitems;
+  symbol_t *previous_lhs = NULL;
 
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
@@ -67,102 +81,125 @@ print_core (FILE *out, state_t *state)
       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  ->  ", symbol_tag_get (rules[rule].lhs));
+      sp1 = sp = ritem + sitems[i];
 
-	  for (sp = rules[rule].rhs; sp < sp1; sp++)
-	    fprintf (out, "%s ", symbol_tag_get (symbols[*sp]));
+      while (*sp >= 0)
+	sp++;
 
-	  fputc ('.', out);
+      rule = item_number_as_rule_number (*sp);
 
-	  for (/* Nothing */; *sp >= 0; ++sp)
-	    fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
+      rule_lhs_print (&rules[rule], previous_lhs, out);
+      previous_lhs = rules[rule].lhs;
 
-	  /* Display the lookaheads?  */
-	  if (report_flag & report_lookaheads)
-	    state_rule_lookaheads_print (state, &rules[rule], 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_t *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)
       {
-	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"),
-		 symbol_tag_get (symbols[symbol]), 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_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"),
-	       symbol_tag_get (symbols[errp->errs[i]]));
-
-  if (i > 0)
-    fputc ('\n', out);
-}
-
-
-static void
-print_gotos (FILE *out, state_t *state)
-{
-  int i;
-  shifts_t *shiftp = state->shifts;
+  /* 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);
 
-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    /* Skip token shifts.  */;
+  /* Nothing to report. */
+  if (!width)
+    return;
 
-  if (i < shiftp->nshifts)
-    {
-      for (; i < shiftp->nshifts; i++)
-	if (!SHIFT_IS_DISABLED (shiftp, i))
-	  {
-	    state_number_t state1 = shiftp->shifts[i];
-	    symbol_number_t symbol = states[state1]->accessing_symbol;
-	    fprintf (out, _("    %-4s\tgo to state %d\n"),
-		     symbol_tag_get (symbols[symbol]), state1);
-	  }
+  fputc ('\n', out);
+  width += 2;
 
-      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);
+      }
 }
 
 
@@ -172,7 +209,7 @@ print_gotos (FILE *out, state_t *state)
 `----------------------------------------------------------*/
 
 static rule_t *
-state_default_rule_compute (state_t *state)
+state_default_rule (state_t *state)
 {
   reductions_t *redp = state->reductions;
   rule_t *default_rule = NULL;
@@ -181,58 +218,85 @@ state_default_rule_compute (state_t *state)
 
   /* No need for a lookahead.  */
   if (state->consistent)
-    return &rules[redp->rules[0]];
+    return 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
+    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 (SHIFT_IS_ERROR (shiftp, i))
-	    return NULL;
-	  bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
-	}
+	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->nerrs; i++)
-      if (errp->errs[i])
-	bitset_set (shiftset, errp->errs[i]);
+    for (i = 0; i < errp->num; i++)
+      if (errp->symbols[i])
+	bitset_set (shiftset, errp->symbols[i]->number);
   }
 
-  for (i = 0; i < state->nlookaheads; ++i)
+  for (i = 0; i < redp->num; ++i)
     {
       int count = 0;
 
       /* How many non-masked lookaheads are there for this reduction?
 	 */
-      bitset_andn (lookaheadset, state->lookaheads[i], shiftset);
+      bitset_andn (lookaheadset, redp->lookaheads[i], shiftset);
       count = bitset_count (lookaheadset);
 
       if (count > cmax)
 	{
 	  cmax = count;
-	  default_rule = state->lookaheads_rule[i];
+	  default_rule = redp->rules[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]);
+      bitset_or (shiftset, shiftset, redp->lookaheads[i]);
     }
 
   return default_rule;
 }
 
 
+/*--------------------------------------------------------------------.
+| 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).                                                     |
+`--------------------------------------------------------------------*/
+
+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);
+}
+
+
 /*----------------------------------------------------.
 | Report on OUT the reduction actions of this STATE.  |
 `----------------------------------------------------*/
@@ -240,65 +304,90 @@ state_default_rule_compute (state_t *state)
 static void
 print_reductions (FILE *out, state_t *state)
 {
-  int i;
-  shifts_t *shiftp = state->shifts;
+  transitions_t *transitions = state->transitions;
   reductions_t *redp = state->reductions;
   rule_t *default_rule = NULL;
+  size_t width = 0;
+  int i, j;
 
-  if (redp->nreds == 0)
+  if (redp->num == 0)
     return;
 
-  default_rule = state_default_rule_compute (state);
+  default_rule = state_default_rule (state);
 
   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 j;
-      int defaulted = 0;
-      int count = bitset_test (shiftset, i);
-
-      for (j = 0; j < state->nlookaheads; ++j)
-	if (bitset_test (state->lookaheads[j], i))
-	  {
-	    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++;
-	      }
-	    else
-	      {
-		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_EACH_SHIFT (transitions, i)
+    bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));
 
+  /* Compute the width of the lookaheads column.  */
   if (default_rule)
-    fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
-	     default_rule->number - 1,
-	     symbol_tag_get (default_rule->lhs));
+    width = strlen (_("$default"));
+
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+	int count = bitset_test (shiftset, i);
+
+	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);
+		}
+	    }
+      }
+
+  /* Nothing to report. */
+  if (!width)
+    return;
+
   fputc ('\n', out);
+  width += 2;
+
+  /* Report lookaheads (or $default) and reductions.  */
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+	int defaulted = 0;
+	int count = bitset_test (shiftset, i);
+
+	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);
 }
 
 
@@ -310,36 +399,33 @@ print_reductions (FILE *out, state_t *state)
 static void
 print_actions (FILE *out, state_t *state)
 {
-  reductions_t *redp = state->reductions;
-  shifts_t *shiftp = state->shifts;
-
-  if (shiftp->nshifts == 0 && redp->nreds == 0)
-    {
-      if (state->number == final_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);
   if ((report_flag & report_solved_conflicts)
       && state->solved_conflicts)
-    fputs (state->solved_conflicts, out);
-  fputs ("\n\n", out);
+    {
+      fputc ('\n', out);
+      fputs (state->solved_conflicts, out);
+    }
 }
 
 /*-----------------------------------------.
@@ -371,7 +457,7 @@ print_grammar (FILE *out)
   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]]);
+	const char *tag = symbols[token_translations[i]]->tag;
 	rule_number_t r;
 	item_number_t *rhsp;
 
@@ -381,12 +467,12 @@ print_grammar (FILE *out)
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
-	for (r = 1; r < nrules + 1; r++)
+	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", r - 1);
+		sprintf (buffer + strlen (buffer), " %d", r);
 		break;
 	      }
 	fprintf (out, "%s\n", buffer);
@@ -399,9 +485,9 @@ print_grammar (FILE *out)
     {
       int left_count = 0, right_count = 0;
       rule_number_t r;
-      const char *tag = symbol_tag_get (symbols[i]);
+      const char *tag = symbols[i]->tag;
 
-      for (r = 1; r < nrules + 1; r++)
+      for (r = 0; r < nrules; r++)
 	{
 	  item_number_t *rhsp;
 	  if (rules[r].lhs->number == i)
@@ -425,11 +511,11 @@ print_grammar (FILE *out)
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on left:"));
 
-	  for (r = 1; r < nrules + 1; r++)
+	  for (r = 0; r < nrules; r++)
 	    {
 	      END_TEST (65);
 	      if (rules[r].lhs->number == i)
-		sprintf (buffer + strlen (buffer), " %d", r - 1);
+		sprintf (buffer + strlen (buffer), " %d", r);
 	    }
 	}
 
@@ -439,21 +525,20 @@ print_grammar (FILE *out)
 	    sprintf (buffer + strlen (buffer), ",");
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on right:"));
-	  for (r = 1; r < nrules + 1; r++)
+	  for (r = 0; r < nrules; r++)
 	    {
 	      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", r - 1);
+		    sprintf (buffer + strlen (buffer), " %d", r);
 		    break;
 		  }
 	    }
 	}
       fprintf (out, "%s\n", buffer);
     }
-  fputs ("\n\n", out);
 }
 
 void
@@ -466,6 +551,8 @@ print_results (void)
   FILE *out = xfopen (spec_verbose_file, "w");
 
   reduce_output (out);
+  grammar_rules_partial_print (out,
+			       _("Rules never reduced"), rule_never_reduced_p);
   conflicts_output (out);
 
   print_grammar (out);