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

diff --git a/src/print.c b/src/print.c
index 90779600..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,7 +95,7 @@ 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 = rules[rule].rhs; sp < sp1; sp++)
 	    fprintf (out, "%s ", escape (symbols[*sp]->tag));
@@ -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,24 +214,26 @@ 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];
 
       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)
@@ -248,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);
@@ -275,8 +278,8 @@ print_reductions (FILE *out, state_t *state)
 		      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));
+			       LArule[state->lookaheadsp + j]->number - 1,
+			       escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
 		    else
 		      defaulted = 1;
 
@@ -288,22 +291,22 @@ print_reductions (FILE *out, state_t *state)
 		      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));
+			       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),
-			     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));
 		  }
 	      }
 	}
 
       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));
     }
 }
 
@@ -358,7 +361,7 @@ static void
 print_grammar (FILE *out)
 {
   int i, j;
-  short *rule;
+  item_number_t *rule;
   char buffer[90];
   int column = 0;
 
@@ -368,7 +371,7 @@ print_grammar (FILE *out)
   for (i = 1; i < nrules + 1; i++)
     {
       fprintf (out, _("  %3d %3d %s ->"),
-	       i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag));
+	       i - 1, rules[i].line, escape (rules[i].lhs->tag));
       rule = rules[i].rhs;
       if (*rule >= 0)
 	while (*rule >= 0)
@@ -383,7 +386,7 @@ print_grammar (FILE *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 + 1; i++)
-    if (token_translations[i] != 2)
+    if (token_translations[i] != undeftoken->number)
       {
 	buffer[0] = 0;
 	column = strlen (escape (symbols[token_translations[i]]->tag));
@@ -411,7 +414,7 @@ print_grammar (FILE *out)
 
       for (j = 1; j < nrules + 1; j++)
 	{
-	  if (rules[j].lhs == i)
+	  if (rules[j].lhs->number == i)
 	    left_count++;
 	  for (rule = rules[j].rhs; *rule >= 0; rule++)
 	    if (*rule == i)
@@ -435,7 +438,7 @@ print_grammar (FILE *out)
 	  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);
 	    }
 	}