X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/34ba97434f3440eb7e06619a2517b01a80b6fe5d..4f940944da24080103bdbcf9a61fbb222066d8db:/src/print.c

diff --git a/src/print.c b/src/print.c
index d4ba0e15..e8c4bd07 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, 2002 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.
 
@@ -68,24 +69,24 @@ static void
 print_core (FILE *out, state_t *state)
 {
   int i;
-  short *sitems = state->items;
-  int snitems   = state->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;
 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {
-      closure (sitems, snitems);
+      closure (sitems, snritems);
       sitems = itemset;
-      snitems = nitemset;
+      snritems = nritemset;
     }
 
-  if (snitems)
+  if (snritems)
     {
-      for (i = 0; i < snitems; i++)
+      for (i = 0; i < snritems; i++)
 	{
-	  short *sp;
-	  short *sp1;
+	  item_number_t *sp;
+	  item_number_t *sp1;
 	  int rule;
 
 	  sp1 = sp = ritem + sitems[i];
@@ -94,9 +95,9 @@ print_core (FILE *out, state_t *state)
 	    sp++;
 
 	  rule = -(*sp);
-	  fprintf (out, "    %s  ->  ", escape (symbols[rules[rule].lhs]->tag));
+	  fprintf (out, "    %s  ->  ", escape (rules[rule].lhs->tag));
 
-	  for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+	  for (sp = rules[rule].rhs; sp < sp1; sp++)
 	    fprintf (out, "%s ", escape (symbols[*sp]->tag));
 
 	  fputc ('.', out);
@@ -189,7 +190,7 @@ print_reductions (FILE *out, state_t *state)
   if (state->consistent)
     {
       int rule = redp->rules[0];
-      int symbol = rules[rule].lhs;
+      int symbol = rules[rule].lhs->number;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
 	       rule - 1, escape (symbols[symbol]->tag));
       return;
@@ -213,42 +214,34 @@ print_reductions (FILE *out, state_t *state)
 
   if (state->nlookaheads == 1 && !nodefault)
     {
-      int default_rule = LAruleno[state->lookaheadsp];
+      rule_t *default_rule = LArule[state->lookaheadsp];
 
-      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);
+      bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);
 
       for (i = 0; i < ntokens; i++)
 	if (bitset_test (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));
+		   escape (symbols[i]->tag),
+		   default_rule->number - 1,
+		   escape2 (default_rule->lhs->tag));
 
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-	       default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag));
+	       default_rule->number - 1,
+	       escape (default_rule->lhs->tag));
     }
   else if (state->nlookaheads >= 1)
     {
       int cmax = 0;
       int default_LA = -1;
-      int default_rule = 0;
+      rule_t *default_rule = NULL;
 
       if (!nodefault)
 	for (i = 0; i < state->nlookaheads; ++i)
 	  {
 	    int count = 0;
-	    int j, k;
+	    int j;
 
-	    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);
+	    bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);
 
 	    for (j = 0; j < ntokens; j++)
 	      if (bitset_test (lookaheadset, j))
@@ -258,7 +251,7 @@ print_reductions (FILE *out, state_t *state)
 	      {
 		cmax = count;
 		default_LA = state->lookaheadsp + i;
-		default_rule = LAruleno[state->lookaheadsp + i];
+		default_rule = LArule[state->lookaheadsp + i];
 	      }
 
 	    bitset_or (shiftset, shiftset, lookaheadset);
