X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/841822701aa1ed9cebbf65844a31f0b34bd789cc..95361618dee181507d53f47de2dd50c667b84007:/src/closure.c?ds=sidebyside
diff --git a/src/closure.c b/src/closure.c
index 4b0a6ec0..d9bc5ffa 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,49 +1,50 @@
-/* Subroutines for bison
- Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc.
+/* Closures for Bison
+
+ Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2012 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
+
+#include
+#include
+#include
+
+#include "closure.h"
+#include "derives.h"
#include "getargs.h"
#include "gram.h"
#include "reader.h"
-#include "closure.h"
-#include "derives.h"
-#include "warshall.h"
+#include "symtab.h"
-/* ITEMSETSIZE is the size of the array ITEMSET. */
-short *itemset;
-int itemsetsize;
+/* NITEMSET is the size of the array ITEMSET. */
+item_number *itemset;
+size_t nitemset;
-static unsigned *ruleset;
+static bitset ruleset;
/* internal data. See comments before set_fderives and set_firsts. */
-static unsigned *fderives;
-static unsigned *firsts;
-
-#define FDERIVES(Symbol) (fderives + (Symbol) * rulesetsize)
-#define FIRSTS(Symbol) (firsts + (Symbol) * varsetsize)
-
-/* number of words required to hold a bit for each rule */
-static int rulesetsize;
+static bitsetv fderives = NULL;
+static bitsetv firsts = NULL;
-/* number of words required to hold a bit for each variable */
-static int varsetsize;
+/* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var. */
+#define FDERIVES(Var) fderives[(Var) - ntokens]
+#define FIRSTS(Var) firsts[(Var) - ntokens]
/*-----------------.
@@ -51,28 +52,37 @@ static int varsetsize;
`-----------------*/
static void
-print_closure (int n)
+print_closure (char const *title, item_number *array, size_t size)
{
- int i;
- fprintf (stderr, "n = %d\n", n);
- for (i = 0; i < itemsetsize; ++i)
- fprintf (stderr, " %d\n", itemset[i]);
- fprintf (stderr, "\n\n");
+ size_t i;
+ fprintf (stderr, "Closure: %s\n", title);
+ for (i = 0; i < size; ++i)
+ {
+ item_number *rp;
+ fprintf (stderr, " %2d: .", array[i]);
+ for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
+ fprintf (stderr, " %s", symbols[*rp]->tag);
+ fprintf (stderr, " (rule %d)\n", -*rp - 1);
+ }
+ fputs ("\n\n", stderr);
}
static void
print_firsts (void)
{
- int i, j;
+ symbol_number i, j;
fprintf (stderr, "FIRSTS\n");
for (i = ntokens; i < nsyms; i++)
{
- fprintf (stderr, "\t%s firsts\n", tags[i]);
- for (j = 0; j < nvars; j++)
- if (BITISSET (FIRSTS (i - ntokens), j))
- fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]);
+ bitset_iterator iter;
+ fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
+ BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
+ {
+ fprintf (stderr, "\t\t%s\n",
+ symbols[j + ntokens]->tag);
+ }
}
fprintf (stderr, "\n\n");
}
@@ -82,61 +92,55 @@ static void
print_fderives (void)
{
int i;
- int j;
+ rule_number r;
fprintf (stderr, "FDERIVES\n");
-
for (i = ntokens; i < nsyms; i++)
{
- fprintf (stderr, "\t%s derives\n", tags[i]);
- for (j = 0; j <= nrules; j++)
- if (BITISSET (FDERIVES (i), j))
- {
- short *rhsp;
- fprintf (stderr, "\t\t%d:", j);
- for (rhsp = ritem + rule_table[j].rhs; *rhsp > 0; ++rhsp)
- fprintf (stderr, " %s", tags[*rhsp]);
- fputc ('\n', stderr);
- }
+ bitset_iterator iter;
+ fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+ BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
+ {
+ fprintf (stderr, "\t\t%3d ", r);
+ rule_rhs_print (&rules[r], stderr);
+ }
}
fprintf (stderr, "\n\n");
}
-/*-------------------------------------------------------------------.
-| Set FIRSTS to be an NVARS by NVARS bit matrix indicating which |
-| items can represent the beginning of the input corresponding to |
-| which other items. |
-| |
-| For example, if some rule expands symbol 5 into the sequence of |
-| symbols 8 3 20, the symbol 8 can be the beginning of the data for |
-| symbol 5, so the bit [8 - ntokens, 5 - ntokens] in firsts is set. |
-`-------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
+| items can represent the beginning of the input corresponding to |
+| which other items. |
+| |
+| For example, if some rule expands symbol 5 into the sequence of |
+| symbols 8 3 20, the symbol 8 can be the beginning of the data for |
+| symbol 5, so the bit [8 - ntokens] in first[5 - ntokens] (= FIRST |
+| (5)) is set. |
+`------------------------------------------------------------------*/
static void
set_firsts (void)
{
- int rowsize;
-
- int i, j;
-
- varsetsize = rowsize = WORDSIZE (nvars);
+ symbol_number i, j;
- firsts = XCALLOC (unsigned, nvars * rowsize);
+ firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);
for (i = ntokens; i < nsyms; i++)
- for (j = 0; derives[i][j] >= 0; ++j)
+ for (j = 0; derives[i - ntokens][j]; ++j)
{
- int symbol = ritem[rule_table[derives[i][j]].rhs];
- if (ISVAR (symbol))
- {
- symbol -= ntokens;
- SETBIT (FIRSTS (i - ntokens), symbol);
- }
+ item_number sym = derives[i - ntokens][j]->rhs[0];
+ if (ISVAR (sym))
+ bitset_set (FIRSTS (i), sym - ntokens);
}
- RTC (firsts, nvars);
+ if (trace_flag & trace_sets)
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
+ bitsetv_reflexive_transitive_closure (firsts);
+ if (trace_flag & trace_sets)
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_firsts ();
}
@@ -153,61 +157,33 @@ set_firsts (void)
static void
set_fderives (void)
{
- unsigned *rrow;
- unsigned *vrow;
- int j;
- unsigned cword;
- short *rp;
- int b;
-
- int ruleno;
- int i;
+ symbol_number i, j;
+ rule_number k;
- fderives = XCALLOC (unsigned, nvars * rulesetsize) - ntokens * rulesetsize;
+ fderives = bitsetv_create (nvars, nrules, BITSET_FIXED);
set_firsts ();
- rrow = FDERIVES (ntokens);
-
- for (i = ntokens; i < nsyms; i++)
- {
- vrow = FIRSTS (i - ntokens);
- cword = *vrow++;
- b = 0;
- for (j = ntokens; j < nsyms; j++)
- {
- if (cword & (1 << b))
- {
- rp = derives[j];
- while ((ruleno = *rp++) > 0)
- SETBIT (rrow, ruleno);
- }
-
- b++;
- if (b >= BITS_PER_WORD && j + 1 < nsyms)
- {
- cword = *vrow++;
- b = 0;
- }
- }
+ for (i = ntokens; i < nsyms; ++i)
+ for (j = ntokens; j < nsyms; ++j)
+ if (bitset_test (FIRSTS (i), j - ntokens))
+ for (k = 0; derives[j - ntokens][k]; ++k)
+ bitset_set (FDERIVES (i), derives[j - ntokens][k]->number);
- rrow += rulesetsize;
- }
-
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_fderives ();
- XFREE (firsts);
+ bitsetv_free (firsts);
}
+
void
-new_closure (int n)
+new_closure (unsigned int n)
{
- itemset = XCALLOC (short, n);
+ itemset = xnmalloc (n, sizeof *itemset);
- rulesetsize = WORDSIZE (nrules + 1);
- ruleset = XCALLOC (unsigned, rulesetsize);
+ ruleset = bitset_create (nrules, BITSET_FIXED);
set_fderives ();
}
@@ -215,73 +191,58 @@ new_closure (int n)
void
-closure (short *core, int n)
+closure (item_number *core, size_t n)
{
/* Index over CORE. */
- int c;
-
- /* Index over RULESET. */
- int r;
+ size_t c;
/* A bit index over RULESET. */
- int ruleno;
+ rule_number ruleno;
- if (trace_flag)
- {
- fprintf (stderr, "Entering closure (items = {");
- for (c = 0; c < n; ++c)
- fprintf (stderr, " %d ", core[c]);
- fprintf (stderr, "})\n");
- }
+ bitset_iterator iter;
- if (n == 0)
- {
- for (r = 0; r < rulesetsize; ++r)
- ruleset[r] = FDERIVES (start_symbol)[r];
- }
- else
- {
- for (r = 0; r < rulesetsize; ++r)
- ruleset[r] = 0;
+ if (trace_flag & trace_sets)
+ print_closure ("input", core, n);
- for (c = 0; c < n; ++c)
- if (ISVAR (ritem[core[c]]))
- for (r = 0; r < rulesetsize; ++r)
- ruleset[r] |= FDERIVES (ritem[core[c]])[r];
- }
+ bitset_zero (ruleset);
+
+ for (c = 0; c < n; ++c)
+ if (ISVAR (ritem[core[c]]))
+ bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
- itemsetsize = 0;
+ /* core is sorted on item index in ritem, which is sorted on rule number.
+ Compute itemset with the same sort. */
+ nitemset = 0;
c = 0;
- for (ruleno = 0; ruleno < rulesetsize * BITS_PER_WORD; ++ruleno)
- if (BITISSET (ruleset, ruleno))
- {
- int itemno = rule_table[ruleno].rhs;
- while (c < n && core[c] < itemno)
- {
- itemset[itemsetsize] = core[c];
- itemsetsize++;
- c++;
- }
- itemset[itemsetsize] = itemno;
- itemsetsize++;
- }
+ BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
+ {
+ item_number itemno = rules[ruleno].rhs - ritem;
+ while (c < n && core[c] < itemno)
+ {
+ itemset[nitemset] = core[c];
+ nitemset++;
+ c++;
+ }
+ itemset[nitemset] = itemno;
+ nitemset++;
+ };
while (c < n)
{
- itemset[itemsetsize] = core[c];
- itemsetsize++;
+ itemset[nitemset] = core[c];
+ nitemset++;
c++;
}
- if (trace_flag)
- print_closure (n);
+ if (trace_flag & trace_sets)
+ print_closure ("output", itemset, nitemset);
}
void
free_closure (void)
{
- XFREE (itemset);
- XFREE (ruleset);
- XFREE (fderives + ntokens * rulesetsize);
+ free (itemset);
+ bitset_free (ruleset);
+ bitsetv_free (fderives);
}