X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/643a5994714b21dfde1a44a52ccffd0a300e5131..6082531abb3dca4b2fc213844200ce7b13fc05c5:/src/closure.c
diff --git a/src/closure.c b/src/closure.c
index 9e595c81..ff3109ca 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,36 +1,41 @@
-/* Subroutines for bison
- Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Closures for Bison
+
+ 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 "bitset.h"
-#include "bitsetv.h"
+
+#include
+#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. */
-short *itemset;
-int nitemset;
+item_number *itemset;
+size_t nitemset;
static bitset ruleset;
@@ -48,13 +53,13 @@ static bitsetv firsts = NULL;
`-----------------*/
static void
-print_closure (const char *title, short *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)
{
- short *rp;
+ item_number *rp;
fprintf (stderr, " %2d: .", array[i]);
for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
fprintf (stderr, " %s", symbols[*rp]->tag);
@@ -67,16 +72,18 @@ print_closure (const char *title, short *array, size_t size)
static void
print_firsts (void)
{
- int i, j;
+ symbol_number i, j;
fprintf (stderr, "FIRSTS\n");
for (i = ntokens; i < nsyms; i++)
{
+ bitset_iterator iter;
fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
- for (j = 0; j < nvars; j++)
- if (bitset_test (FIRSTS (i), j))
- fprintf (stderr, "\t\t%d (%s)\n",
- j + ntokens, symbols[j + ntokens]->tag);
+ BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
+ {
+ fprintf (stderr, "\t\t%s\n",
+ symbols[j + ntokens]->tag);
+ }
}
fprintf (stderr, "\n\n");
}
@@ -85,72 +92,22 @@ print_firsts (void)
static void
print_fderives (void)
{
- int i, j;
+ int i;
+ rule_number r;
fprintf (stderr, "FDERIVES\n");
for (i = ntokens; i < nsyms; i++)
{
+ bitset_iterator iter;
fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
- for (j = 0; j < nrules + 1; j++)
- if (bitset_test (FDERIVES (i), j))
- {
- short *rhsp;
- fprintf (stderr, "\t\t%d:", j - 1);
- for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp)
- fprintf (stderr, " %s", symbols[*rhsp]->tag);
- fputc ('\n', stderr);
- }
+ BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
+ {
+ fprintf (stderr, "\t\t%3d ", r);
+ rule_rhs_print (&rules[r], stderr);
+ }
}
fprintf (stderr, "\n\n");
}
-
-/*--------------------------------------------------------.
-| Display the MATRIX array of SIZE bitsets of size SIZE. |
-`--------------------------------------------------------*/
-
-static void
-bitmatrix_print (const char *title, bitsetv matrix)
-{
- size_t i, j;
- size_t size = bitset_size (matrix[0]);
-
- /* Title. */
- fprintf (stderr, "%s BEGIN\n", title);
-
- /* Column numbers. */
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- putc (i / 10 ? '0' + i / 10 : ' ', stderr);
- putc ('\n', stderr);
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- fprintf (stderr, "%d", i % 10);
- putc ('\n', stderr);
-
- /* Bar. */
- fputs (" .", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs (".\n", stderr);
-
- /* Contents. */
- for (i = 0; i < size; ++i)
- {
- fprintf (stderr, "%2d|", i);
- for (j = 0; j < size; ++j)
- fputs (bitset_test (matrix[i], j) ? "1" : " ", stderr);
- fputs ("|\n", stderr);
- }
-
- /* Bar. */
- fputs (" `", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs ("'\n", stderr);
-
- /* End title. */
- fprintf (stderr, "%s END\n\n", title);
-}
/*------------------------------------------------------------------.
| Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
@@ -166,25 +123,25 @@ bitmatrix_print (const char *title, bitsetv matrix)
static void
set_firsts (void)
{
- int 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] >= 0; ++j)
+ for (j = 0; derives[i - ntokens][j]; ++j)
{
- int symbol = rules[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)
- bitmatrix_print ("RTC: Input", firsts);
+ if (trace_flag & trace_sets)
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
bitsetv_reflexive_transitive_closure (firsts);
- if (trace_flag)
- bitmatrix_print ("RTC: Output", firsts);
+ if (trace_flag & trace_sets)
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_firsts ();
}
@@ -201,31 +158,33 @@ set_firsts (void)
static void
set_fderives (void)
{
- int i, j, k;
+ symbol_number i, j;
+ rule_number k;
- fderives = bitsetv_create (nvars, nrules + 1, BITSET_FIXED);
+ fderives = bitsetv_create (nvars, nrules, BITSET_FIXED);
set_firsts ();
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] > 0; ++k)
- bitset_set (FDERIVES (i), derives[j][k]);
+ for (k = 0; derives[j - ntokens][k]; ++k)
+ bitset_set (FDERIVES (i), derives[j - ntokens][k]->number);
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_fderives ();
bitsetv_free (firsts);
}
+
void
-new_closure (int n)
+new_closure (unsigned int n)
{
- itemset = XCALLOC (short, n);
+ itemset = xnmalloc (n, sizeof *itemset);
- ruleset = bitset_create (nrules + 1, BITSET_FIXED);
+ ruleset = bitset_create (nrules, BITSET_FIXED);
set_fderives ();
}
@@ -233,15 +192,17 @@ new_closure (int n)
void
-closure (short *core, int n)
+closure (item_number *core, size_t n)
{
/* Index over CORE. */
- int c;
+ size_t c;
/* A bit index over RULESET. */
- int ruleno;
+ rule_number ruleno;
+
+ bitset_iterator iter;
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_closure ("input", core, n);
bitset_zero (ruleset);
@@ -250,21 +211,22 @@ closure (short *core, int n)
if (ISVAR (ritem[core[c]]))
bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
+ /* 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 < nrules + 1; ++ruleno)
- if (bitset_test (ruleset, ruleno))
- {
- int itemno = rules[ruleno].rhs - ritem;
- while (c < n && core[c] < itemno)
- {
- itemset[nitemset] = core[c];
- nitemset++;
- c++;
- }
- itemset[nitemset] = itemno;
- nitemset++;
- }
+ 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)
{
@@ -273,7 +235,7 @@ closure (short *core, int n)
c++;
}
- if (trace_flag)
+ if (trace_flag & trace_sets)
print_closure ("output", itemset, nitemset);
}
@@ -281,7 +243,7 @@ closure (short *core, int n)
void
free_closure (void)
{
- XFREE (itemset);
+ free (itemset);
bitset_free (ruleset);
bitsetv_free (fderives);
}