Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/lalr.c (F): New macro to access to the variable F.

Browse Source 
Adjust.
This commit is contained in:
Akim Demaille
2001-11-19 10:09:11 +00:00
parent bb527fc271
commit ddcd5fdff6
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-11-19 Akim Demaille <akim@epita.fr>
* src/lalr.c (F): New macro to access to the variable F.
Adjust.
2001-11-19 Akim Demaille <akim@epita.fr> 2001-11-19 Akim Demaille <akim@epita.fr>
* src/lalr.h (LA): New macro to access to the variable LA. * src/lalr.h (LA): New macro to access to the variable LA.

56
src/lalr.c
View File

@@ -50,7 +50,12 @@ extern void berror PARAMS ((const char *));
static int infinity; static int infinity;
static int maxrhs; static int maxrhs;
static int ngotos; static int ngotos;
static unsigned *F;
/* And for the famous F variable, which named is so descriptive that a
comment is hardly needed. <grin>. */
static unsigned *F = NULL;
#define F(Rule) (F + (Rule) * tokensetsize)
static short **includes; static short **includes;
static shorts **lookback; static shorts **lookback;
static short **R; static short **R;
@@ -74,8 +79,8 @@ traverse (int i)
VERTICES[++top] = i; VERTICES[++top] = i;
INDEX[i] = height = top; INDEX[i] = height = top;
base = F + i * tokensetsize; base = F (i);
fp3 = base + tokensetsize; fp3 = F (i + 1);
rp = R[i]; rp = R[i];
if (rp) if (rp)
@@ -89,7 +94,7 @@ traverse (int i)
INDEX[i] = INDEX[j]; INDEX[i] = INDEX[j];
fp1 = base; fp1 = base;
fp2 = F + j * tokensetsize; fp2 = F (j);
while (fp1 < fp3) while (fp1 < fp3)
*fp1++ |= *fp2++; *fp1++ |= *fp2++;
@@ -107,7 +112,7 @@ traverse (int i)
break; break;
fp1 = base; fp1 = base;
fp2 = F + j * tokensetsize; fp2 = F (j);
while (fp1 < fp3) while (fp1 < fp3)
*fp2++ = *fp1++; *fp2++ = *fp1++;
@@ -132,10 +137,8 @@ digraph (short **relation)
INDEX[i] = 0; INDEX[i] = 0;
for (i = 0; i < ngotos; i++) for (i = 0; i < ngotos; i++)
{ if (INDEX[i] == 0 && R[i])
if (INDEX[i] == 0 && R[i]) traverse (i);
traverse (i);
}
XFREE (INDEX); XFREE (INDEX);
XFREE (VERTICES); XFREE (VERTICES);
@@ -431,10 +434,7 @@ initialize_F (void)
digraph (reads); digraph (reads);
for (i = 0; i < ngotos; i++) for (i = 0; i < ngotos; i++)
{ XFREE (reads[i]);
if (reads[i])
XFREE (reads[i]);
}
XFREE (reads); XFREE (reads);
XFREE (edge); XFREE (edge);
@@ -630,10 +630,7 @@ compute_FOLLOWS (void)
digraph (includes); digraph (includes);
for (i = 0; i < ngotos; i++) for (i = 0; i < ngotos; i++)
{ XFREE (includes[i]);
if (includes[i])
XFREE (includes[i]);
}
XFREE (includes); XFREE (includes);
} }
@@ -643,28 +640,21 @@ static void
compute_lookaheads (void) compute_lookaheads (void)
{ {
int i; int i;
int n;
unsigned *fp1;
unsigned *fp2;
unsigned *fp3;
shorts *sp; shorts *sp;
shorts *sptmp; /* JF */
for (i = 0; i < state_table[nstates].lookaheads; i++) for (i = 0; i < state_table[nstates].lookaheads; i++)
{ for (sp = lookback[i]; sp; sp = sp->next)
fp3 = LA (i + 1); {
for (sp = lookback[i]; sp; sp = sp->next) unsigned *fp1 = LA (i);
{ unsigned *fp2 = F (sp->value);
fp1 = LA (i); while (fp1 < LA (i + 1))
fp2 = F + tokensetsize * sp->value; *fp1++ |= *fp2++;
while (fp1 < fp3) }
*fp1++ |= *fp2++;
}
}
/* Free LOOKBACK. */
for (i = 0; i < state_table[nstates].lookaheads; i++) for (i = 0; i < state_table[nstates].lookaheads; i++)
{ {
/* JF removed ref to freed storage */ shorts *sptmp;
for (sp = lookback[i]; sp; sp = sptmp) for (sp = lookback[i]; sp; sp = sptmp)
{ {
sptmp = sp->next; sptmp = sp->next;