X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d2d1b42b0730316f4f70eb416dcc767ffaaa2019..1fa140687eb4ae093904366f4cb1563bbb47e63a:/src/print.c

diff --git a/src/print.c b/src/print.c
index 977be596..d7d04eab 100644
--- a/src/print.c
+++ b/src/print.c
@@ -30,6 +30,7 @@
 #include "reader.h"
 #include "print.h"
 #include "reduce.h"
+#include "closure.h"
 
 #if 0
 static void
@@ -48,51 +49,60 @@ static void
 print_core (FILE *out, int state)
 {
   int i;
-  core *statep = state_table[state].state;
+  short *sitems = state_table[state]->items;
+  int snitems   = state_table[state]->nitems;
 
-  if (!statep->nitems)
-    return;
+  /* New experimental feature: if TRACE_FLAGS output all the items of
+     a state, not only its kernel.  */
+  if (trace_flag)
+    {
+      closure (sitems, snitems);
+      sitems = itemset;
+      snitems = nitemset;
+    }
 
-  for (i = 0; i < statep->nitems; i++)
+  if (snitems)
     {
-      short *sp;
-      short *sp1;
-      int rule;
+      for (i = 0; i < snitems; i++)
+	{
+	  short *sp;
+	  short *sp1;
+	  int rule;
 
-      sp1 = sp = ritem + statep->items[i];
+	  sp1 = sp = ritem + sitems[i];
 
-      while (*sp > 0)
-	sp++;
+	  while (*sp > 0)
+	    sp++;
 
-      rule = -(*sp);
-      fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
+	  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]);
+	  for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
+	    fprintf (out, "%s ", tags[*sp]);
 
-      fputc ('.', out);
+	  fputc ('.', out);
 
-      for (/* Nothing */; *sp > 0; ++sp)
-	fprintf (out, " %s", tags[*sp]);
+	  for (/* Nothing */; *sp > 0; ++sp)
+	    fprintf (out, " %s", tags[*sp]);
+
+	  fprintf (out, _("   (rule %d)"), rule);
+	  fputc ('\n', out);
+	}
 
-      fprintf (out, _("   (rule %d)"), rule);
       fputc ('\n', out);
     }
-
-  fputc ('\n', out);
 }
 
 static void
 print_actions (FILE *out, int state)
 {
   int i;
-  int k;
 
-  shifts   *shiftp = state_table[state].shift_table;
-  reductions *redp = state_table[state].reduction_table;
-  errs       *errp = err_table[state];
+  shifts   *shiftp = state_table[state]->shifts;
+  reductions *redp = state_table[state]->reductions;
+  errs       *errp = state_table[state]->errs;
 
-  if (!shiftp && !redp)
+  if (!shiftp->nshifts && !redp)
     {
       if (final_state == state)
 	fprintf (out, _("    $default\taccept\n"));
@@ -101,37 +111,18 @@ print_actions (FILE *out, int state)
       return;
     }
 
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; 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);
-	}
+  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;
+	fprintf (out,
+		 _("    %-4s\tshift, and go to state %d\n"),
+		 tags[symbol], state1);
+      }
 
-      if (i > 0)
-	fputc ('\n', out);
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  if (i > 0)
+    fputc ('\n', out);
 
   if (errp)
     {
@@ -149,7 +140,7 @@ print_actions (FILE *out, int state)
 	fputc ('\n', out);
     }
 
-  if (state_table[state].consistent && redp)
+  if (state_table[state]->consistent && redp)
     {
       int rule = redp->rules[0];
       int symbol = rule_table[rule].lhs;
@@ -161,18 +152,16 @@ print_actions (FILE *out, int state)
       print_reductions (out, state);
     }
 
-  if (i < k)
+  if (i < shiftp->nshifts)
     {
-      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);
-	}
+      for (; i < shiftp->nshifts; i++)
+	if (!SHIFT_IS_DISABLED (shiftp, i))
+	  {
+	    int state1 = shiftp->shifts[i];
+	    int symbol = state_table[state1]->accessing_symbol;
+	    fprintf (out, _("    %-4s\tgo to state %d\n"),
+		     tags[symbol], state1);
+	  }
 
       fputc ('\n', out);
     }
@@ -216,7 +205,7 @@ 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].lhs >= 0)
+    if (rule_table[i].useful)
       {
 	fprintf (out, _("  %3d %3d %s ->"),
 		 i, rule_table[i].line, tags[rule_table[i].lhs]);
@@ -318,28 +307,33 @@ 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);
 
-      for (i = 0; i < nstates; i++)
-	print_state (out, i);
+  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 (nitems);
+  for (i = 0; i < nstates; i++)
+    print_state (out, i);
+  if (trace_flag)
+    free_closure ();
+
+  xfclose (out);
 }