X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2e729273d633f1ddaf1b6affdca53f3e63f3715c..e9f87b5b7df2e328d2e4196d276c0d96594c906b:/src/print.c

diff --git a/src/print.c b/src/print.c
index 0a2d0209..72b4cd0a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -20,7 +20,9 @@
 
 
 #include "system.h"
+#include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -32,6 +34,9 @@
 #include "reduce.h"
 #include "closure.h"
 
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;
+
 #if 0
 static void
 print_token (int extnum, int token)
@@ -40,17 +45,30 @@ print_token (int extnum, int token)
 }
 #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);
+}
+
 
 /*--------------------------------.
 | Report information on a state.  |
 `--------------------------------*/
 
 static void
-print_core (FILE *out, int state)
+print_core (FILE *out, state_t *state)
 {
   int i;
-  short *sitems = state_table[state]->items;
-  int snitems   = state_table[state]->nitems;
+  short *sitems = state->items;
+  int snitems   = state->nitems;
 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
@@ -71,21 +89,21 @@ print_core (FILE *out, int state)
 
 	  sp1 = sp = ritem + sitems[i];
 
-	  while (*sp > 0)
+	  while (*sp >= 0)
 	    sp++;
 
 	  rule = -(*sp);
-	  fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
+	  fprintf (out, "    %s  ->  ", escape (symbols[rules[rule].lhs]->tag));
 
-	  for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
-	    fprintf (out, "%s ", tags[*sp]);
+	  for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+	    fprintf (out, "%s ", escape (symbols[*sp]->tag));
 
 	  fputc ('.', out);
 
-	  for (/* Nothing */; *sp > 0; ++sp)
-	    fprintf (out, " %s", tags[*sp]);
+	  for (/* Nothing */; *sp >= 0; ++sp)
+	    fprintf (out, " %s", escape (symbols[*sp]->tag));
 
-	  fprintf (out, _("   (rule %d)"), rule);
+	  fprintf (out, _("   (rule %d)"), rule - 1);
 	  fputc ('\n', out);
 	}
 
@@ -93,84 +111,235 @@ print_core (FILE *out, int state)
     }
 }
 
+
 static void
-print_actions (FILE *out, int state)
+print_shifts (FILE *out, state_t *state)
 {
   int i;
-
-  shifts   *shiftp = state_table[state]->shifts;
-  reductions *redp = state_table[state]->reductions;
-  errs       *errp = state_table[state]->errs;
-
-  if (!shiftp->nshifts && !redp)
-    {
-      if (final_state == state)
-	fprintf (out, _("    $default\taccept\n"));
-      else
-	fprintf (out, _("    NO ACTIONS\n"));
-      return;
-    }
+  shifts *shiftp = state->shifts;
 
   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 = state_table[state1]->accessing_symbol;
+	int symbol = states[state1]->accessing_symbol;
 	fprintf (out,
 		 _("    %-4s\tshift, and go to state %d\n"),
-		 tags[symbol], state1);
+		 escape (symbols[symbol]->tag), state1);
       }
 
   if (i > 0)
     fputc ('\n', out);
+}
+
+
+static void
+print_errs (FILE *out, state_t *state)
+{
+  errs *errp = state->errs;
+  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));
 
-  if (errp)
+  if (i > 0)
+    fputc ('\n', out);
+}
+
+
+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)
     {
-      int j;
-      for (j = 0; j < errp->nerrs; j++)
-	{
-	  int symbol = errp->errs[j];
-	  if (!symbol)
-	    continue;
-	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-		   tags[symbol]);
-	}
+      for (; i < shiftp->nshifts; i++)
+	if (!SHIFT_IS_DISABLED (shiftp, i))
+	  {
+	    int state1 = shiftp->shifts[i];
+	    int symbol = states[state1]->accessing_symbol;
+	    fprintf (out, _("    %-4s\tgo to state %d\n"),
+		     escape (symbols[symbol]->tag), state1);
+	  }
 
-      if (j > 0)
-	fputc ('\n', out);
+      fputc ('\n', out);
     }
+}
 
-  if (state_table[state]->consistent && redp)
+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;
+
+  if (redp->nreds == 0)
+    return;
+
+  if (state->consistent)
     {
       int rule = redp->rules[0];
-      int symbol = rule_table[rule].lhs;
+      int symbol = rules[rule].lhs;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-	       rule, tags[symbol]);
+	       rule - 1, escape (symbols[symbol]->tag));
+      return;
     }
