X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fb9c0b3360928887038a296c338025ced68e2d8c..75ae8299840bbd854fa2474d38402bbb933c6511:/src/closure.c
diff --git a/src/closure.c b/src/closure.c
index 8652a22b..45e83110 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,31 +1,29 @@
/* Closures for Bison
- Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2013 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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
#include
#include
#include
-#include
#include "closure.h"
#include "derives.h"
@@ -36,7 +34,7 @@
/* NITEMSET is the size of the array ITEMSET. */
item_number *itemset;
-size_t nritemset;
+size_t nitemset;
static bitset ruleset;
@@ -46,7 +44,7 @@ static bitsetv firsts = NULL;
/* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var. */
#define FDERIVES(Var) fderives[(Var) - ntokens]
-#define FIRSTS(Var) firsts[(Var) - ntokens]
+#define FIRSTS(Var) firsts[(Var) - ntokens]
/*-----------------.
@@ -54,7 +52,7 @@ static bitsetv firsts = NULL;
`-----------------*/
static void
-print_closure (char const *title, item_number *array, size_t size)
+print_closure (char const *title, item_number const *array, size_t size)
{
size_t i;
fprintf (stderr, "Closure: %s\n", title);
@@ -63,7 +61,7 @@ print_closure (char const *title, item_number *array, size_t size)
item_number *rp;
fprintf (stderr, " %2d: .", array[i]);
for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
- fprintf (stderr, " %s", symbols[*rp]->tag);
+ fprintf (stderr, " %s", symbols[*rp]->tag);
fprintf (stderr, " (rule %d)\n", -*rp - 1);
}
fputs ("\n\n", stderr);
@@ -75,18 +73,15 @@ print_firsts (void)
{
symbol_number i, j;
- fputs ("FIRSTS\n", stderr);
+ fprintf (stderr, "FIRSTS\n");
for (i = ntokens; i < nsyms; i++)
{
bitset_iterator iter;
- fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
+ fprintf (stderr, " %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, " %s\n", symbols[j + ntokens]->tag);
}
- fputs ("\n\n", stderr);
+ fprintf (stderr, "\n\n");
}
@@ -96,18 +91,19 @@ print_fderives (void)
int i;
rule_number r;
- fputs ("FDERIVES\n", stderr);
+ fprintf (stderr, "FDERIVES\n");
for (i = ntokens; i < nsyms; i++)
{
bitset_iterator iter;
- fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+ fprintf (stderr, " %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, " %3d ", r);
+ rule_rhs_print (&rules[r], stderr);
+ fprintf (stderr, "\n");
+ }
}
- fputs ("\n\n", stderr);
+ fprintf (stderr, "\n\n");
}
/*------------------------------------------------------------------.
@@ -131,9 +127,9 @@ set_firsts (void)
for (i = ntokens; i < nsyms; i++)
for (j = 0; derives[i - ntokens][j]; ++j)
{
- item_number sym = derives[i - ntokens][j]->rhs[0];
- if (ISVAR (sym))
- bitset_set (FIRSTS (i), sym - ntokens);
+ item_number sym = derives[i - ntokens][j]->rhs[0];
+ if (ISVAR (sym))
+ bitset_set (FIRSTS (i), sym - ntokens);
}
if (trace_flag & trace_sets)
@@ -169,8 +165,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 - ntokens][k]; ++k)
- bitset_set (FDERIVES (i), derives[j - ntokens][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 ();
@@ -193,7 +189,7 @@ new_closure (unsigned int n)
void
-closure (item_number *core, size_t n)
+closure (item_number const *core, size_t n)
{
/* Index over CORE. */
size_t c;
@@ -212,30 +208,32 @@ closure (item_number *core, size_t 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++;
- c++;
- }
- itemset[nritemset] = itemno;
- nritemset++;
+ {
+ itemset[nitemset] = core[c];
+ nitemset++;
+ c++;
+ }
+ 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);
}