X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c7bd07f75a9ea65907924fa61bbb1e4a8cc025ad..09ccae9b18a7c09ebf7bb8df2a18c8c4a6def248:/src/closure.c
diff --git a/src/closure.c b/src/closure.c
index 618846dc..ff3109ca 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,24 +1,24 @@
/* Closures for Bison
- Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007 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
@@ -35,7 +35,7 @@
/* NITEMSET is the size of the array ITEMSET. */
item_number *itemset;
-int nritemset;
+size_t nitemset;
static bitset ruleset;
@@ -128,9 +128,9 @@ set_firsts (void)
firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);
for (i = ntokens; i < nsyms; i++)
- for (j = 0; derives[i][j]; ++j)
+ for (j = 0; derives[i - ntokens][j]; ++j)
{
- item_number sym = derives[i][j]->rhs[0];
+ item_number sym = derives[i - ntokens][j]->rhs[0];
if (ISVAR (sym))
bitset_set (FIRSTS (i), sym - ntokens);
}
@@ -168,8 +168,8 @@ set_fderives (void)
for (i = ntokens; i < nsyms; ++i)
for (j = ntokens; j < nsyms; ++j)
if (bitset_test (FIRSTS (i), j - ntokens))
- for (k = 0; derives[j][k]; ++k)
- bitset_set (FDERIVES (i), derives[j][k]->number);
+ for (k = 0; derives[j - ntokens][k]; ++k)
+ bitset_set (FDERIVES (i), derives[j - ntokens][k]->number);
if (trace_flag & trace_sets)
print_fderives ();
@@ -180,9 +180,9 @@ set_fderives (void)
void
-new_closure (int n)
+new_closure (unsigned int n)
{
- itemset = XCALLOC (item_number, n);
+ itemset = xnmalloc (n, sizeof *itemset);
ruleset = bitset_create (nrules, BITSET_FIXED);
@@ -192,10 +192,10 @@ new_closure (int n)
void
-closure (item_number *core, int n)
+closure (item_number *core, size_t n)
{
/* Index over CORE. */
- int c;
+ size_t c;
/* A bit index over RULESET. */
rule_number ruleno;
@@ -211,37 +211,39 @@ closure (item_number *core, int n)
if (ISVAR (ritem[core[c]]))
bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
- nritemset = 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;
BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
{
item_number itemno = rules[ruleno].rhs - ritem;
while (c < n && core[c] < itemno)
{
- itemset[nritemset] = core[c];
- nritemset++;
+ itemset[nitemset] = core[c];
+ nitemset++;
c++;
}
- itemset[nritemset] = itemno;
- nritemset++;
+ itemset[nitemset] = itemno;
+ nitemset++;
};
while (c < n)
{
- itemset[nritemset] = core[c];
- nritemset++;
+ itemset[nitemset] = core[c];
+ nitemset++;
c++;
}
if (trace_flag & trace_sets)
- print_closure ("output", itemset, nritemset);
+ print_closure ("output", itemset, nitemset);
}
void
free_closure (void)
{
- XFREE (itemset);
+ free (itemset);
bitset_free (ruleset);
bitsetv_free (fderives);
}