From: Akim Demaille <akim@epita.fr>
Date: Thu, 27 Dec 2001 18:05:18 +0000 (+0000)
Subject: * src/output.c (action_row, token_actions): Use a state_t instead
X-Git-Tag: before-m4-back-end~98
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/f9507c28ae7d2e01067085a477e02e87509b3fbe

* src/output.c (action_row, token_actions): Use a state_t instead
of a integer, and nlookaheads instead of the following state's
lookaheadsp.
---

diff --git a/ChangeLog b/ChangeLog
index 5a6c1b19..421de6f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-27  Akim Demaille  <akim@epita.fr>
+
+	* src/output.c (action_row, token_actions): Use a state_t instead
+	of a integer, and nlookaheads instead of the following state's
+	lookaheadsp.
+
+	
 2001-12-27  Akim Demaille  <akim@epita.fr>
 
 	* src/conflicts.c (log_resolution, flush_shift)
diff --git a/src/output.c b/src/output.c
index fd2bf3c4..705db814 100644
--- a/src/output.c
+++ b/src/output.c
@@ -323,16 +323,14 @@ output_rule_data (void)
 `------------------------------------------------------------------*/
 
 static int
-action_row (int state)
+action_row (state_t *state)
 {
   int i;
-  int m = 0;
-  int n = 0;
   int default_rule = 0;
-  reductions *redp = state_table[state]->reductions;
+  reductions *redp = state->reductions;
   int nreds = redp ? redp->nreds : 0;
-  shifts *shiftp = state_table[state]->shifts;
-  errs *errp = state_table[state]->errs;
+  shifts *shiftp = state->shifts;
+  errs *errp = state->errs;
   /* set nonzero to inhibit having any default reduction */
   int nodefault = 0;
 
@@ -344,17 +342,14 @@ action_row (int state)
       int j;
       /* loop over all the rules available here which require
 	 lookahead */
-      m = state_table[state]->lookaheadsp;
-      n = state_table[state + 1]->lookaheadsp;
-
-      for (i = n - 1; i >= m; i--)
+      for (i = state->nlookaheads - 1; i >= 0; --i)
 	/* and find each token which the rule finds acceptable
 	   to come next */
 	for (j = 0; j < ntokens; j++)
 	  /* and record this rule as the rule to use if that
 	     token follows.  */
-	  if (BITISSET (LA (i), j))
-	    actrow[j] = -LAruleno[i];
+	  if (BITISSET (LA (state->lookaheadsp + i), j))
+	    actrow[j] = -LAruleno[state->lookaheadsp + i];
     }
 
   /* Now see which tokens are allowed for shifts in this state.  For
@@ -394,15 +389,15 @@ action_row (int state)
 
   if (nreds >= 1 && !nodefault)
     {
-      if (state_table[state]->consistent)
+      if (state->consistent)
 	default_rule = redp->rules[0];
       else
 	{
 	  int max = 0;
-	  for (i = m; i < n; i++)
+	  for (i = 0; i < state->nlookaheads; i++)
 	    {
 	      int count = 0;
-	      int rule = -LAruleno[i];
+	      int rule = -LAruleno[state->lookaheadsp + i];
 	      int j;
 
 	      for (j = 0; j < ntokens; j++)
@@ -492,7 +487,7 @@ token_actions (void)
   actrow = XCALLOC (short, ntokens);
   for (i = 0; i < nstates; ++i)
     {
-      yydefact[i] = action_row (i);
+      yydefact[i] = action_row (state_table[i]);
       save_row (i);
     }