/* Subroutines for bison
- Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
02111-1307, USA. */
#include "system.h"
+#include "bitset.h"
+#include "bitsetv.h"
#include "getargs.h"
#include "symtab.h"
#include "gram.h"
#include "reader.h"
#include "closure.h"
#include "derives.h"
-#include "warshall.h"
-#include "bitset.h"
/* NITEMSET is the size of the array ITEMSET. */
short *itemset;
static bitset ruleset;
/* internal data. See comments before set_fderives and set_firsts. */
-static bitset *fderives;
-static unsigned int *firsts;
+static bitsetv fderives = NULL;
+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) * varsetsize)
-
-/* number of words required to hold a bit for each variable */
-static int varsetsize;
+#define FIRSTS(Var) firsts[(Var) - ntokens]
\f
/*-----------------.
{
fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
for (j = 0; j < nvars; j++)
- if (BITISSET (FIRSTS (i), j))
+ if (bitset_test (FIRSTS (i), j))
fprintf (stderr, "\t\t%d (%s)\n",
j + ntokens, symbols[j + ntokens]->tag);
}
static void
print_fderives (void)
{
- int i;
- int j;
+ int i, j;
fprintf (stderr, "FDERIVES\n");
-
for (i = ntokens; i < nsyms; i++)
{
fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
}
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);
+}
\f
-/*-------------------------------------------------------------------.
-| 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 i, j;
- varsetsize = WORDSIZE (nvars);
-
- firsts = XCALLOC (unsigned, nvars * varsetsize);
+ firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);
for (i = ntokens; i < nsyms; i++)
for (j = 0; derives[i][j] >= 0; ++j)
{
int symbol = ritem[rules[derives[i][j]].rhs];
if (ISVAR (symbol))
- SETBIT (FIRSTS (i), symbol - ntokens);
+ bitset_set (FIRSTS (i), symbol - ntokens);
}
- RTC (firsts, nvars);
+ if (trace_flag)
+ bitmatrix_print ("RTC: Input", firsts);
+ bitsetv_reflexive_transitive_closure (firsts);
+ if (trace_flag)
+ bitmatrix_print ("RTC: Output", firsts);
if (trace_flag)
print_firsts ();
{
int i, j, k;
- fderives = XCALLOC (bitset, nvars);
- bitset_stats_init ();
- for (i = 0 ; i < nvars; ++i)
- {
- fderives[i] = bitset_create (nrules + 1, BITSET_FIXED);
- bitset_zero (fderives[i]);
- }
+ fderives = bitsetv_create (nvars, nrules + 1, BITSET_FIXED);
set_firsts ();
for (i = ntokens; i < nsyms; ++i)
for (j = ntokens; j < nsyms; ++j)
- if (BITISSET (FIRSTS (i), j - ntokens))
+ if (bitset_test (FIRSTS (i), j - ntokens))
for (k = 0; derives[j][k] > 0; ++k)
bitset_set (FDERIVES (i), derives[j][k]);
if (trace_flag)
print_fderives ();
- XFREE (firsts);
+ bitsetv_free (firsts);
}
\f
itemset = XCALLOC (short, n);
ruleset = bitset_create (nrules + 1, BITSET_FIXED);
- bitset_zero (ruleset);
set_fderives ();
}
/* Index over CORE. */
int c;
- /* An index over RULESET. */
- int r;
-
/* A bit index over RULESET. */
int ruleno;
void
free_closure (void)
{
- int i;
XFREE (itemset);
-
bitset_free (ruleset);
-
- for (i = 0 ; i < nvars; ++i)
- bitset_free (fderives[i]);
- free (fderives);
+ bitsetv_free (fderives);
}
projects / bison.git / blobdiff