-  else if (redp)
+
+  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))
+      {
+	/* 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]);
+
+  if (state->nlookaheads == 1 && !nodefault)
     {
-      print_reductions (out, state);
-    }
+      int k;
+      int default_rule = LAruleno[state->lookaheadsp];
 
-  if (i < shiftp->nshifts)
+      for (k = 0; k < tokensetsize; ++k)
+	lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+
+      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));
+
+      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)
     {
-      for (; i < shiftp->nshifts; i++)
-	if (!SHIFT_IS_DISABLED (shiftp, i))
+      int cmax = 0;
+      int default_LA = -1;
+      int default_rule = 0;
+
+      if (!nodefault)
+	for (i = 0; i < state->nlookaheads; ++i)
 	  {
-	    int state1 = shiftp->shifts[i];
-	    int symbol = state_table[state1]->accessing_symbol;
-	    fprintf (out, _("    %-4s\tgo to state %d\n"),
-		     tags[symbol], state1);
+	    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))
+		count++;
+
+	    if (count > cmax)
+	      {
+		cmax = count;
+		default_LA = state->lookaheadsp + i;
+		default_rule = LAruleno[state->lookaheadsp + i];
+	      }
+
+	    for (k = 0; k < tokensetsize; ++k)
+	      shiftset[k] |= lookaheadset[k];
 	  }
 
-      fputc ('\n', out);
+      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));
+    }
+}
+
+
+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_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)
 {
-  fprintf (out, _("state %d"), state);
+  fprintf (out, _("state %d"), state->number);
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);
@@ -205,14 +374,14 @@ print_grammar (FILE *out)
   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].useful)
+    if (rules[i].useful)
       {
 	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++]);
+		 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);
@@ -222,23 +391,21 @@ print_grammar (FILE *out)
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%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)
       {
 	buffer[0] = 0;
-	column = strlen (tags[token_translations[i]]);
-	fputs (tags[token_translations[i]], out);
+	column = strlen (escape (symbols[token_translations[i]]->tag));
+	fputs (escape (symbols[token_translations[i]]->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++)
+	  for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
 	    if (*rule == token_translations[i])
 	      {
 		END_TEST (65);
-		sprintf (buffer + strlen (buffer), " %d", j);
+		sprintf (buffer + strlen (buffer), " %d", j - 1);
 		break;
 	      }
 	fprintf (out, "%s\n", buffer);
@@ -253,9 +420,9 @@ print_grammar (FILE *out)
 
       for (j = 1; j <= nrules; j++)
 	{
-	  if (rule_table[j].lhs == i)
+	  if (rules[j].lhs == i)
 	    left_count++;
-	  for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+	  for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
 	    if (*rule == i)
 	      {
 		right_count++;
@@ -264,8 +431,8 @@ print_grammar (FILE *out)
 	}
 
       buffer[0] = 0;
-      fputs (tags[i], out);
-      column = strlen (tags[i]);
+      fputs (escape (symbols[i]->tag), out);
+      column = strlen (escape (symbols[i]->tag));
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
 
@@ -277,8 +444,8 @@ print_grammar (FILE *out)
 	  for (j = 1; j <= nrules; j++)
 	    {
 	      END_TEST (65);
-	      if (rule_table[j].lhs == i)
-		sprintf (buffer + strlen (buffer), " %d", j);
+	      if (rules[j].lhs == i)
+		sprintf (buffer + strlen (buffer), " %d", j - 1);
 	    }
 	}
 
@@ -290,11 +457,11 @@ print_grammar (FILE *out)
 	  sprintf (buffer + strlen (buffer), _(" on right:"));
 	  for (j = 1; j <= nrules; j++)
 	    {
-	      for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+	      for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
 		if (*rule == i)
 		  {
 		    END_TEST (65);
-		    sprintf (buffer + strlen (buffer), " %d", j);
+		    sprintf (buffer + strlen (buffer), " %d", j - 1);
 		    break;
 		  }
 	    }
@@ -307,35 +474,38 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
-  if (verbose_flag)
-    {
-      int i;
+  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");
+  /* 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);
-      if (size)
-	fputs ("\n\n", out);
+  size_t size = obstack_object_size (&output_obstack);
+  fwrite (obstack_finish (&output_obstack), 1, size, out);
+  obstack_free (&output_obstack, NULL);
 
-      reduce_output (out);
-      conflicts_output (out);
+  if (size)
+    fputs ("\n\n", out);
 
-      print_grammar (out);
+  reduce_output (out);
+  conflicts_output (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)
-	new_closure (nitems);
-      for (i = 0; i < nstates; i++)
-	print_state (out, i);
-      if (trace_flag)
-	free_closure ();
+  print_grammar (out);
 
-      xfclose (out);
-    }
-  obstack_free (&output_obstack, NULL);
+  /* 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)
+    new_closure (nritems);
+  /* Storage for print_reductions.  */
+  shiftset = XCALLOC (unsigned, tokensetsize);
+  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  for (i = 0; i < nstates; i++)
+    print_state (out, states[i]);
+  free (shiftset);
+  free (lookaheadset);
+  if (trace_flag)
+    free_closure ();
+
+  xfclose (out);
 }