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

diff --git a/src/print.c b/src/print.c
index 6c0002cd..d4ba0e15 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,5 @@
 /* Print information on generated parser, for bison,
-   Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,6 +22,7 @@
 #include "system.h"
 #include "quotearg.h"
 #include "files.h"
+#include "symtab.h"
 #include "gram.h"
 #include "LR0.h"
 #include "lalr.h"
@@ -32,9 +33,10 @@
 #include "print.h"
 #include "reduce.h"
 #include "closure.h"
+#include "bitset.h"
 
-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;
+static bitset shiftset;
+static bitset lookaheadset;
 
 #if 0
 static void
@@ -88,21 +90,21 @@ print_core (FILE *out, state_t *state)
 
 	  sp1 = sp = ritem + sitems[i];
 
-	  while (*sp > 0)
+	  while (*sp >= 0)
 	    sp++;
 
 	  rule = -(*sp);
-	  fprintf (out, "    %s  ->  ", escape (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 ", escape (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", escape (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);
 	}
 
@@ -121,10 +123,10 @@ print_shifts (FILE *out, state_t *state)
     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"),
-		 escape (tags[symbol]), state1);
+		 escape (symbols[symbol]->tag), state1);
       }
 
   if (i > 0)
@@ -141,7 +143,7 @@ print_errs (FILE *out, state_t *state)
   for (i = 0; i < errp->nerrs; ++i)
     if (errp->errs[i])
       fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-	       escape (tags[errp->errs[i]]));
+	       escape (symbols[errp->errs[i]]->tag));
 
   if (i > 0)
     fputc ('\n', out);
@@ -163,9 +165,9 @@ print_gotos (FILE *out, state_t *state)
 	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\tgo to state %d\n"),
-		     escape (tags[symbol]), state1);
+		     escape (symbols[symbol]->tag), state1);
 	  }
 
       fputc ('\n', out);
@@ -187,14 +189,13 @@ print_reductions (FILE *out, state_t *state)
   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, escape (tags[symbol]));
+	       rule - 1, escape (symbols[symbol]->tag));
       return;
     }
 
-  for (i = 0; i < tokensetsize; i++)
-    shiftset[i] = 0;
+  bitset_zero (shiftset);
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
@@ -203,29 +204,32 @@ print_reductions (FILE *out, state_t *state)
 	   default rule.  */
 	if (SHIFT_IS_ERROR (shiftp, i))
 	  nodefault = 1;
-	SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+	bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
       }
 
   for (i = 0; i < errp->nerrs; i++)
     if (errp->errs[i])
-      SETBIT (shiftset, errp->errs[i]);
+      bitset_set (shiftset, errp->errs[i]);
 
   if (state->nlookaheads == 1 && !nodefault)
     {
-      int k;
       int default_rule = LAruleno[state->lookaheadsp];
 
-      for (k = 0; k < tokensetsize; ++k)
-	lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+      for (i = 0; i < ntokens; ++i)
+	if (BITISSET (LA (state->lookaheadsp), i)
+	    && bitset_test (shiftset, i))
+	  bitset_set (lookaheadset, i);
+	else
+	  bitset_reset (lookaheadset, i);
 
       for (i = 0; i < ntokens; i++)
-	if (BITISSET (lookaheadset, i))
+	if (bitset_test (lookaheadset, i))
 	  fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
-		   escape (tags[i]), default_rule,
-		   escape2 (tags[rule_table[default_rule].lhs]));
+		   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, escape (tags[rule_table[default_rule].lhs]));
+	       default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag));
     }
   else if (state->nlookaheads >= 1)
     {
@@ -239,11 +243,15 @@ print_reductions (FILE *out, state_t *state)
 	    int count = 0;
 	    int j, k;
 
-	    for (k = 0; k < tokensetsize; ++k)
-	      lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
+	    for (k = 0; k < ntokens; ++k)
+	      if (BITISSET (LA (state->lookaheadsp + i), k)
+		  && ! bitset_test (shiftset, k))
+		bitset_set (lookaheadset, k);
+	      else
+		bitset_reset (lookaheadset, k);
 
 	    for (j = 0; j < ntokens; j++)
-	      if (BITISSET (lookaheadset, j))
+	      if (bitset_test (lookaheadset, j))
 		count++;
 
 	    if (count > cmax)
@@ -253,22 +261,20 @@ print_reductions (FILE *out, state_t *state)
 		default_rule = LAruleno[state->lookaheadsp + i];
 	      }
 
