Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/conflicts.c (set_conflicts): Use bitset_disjoint_p.

Browse Source 
(count_sr_conflicts): Use bitset_count.
* src/reduce.c (inaccessable_symbols): Ditto.
(bits_size): Remove.
* src/warshall.h, src/warshall.c: Convert to bitsetv.
This commit is contained in:
Akim Demaille
2002-03-04 13:58:05 +00:00
parent f0250de62e
commit 914feea9d0
9 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/closure.c
View File

@@ -1,5 +1,5 @@
/* 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.
@@ -19,13 +19,14 @@
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 "bitset.h"
#include "warshall.h"
/* NITEMSET is the size of the array ITEMSET. */
@@ -35,8 +36,8 @@ int nitemset;
static bitset ruleset;
/* internal data. See comments before set_fderives and set_firsts. */
static bitset *fderives = NULL;
static bitset *firsts = NULL;
static bitsetv fderives = NULL;
static bitsetv firsts = NULL;
/* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var. */
#define FDERIVES(Var) fderives[(Var) - ntokens]
@@ -120,19 +121,17 @@ set_firsts (void)
{
int i, j;
firsts = XCALLOC (bitset, nvars);
for (i = ntokens; i < nsyms; i++)
{
FIRSTS (i) = bitset_create (nvars, BITSET_FIXED);
for (j = 0; derives[i][j] >= 0; ++j)
{
int symbol = ritem[rules[derives[i][j]].rhs];
if (ISVAR (symbol))
bitset_set (FIRSTS (i), symbol - ntokens);
}
}
firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);
RTC (firsts, nvars);
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))
bitset_set (FIRSTS (i), symbol - ntokens);
}
RTC (firsts);
if (trace_flag)
print_firsts ();
@@ -153,10 +152,7 @@ set_fderives (void)
{
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);
fderives = bitsetv_create (nvars, nrules + 1, BITSET_FIXED);
set_firsts ();
@@ -169,9 +165,7 @@ set_fderives (void)
if (trace_flag)
print_fderives ();
for (i = ntokens; i < nsyms; ++i)
bitset_free (FIRSTS (i));
XFREE (firsts);
bitsetv_free (firsts);
}
@@ -246,12 +240,7 @@ closure (short *core, int n)
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);
}