X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/427c0dda0c9fb207d8abdd92e3f77f91af9b682d..63951be29fcb8e21146a9377176d53d509c575ca:/src/closure.c
diff --git a/src/closure.c b/src/closure.c
index 3d5ac28d..d9bc5ffa 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,38 +1,40 @@
-/* Subroutines for bison
- Copyright (C) 1984, 1989, 2000, 2001, 2002 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 "quotearg.h"
-#include "bitset.h"
-#include "bitsetv.h"
-#include "bitsetv-print.h"
+
+#include
+#include
+#include
+
+#include "closure.h"
+#include "derives.h"
#include "getargs.h"
-#include "symtab.h"
#include "gram.h"
#include "reader.h"
-#include "closure.h"
-#include "derives.h"
+#include "symtab.h"
/* NITEMSET is the size of the array ITEMSET. */
-item_number_t *itemset;
-int nritemset;
+item_number *itemset;
+size_t nitemset;
static bitset ruleset;
@@ -50,13 +52,13 @@ static bitsetv firsts = NULL;
`-----------------*/
static void
-print_closure (const char *title, item_number_t *array, size_t size)
+print_closure (char const *title, item_number *array, size_t size)
{
size_t i;
fprintf (stderr, "Closure: %s\n", title);
for (i = 0; i < size; ++i)
{
- item_number_t *rp;
+ item_number *rp;
fprintf (stderr, " %2d: .", array[i]);
for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
fprintf (stderr, " %s", symbols[*rp]->tag);
@@ -69,7 +71,7 @@ print_closure (const char *title, item_number_t *array, size_t size)
static void
print_firsts (void)
{
- symbol_number_t i, j;
+ symbol_number i, j;
fprintf (stderr, "FIRSTS\n");
for (i = ntokens; i < nsyms; i++)
@@ -90,7 +92,7 @@ static void
print_fderives (void)
{
int i;
- rule_number_t r;
+ rule_number r;
fprintf (stderr, "FDERIVES\n");
for (i = ntokens; i < nsyms; i++)
@@ -120,16 +122,16 @@ print_fderives (void)
static void
set_firsts (void)
{
- symbol_number_t i, j;
+ symbol_number i, j;
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)
{
- int symbol = derives[i][j]->rhs[0];
- if (ISVAR (symbol))
- bitset_set (FIRSTS (i), symbol - ntokens);
+ item_number sym = derives[i - ntokens][j]->rhs[0];
+ if (ISVAR (sym))
+ bitset_set (FIRSTS (i), sym - ntokens);
}
if (trace_flag & trace_sets)
@@ -155,8 +157,8 @@ set_firsts (void)
static void
set_fderives (void)
{
- symbol_number_t i, j;
- rule_number_t k;
+ symbol_number i, j;
+ rule_number k;
fderives = bitsetv_create (nvars, nrules, BITSET_FIXED);
@@ -165,8 +167,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 ();
@@ -177,9 +179,9 @@ set_fderives (void)
void
-new_closure (int n)
+new_closure (unsigned int n)
{
- itemset = XCALLOC (item_number_t, n);
+ itemset = xnmalloc (n, sizeof *itemset);
ruleset = bitset_create (nrules, BITSET_FIXED);
@@ -189,13 +191,13 @@ new_closure (int n)
void
-closure (item_number_t *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_t ruleno;
+ rule_number ruleno;
bitset_iterator iter;
@@ -208,37 +210,39 @@ closure (item_number_t *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_t itemno = rules[ruleno].rhs - ritem;
+ 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);
}