X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b29b2ed5600cd819f4237b7b050288f6e19d102d..ce4ccb4b11bb3d19681055cc2b732493603d3508:/src/print.c?ds=sidebyside

diff --git a/src/print.c b/src/print.c
index 6a302962..76e5f740 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,6 @@
 /* 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.
 
@@ -20,7 +21,9 @@
 
 
 #include "system.h"
+#include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -30,6 +33,11 @@
 #include "reader.h"
 #include "print.h"
 #include "reduce.h"
+#include "closure.h"
+#include "bitset.h"
+
+static bitset shiftset;
+static bitset lookaheadset;
 
 #if 0
 static void
@@ -45,147 +53,293 @@ print_token (int extnum, int token)
 `--------------------------------*/
 
 static void
-print_core (FILE *out, int state)
+print_core (FILE *out, state_t *state)
 {
   int i;
-  core *statep = state_table[state].state;
+  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)
+    {
+      closure (sitems, snritems);
+      sitems = itemset;
+      snritems = nritemset;
+    }
 
-  if (!statep->nitems)
+  if (!snritems)
     return;
 
-  for (i = 0; i < statep->nitems; i++)
+  for (i = 0; i < snritems; i++)
     {
-      short *sp;
-      short *sp1;
+      item_number_t *sp;
+      item_number_t *sp1;
       int rule;
 
-      sp1 = sp = ritem + statep->items[i];
+      sp1 = sp = ritem + sitems[i];
 
-      while (*sp > 0)
+      while (*sp >= 0)
 	sp++;
 
       rule = -(*sp);
-      fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
 
-      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-	fprintf (out, "%s ", tags[*sp]);
+      rule_lhs_print (&rules[rule], previous_lhs, out);
+      previous_lhs = rules[rule].lhs;
 
-      fputc ('.', out);
+      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]));
 
-      for (/* Nothing */; *sp > 0; ++sp)
-	fprintf (out, " %s", tags[*sp]);
+      /* Display the lookaheads?  */
+      if (report_flag & report_lookaheads)
+	state_rule_lookaheads_print (state, &rules[rule], out);
 
-      fprintf (out, _("   (rule %d)"), rule);
       fputc ('\n', out);
     }
 
   fputc ('\n', out);
 }
 
+
+static void
+print_shifts (FILE *out, state_t *state)
+{
+  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))
+      {
+	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);
+      }
+
+  if (i > 0)
+    fputc ('\n', out);
+}
+
+
+static void
+print_errs (FILE *out, state_t *state)
+{
+  errs_t *errp = state->errs;
+  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_actions (FILE *out, int state)
+print_gotos (FILE *out, state_t *state)
 {
   int i;
-  int k;
+  shifts_t *shiftp = state->shifts;
 
-  shifts   *shiftp = state_table[state].shift_table;
-  reductions *redp = state_table[state].reduction_table;
-  errs       *errp = err_table[state];
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    /* Skip token shifts.  */;
 
-  if (!shiftp && !redp)
+  if (i < shiftp->nshifts)
     {
-      if (final_state == state)
-	fprintf (out, _("    $default\taccept\n"));
-      else
-	fprintf (out, _("    NO ACTIONS\n"));
-      return;
+      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);
     }
+}
 
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
 
-      for (i = 0; i < k; i++)
+/*----------------------------------------------------------.
+| 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;
+
+  /* No need for a lookahead.  */
+  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))
 	{
-	  int symbol;
-	  int state1 = shiftp->shifts[i];
-	  if (!state1)
-	    continue;
-	  symbol = state_table[state1].accessing_symbol;
-	  /* The following line used to be turned off.  */
-	  if (ISVAR (symbol))
-	    break;
-	  if (symbol == 0)	/* I.e. strcmp(tags[symbol],"$")==0 */
-	    fprintf (out,
-		     _("    $   \tgo to state %d\n"), state1);
-	  else
-	    fprintf (out,
-		     _("    %-4s\tshift, and go to state %d\n"),
-		     tags[symbol], state1);
+	  /* 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 (i > 0)
-	fputc ('\n', out);
-    }
-  else
+  }
+
+  /* 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)
     {
-      i = 0;
-      k = 0;
-    }
+      int count = 0;
 
-  if (errp)
-    {
-      int j;
-      for (j = 0; j < errp->nerrs; j++)
+      /* How many non-masked lookaheads are there for this reduction?
+	 */
+      bitset_andn (lookaheadset, state->lookaheads[i], shiftset);
+      count = bitset_count (lookaheadset);
+
+      if (count > cmax)
 	{
-	  int symbol = errp->errs[j];
-	  if (!symbol)
-	    continue;
-	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-		   tags[symbol]);
+	  cmax = count;
+	  default_rule = state->lookaheads_rule[i];
 	}
 
-      if (j > 0)
-	fputc ('\n', out);
+      /* 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]);
     }
 
-  if (state_table[state].consistent && redp)
-    {
-      int rule = redp->rules[0];
-      int symbol = rule_table[rule].lhs;
-      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-	       rule, tags[symbol]);
-    }
-  else if (redp)
+  return default_rule;
+}
+
+
+/*----------------------------------------------------.
+| Report on OUT the reduction actions of this STATE.  |
+`----------------------------------------------------*/
+
+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;
+
+  if (redp->nreds == 0)
+    return;
+
+  default_rule = state_default_rule_compute (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++)
     {
-      print_reductions (out, state);
+      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));
+	      }
+	  }
     }
 