@@ -277,45 +270,43 @@ print_reductions (FILE *out, state_t *state)
 	  int count = bitset_test (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;
+	    if (bitset_test (LA[state->lookaheadsp + j], i))
+	      {
+		if (count == 0)
+		  {
+		    if (state->lookaheadsp + j != default_LA)
 		      fprintf (out,
-			       _("    %-4s\t[reduce using rule %d (%s)]\n"),
+			       _("    %-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));
-		    }
-		}
-	    }
+			       LArule[state->lookaheadsp + j]->number - 1,
+			       escape2 (LArule[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),
+			       LArule[default_LA]->number - 1,
+			       escape2 (LArule[default_LA]->lhs->tag));
+		    defaulted = 0;
+		    fprintf (out,
+			     _("    %-4s\t[reduce using rule %d (%s)]\n"),
+			     escape (symbols[i]->tag),
+			     LArule[state->lookaheadsp + j]->number - 1,
+			     escape2 (LArule[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));
+		 default_rule->number - 1,
+		 escape (default_rule->lhs->tag));
     }
 }
 
@@ -370,34 +361,32 @@ static void
 print_grammar (FILE *out)
 {
   int i, j;
-  short *rule;
+  item_number_t *rule;
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   fprintf (out, "%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 (rules[i].useful)
-      {
-	fprintf (out, _("  %3d %3d %s ->"),
-		 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);
-      }
+  for (i = 1; i < nrules + 1; i++)
+    {
+      fprintf (out, _("  %3d %3d %s ->"),
+	       i - 1, rules[i].line, escape (rules[i].lhs->tag));
+      rule = rules[i].rhs;
+      if (*rule >= 0)
+	while (*rule >= 0)
+	  fprintf (out, " %s", escape (symbols[*rule++]->tag));
+      else
+	fprintf (out, " /* %s */", _("empty"));
+      fputc ('\n', out);
+    }
   fputs ("\n\n", out);
 
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
-  for (i = 0; i <= max_user_token_number; i++)
-    if (token_translations[i] != 2)
+  for (i = 0; i < max_user_token_number + 1; i++)
+    if (token_translations[i] != undeftoken->number)
       {
 	buffer[0] = 0;
 	column = strlen (escape (symbols[token_translations[i]]->tag));
@@ -405,8 +394,8 @@ print_grammar (FILE *out)
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
-	for (j = 1; j <= nrules; j++)
-	  for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
+	for (j = 1; j < nrules + 1; j++)
+	  for (rule = rules[j].rhs; *rule >= 0; rule++)
 	    if (*rule == token_translations[i])
 	      {
 		END_TEST (65);
@@ -419,15 +408,15 @@ print_grammar (FILE *out)
 
 
   fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
-  for (i = ntokens; i <= nsyms - 1; i++)
+  for (i = ntokens; i < nsyms; i++)
     {
       int left_count = 0, right_count = 0;
 
-      for (j = 1; j <= nrules; j++)
+      for (j = 1; j < nrules + 1; j++)
 	{
-	  if (rules[j].lhs == i)
+	  if (rules[j].lhs->number == i)
 	    left_count++;
-	  for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
+	  for (rule = rules[j].rhs; *rule >= 0; rule++)
 	    if (*rule == i)
 	      {
 		right_count++;
@@ -446,10 +435,10 @@ print_grammar (FILE *out)
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on left:"));
 
-	  for (j = 1; j <= nrules; j++)
+	  for (j = 1; j < nrules + 1; j++)
 	    {
 	      END_TEST (65);
-	      if (rules[j].lhs == i)
+	      if (rules[j].lhs->number == i)
 		sprintf (buffer + strlen (buffer), " %d", j - 1);
 	    }
 	}
@@ -460,9 +449,9 @@ print_grammar (FILE *out)
 	    sprintf (buffer + strlen (buffer), ",");
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on right:"));
-	  for (j = 1; j <= nrules; j++)
+	  for (j = 1; j < nrules + 1; j++)
 	    {
-	      for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
+	      for (rule = rules[j].rhs; *rule >= 0; rule++)
 		if (*rule == i)
 		  {
 		    END_TEST (65);
@@ -479,7 +468,7 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
-  int i;
+  size_t i;
 
   /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
      that conflicts with Posix.  */
@@ -504,9 +493,7 @@ print_results (void)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   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, states[i]);
   bitset_free (shiftset);