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

* src/closure.c (FIRSTS, FDERIVES): Adjust to reality: they are

Browse Source 
indexed by nonterminals.
This commit is contained in:
Akim Demaille
2001-12-05 09:23:24 +00:00
parent aaf7be2c4b
commit 5e5b240715
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/closure.c (FIRSTS, FDERIVES): Adjust to reality: they are
indexed by nonterminals.
2001-12-05 Akim Demaille <akim@epita.fr> 2001-12-05 Akim Demaille <akim@epita.fr>
* src/warshall.c (TC, RTC): De-obsfucate (source reduced to 22% of * src/warshall.c (TC, RTC): De-obsfucate (source reduced to 22% of

21
src/closure.c
View File

@@ -36,8 +36,9 @@ static unsigned *ruleset;
static unsigned *fderives; static unsigned *fderives;
static unsigned *firsts; static unsigned *firsts;
#define FDERIVES(Symbol) (fderives + (Symbol) * rulesetsize) /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var. */
#define FIRSTS(Symbol) (firsts + (Symbol) * varsetsize) #define FDERIVES(Var) (fderives + ((Var) - ntokens) * rulesetsize)
#define FIRSTS(Var) (firsts + ((Var) - ntokens) * varsetsize)
/* number of words required to hold a bit for each rule */ /* number of words required to hold a bit for each rule */
static int rulesetsize; static int rulesetsize;
@@ -71,7 +72,7 @@ print_firsts (void)
{ {
fprintf (stderr, "\t%s firsts\n", tags[i]); fprintf (stderr, "\t%s firsts\n", tags[i]);
for (j = 0; j < nvars; j++) for (j = 0; j < nvars; j++)
if (BITISSET (FIRSTS (i - ntokens), j)) if (BITISSET (FIRSTS (i), j))
fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]); fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]);
} }
fprintf (stderr, "\n\n"); fprintf (stderr, "\n\n");
@@ -115,20 +116,18 @@ print_fderives (void)
static void static void
set_firsts (void) set_firsts (void)
{ {
int rowsize;
int i, j; int i, j;
varsetsize = rowsize = WORDSIZE (nvars); varsetsize = WORDSIZE (nvars);
firsts = XCALLOC (unsigned, nvars * rowsize); firsts = XCALLOC (unsigned, nvars * varsetsize);
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
for (j = 0; derives[i][j] >= 0; ++j) for (j = 0; derives[i][j] >= 0; ++j)
{ {
int symbol = ritem[rule_table[derives[i][j]].rhs]; int symbol = ritem[rule_table[derives[i][j]].rhs];
if (ISVAR (symbol)) if (ISVAR (symbol))
SETBIT (FIRSTS (i - ntokens), symbol - ntokens); SETBIT (FIRSTS (i), symbol - ntokens);
} }
RTC (firsts, nvars); RTC (firsts, nvars);
@@ -152,13 +151,13 @@ set_fderives (void)
{ {
int i, j, k; int i, j, k;
fderives = XCALLOC (unsigned, nvars * rulesetsize) - ntokens * rulesetsize; fderives = XCALLOC (unsigned, nvars * rulesetsize);
set_firsts (); set_firsts ();
for (i = ntokens; i < nsyms; ++i) for (i = ntokens; i < nsyms; ++i)
for (j = ntokens; j < nsyms; ++j) for (j = ntokens; j < nsyms; ++j)
if (BITISSET (FIRSTS (i - ntokens), j - ntokens)) if (BITISSET (FIRSTS (i), j - ntokens))
for (k = 0; derives[j][k] > 0; ++k) for (k = 0; derives[j][k] > 0; ++k)
SETBIT (FDERIVES (i), derives[j][k]); SETBIT (FDERIVES (i), derives[j][k]);
@@ -251,5 +250,5 @@ free_closure (void)
{ {
XFREE (itemset); XFREE (itemset);
XFREE (ruleset); XFREE (ruleset);
XFREE (fderives + ntokens * rulesetsize); XFREE (fderives);
} }