-  if (i < k)
-    {
-      for (; i < k; i++)
-	{
-	  int symbol;
-	  int state1 = shiftp->shifts[i];
-	  if (!state1)
-	    continue;
-	  symbol = state_table[state1].accessing_symbol;
-	  fprintf (out, _("    %-4s\tgo to state %d\n"),
-		   tags[symbol], state1);
-	}
+  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);
+}
 
-      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)
+{
+  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_errs (out, state);
+  print_reductions (out, state);
+  print_gotos (out, state);
 }
 
+
 static void
-print_state (FILE *out, int state)
+print_state (FILE *out, state_t *state)
 {
-  fputs ("\n\n", out);
-  fprintf (out, _("state %d"), state);
+  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);
 }
 
 /*-----------------------------------------.
@@ -206,65 +360,54 @@ do {						\
 static void
 print_grammar (FILE *out)
 {
-  int i, j;
-  short *rule;
+  symbol_number_t i;
   char buffer[90];
   int column = 0;
 
-  /* rule # : LHS -> RHS */
-  fprintf (out, "\n%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 (rule_table[i].lhs >= 0)
-      {
-	fprintf (out, _("  %3d %3d %s ->"),
-		 i, rule_table[i].line, tags[rule_table[i].lhs]);
-	rule = &ritem[rule_table[i].rhs];
-	if (*rule > 0)
-	  while (*rule > 0)
-	    fprintf (out, " %s", tags[*rule++]);
-	else
-	  fprintf (out, " /* %s */", _("empty"));
-	fputc ('\n', out);
-      }
+  grammar_rules_print (out);
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
-  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
-  fprintf (out, "%s (-1)\n", tags[0]);
-
-  for (i = 0; i <= max_user_token_number; i++)
-    if (token_translations[i] != 2)
+  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 = symbol_tag_get (symbols[token_translations[i]]);
+	rule_number_t r;
+	item_number_t *rhsp;
+
 	buffer[0] = 0;
-	column = strlen (tags[token_translations[i]]);
-	fputs (tags[token_translations[i]], out);
+	column = strlen (tag);
+	fputs (tag, out);
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
-	for (j = 1; j <= nrules; j++)
-	  for (rule = &ritem[rule_table[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);
-		sprintf (buffer + strlen (buffer), " %d", j);
+		sprintf (buffer + strlen (buffer), " %d", r - 1);
 		break;
 	      }
 	fprintf (out, "%s\n", buffer);
       }
+  fputs ("\n\n", out);
+
 
-  fprintf (out, "\n%s\n\n",
-	   _("Nonterminals, with rules where they appear"));
-  for (i = ntokens; i <= nsyms - 1; i++)
+  fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
+  for (i = ntokens; i < nsyms; i++)
     {
       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 (rule_table[j].lhs == i)
+	  item_number_t *rhsp;
+	  if (rules[r].lhs->number == i)
 	    left_count++;
-	  for (rule = &ritem[rule_table[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;
@@ -272,8 +415,8 @@ print_grammar (FILE *out)
 	}
 
       buffer[0] = 0;
-      fputs (tags[i], out);
-      column = strlen (tags[i]);
+      fputs (tag, out);
+      column = strlen (tag);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
 
@@ -282,11 +425,11 @@ print_grammar (FILE *out)
 	  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);
-	      if (rule_table[j].lhs == i)
-		sprintf (buffer + strlen (buffer), " %d", j);
+	      if (rules[r].lhs->number == i)
+		sprintf (buffer + strlen (buffer), " %d", r - 1);
 	    }
 	}
 
@@ -296,44 +439,50 @@ print_grammar (FILE *out)
 	    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[rule_table[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);
-		    sprintf (buffer + strlen (buffer), " %d", j);
+		    sprintf (buffer + strlen (buffer), " %d", r - 1);
 		    break;
 		  }
 	    }
 	}
       fprintf (out, "%s\n", buffer);
     }
+  fputs ("\n\n", out);
 }
 
 void
 print_results (void)
 {
-  if (verbose_flag)
-    {
-      int i;
-
-      /* We used to use just .out if spec_name_prefix (-p) was used, but
-	 that conflicts with Posix.  */
-      FILE *out = xfopen (spec_verbose_file, "w");
-
-      size_t size = obstack_object_size (&output_obstack);
-      fwrite (obstack_finish (&output_obstack), 1, size, out);
-
-      reduce_output (out);
-      conflicts_output (out);
-
-      print_grammar (out);
-
-      for (i = 0; i < nstates; i++)
-	print_state (out, i);
-
-      xfclose (out);
-    }
-  obstack_free (&output_obstack, NULL);
+  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");
+
+  reduce_output (out);
+  conflicts_output (out);
+
+  print_grammar (out);
+
+  /* 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);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+  for (i = 0; i < nstates; i++)
+    print_state (out, states[i]);
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);
+  if (report_flag & report_itemsets)
+    free_closure ();
+
+  xfclose (out);
 }