[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16-fyi-F.patch
From: |
Akim Demaille |
Subject: |
16-fyi-F.patch |
Date: |
Mon, 19 Nov 2001 10:02:57 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/lalr.c (F): New macro to access to the variable F.
Adjust.
Index: src/lalr.c
--- src/lalr.c Thu, 15 Nov 2001 23:53:01 +0100 akim
+++ src/lalr.c Fri, 16 Nov 2001 00:07:38 +0100 akim
@@ -50,7 +50,12 @@
static int infinity;
static int maxrhs;
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 shorts **lookback;
static short **R;
@@ -74,8 +79,8 @@
VERTICES[++top] = i;
INDEX[i] = height = top;
- base = F + i * tokensetsize;
- fp3 = base + tokensetsize;
+ base = F (i);
+ fp3 = F (i + 1);
rp = R[i];
if (rp)
@@ -89,7 +94,7 @@
INDEX[i] = INDEX[j];
fp1 = base;
- fp2 = F + j * tokensetsize;
+ fp2 = F (j);
while (fp1 < fp3)
*fp1++ |= *fp2++;
@@ -107,7 +112,7 @@
break;
fp1 = base;
- fp2 = F + j * tokensetsize;
+ fp2 = F (j);
while (fp1 < fp3)
*fp2++ = *fp1++;
@@ -132,10 +137,8 @@
INDEX[i] = 0;
for (i = 0; i < ngotos; i++)
- {
- if (INDEX[i] == 0 && R[i])
- traverse (i);
- }
+ if (INDEX[i] == 0 && R[i])
+ traverse (i);
XFREE (INDEX);
XFREE (VERTICES);
@@ -431,10 +434,7 @@
digraph (reads);
for (i = 0; i < ngotos; i++)
- {
- if (reads[i])
- XFREE (reads[i]);
- }
+ XFREE (reads[i]);
XFREE (reads);
XFREE (edge);
@@ -630,10 +630,7 @@
digraph (includes);
for (i = 0; i < ngotos; i++)
- {
- if (includes[i])
- XFREE (includes[i]);
- }
+ XFREE (includes[i]);
XFREE (includes);
}
@@ -643,28 +640,21 @@
compute_lookaheads (void)
{
int i;
- int n;
- unsigned *fp1;
- unsigned *fp2;
- unsigned *fp3;
shorts *sp;
- shorts *sptmp; /* JF */
for (i = 0; i < state_table[nstates].lookaheads; i++)
- {
- fp3 = LA (i + 1);
- for (sp = lookback[i]; sp; sp = sp->next)
- {
- fp1 = LA (i);
- fp2 = F + tokensetsize * sp->value;
- while (fp1 < fp3)
- *fp1++ |= *fp2++;
- }
- }
+ for (sp = lookback[i]; sp; sp = sp->next)
+ {
+ unsigned *fp1 = LA (i);
+ unsigned *fp2 = F (sp->value);
+ while (fp1 < LA (i + 1))
+ *fp1++ |= *fp2++;
+ }
+ /* Free LOOKBACK. */
for (i = 0; i < state_table[nstates].lookaheads; i++)
{
- /* JF removed ref to freed storage */
+ shorts *sptmp;
for (sp = lookback[i]; sp; sp = sptmp)
{
sptmp = sp->next;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 16-fyi-F.patch,
Akim Demaille <=