-	    for (k = 0; k < tokensetsize; ++k)
-	      shiftset[k] |= lookaheadset[k];
+	    bitset_or (shiftset, shiftset, lookaheadset);
 	  }
 
-      for (i = 0; i < tokensetsize; i++)
-	shiftset[i] = 0;
+      bitset_zero (shiftset);
 
       for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
 	if (!SHIFT_IS_DISABLED (shiftp, i))
-	  SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+	  bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));
 
       for (i = 0; i < ntokens; i++)
 	{
 	  int j;
 	  int defaulted = 0;
-	  int count = BITISSET (shiftset, i);
+	  int count = bitset_test (shiftset, i);
 
 	  for (j = 0; j < state->nlookaheads; ++j)
 	    {
@@ -279,9 +285,9 @@ print_reductions (FILE *out, state_t *state)
 		      if (state->lookaheadsp + j != default_LA)
 			fprintf (out,
 				 _("    %-4s\treduce using rule %d (%s)\n"),
-				 escape (tags[i]),
-				 LAruleno[state->lookaheadsp + j],
-				 escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
+				 escape (symbols[i]->tag),
+				 LAruleno[state->lookaheadsp + j] - 1,
+				 escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
 		      else
 			defaulted = 1;
 
@@ -292,15 +298,15 @@ print_reductions (FILE *out, state_t *state)
 		      if (defaulted)
 			fprintf (out,
 				 _("    %-4s\treduce using rule %d (%s)\n"),
-				 escape (tags[i]),
-				 LAruleno[default_LA],
-				 escape2 (tags[rule_table[LAruleno[default_LA]].lhs]));
+				 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 (tags[i]),
-			       LAruleno[state->lookaheadsp + j],
-			       escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
+			       escape (symbols[i]->tag),
+			       LAruleno[state->lookaheadsp + j] - 1,
+			       escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
 		    }
 		}
 	    }
@@ -308,7 +314,8 @@ print_reductions (FILE *out, state_t *state)
 
       if (default_LA >= 0)
 	fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
-		 default_rule, escape (tags[rule_table[default_rule].lhs]));
+		 default_rule - 1,
+		 escape (symbols[rules[default_rule].lhs]->tag));
     }
 }
 
@@ -322,9 +329,9 @@ print_actions (FILE *out, state_t *state)
   if (shiftp->nshifts == 0 && redp->nreds == 0)
     {
       if (final_state == state->number)
-	fprintf (out, _("    $default\taccept\n"));
+       fprintf (out, _("    $default\taccept\n"));
       else
-	fprintf (out, _("    NO ACTIONS\n"));
+       fprintf (out, _("    NO ACTIONS\n"));
       return;
     }
 
@@ -372,14 +379,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, escape (tags[rule_table[i].lhs]));
-	rule = &ritem[rule_table[i].rhs];
-	if (*rule > 0)
-	  while (*rule > 0)
-	    fprintf (out, " %s", escape (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);
@@ -393,17 +400,17 @@ print_grammar (FILE *out)
     if (token_translations[i] != 2)
       {
 	buffer[0] = 0;
-	column = strlen (escape (tags[token_translations[i]]));
-	fputs (escape (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);
@@ -418,9 +425,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++;
@@ -429,8 +436,8 @@ print_grammar (FILE *out)
 	}
 
       buffer[0] = 0;
-      fputs (escape (tags[i]), out);
-      column = strlen (escape (tags[i]));
+      fputs (escape (symbols[i]->tag), out);
+      column = strlen (escape (symbols[i]->tag));
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
 
@@ -442,8 +449,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);
 	    }
 	}
 
@@ -455,11 +462,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;
 		  }
 	    }
@@ -494,14 +501,16 @@ print_results (void)
      only its kernel.  Requires to run closure, which need memory
      allocation/deallocation.  */
   if (trace_flag)
-    new_closure (nitems);
+    new_closure (nritems);
   /* Storage for print_reductions.  */
-  shiftset = XCALLOC (unsigned, tokensetsize);
-  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  shiftset =  bitset_create (ntokens, BITSET_FIXED);
+  bitset_zero (shiftset);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+  bitset_zero (lookaheadset);
   for (i = 0; i < nstates; i++)
-    print_state (out, state_table[i]);
-  free (shiftset);
-  free (lookaheadset);
+    print_state (out, states[i]);
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);
   if (trace_flag)
     free_closure ();