X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6aa452a643c65a8df244013e05d41854531ec762..500bbfcd816776d0ddbf3555fedd41b529c405b3:/lib/bitset.h diff --git a/lib/bitset.h b/lib/bitset.h index 7d794909..c659a2ce 100644 --- a/lib/bitset.h +++ b/lib/bitset.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _BITSET_H -#define _BITSET_H +#define _BITSET_H /* This file is the public interface to the bitset abstract data type. Only use the functions and macros defined in this file. */ @@ -36,12 +36,42 @@ enum bitset_attr {BITSET_FIXED = 1, /* Bitset size fixed. */ typedef unsigned int bitset_attrs; -/* The contents of the structure should be considered to be private. - While I would like to make this structure opaque, it needs to be - visible for the inline bit set/test functions. */ -struct bitset_struct +/* The contents of the union should be considered to be private. + While I would like to make this union opaque, it needs to be + visible for the inline bit set/test functions, and for delegation + to the proper implementation. */ +union bitset_union { + /* This must be the first member of every other structure that is a + member of this union. */ struct bbitset_struct b; + + struct abitset_struct + { + struct bbitset_struct b; + bitset_bindex n_bits; /* Number of bits. */ + bitset_word words[1]; /* The array of bits. */ + } a; + + struct ebitset_struct + { + struct bbitset_struct b; + bitset_windex size; /* Number of elements. */ + struct ebitset_elt_struct **elts; /* Expanding array of ptrs to elts. */ + } e; + + struct lbitset_struct + { + struct bbitset_struct b; + struct lbitset_elt_struct *head; /* First element in linked list. */ + struct lbitset_elt_struct *tail; /* Last element in linked list. */ + } l; + + struct bitset_stats_struct + { + struct bbitset_struct b; + bitset bset; + } s; }; @@ -51,13 +81,13 @@ typedef struct { bitset_bindex list[BITSET_LIST_SIZE]; bitset_bindex next; - int num; - int i; + bitset_bindex num; + bitset_bindex i; } bitset_iterator; /* Return bytes required for bitset of desired type and size. */ -extern int bitset_bytes PARAMS ((enum bitset_type, bitset_bindex)); +extern size_t bitset_bytes PARAMS ((enum bitset_type, bitset_bindex)); /* Initialise a bitset with desired type and size. */ extern bitset bitset_init PARAMS ((bitset, bitset_bindex, enum bitset_type)); @@ -90,19 +120,14 @@ extern enum bitset_type bitset_type_get PARAMS ((bitset)); /* Return bitset type name. */ extern const char *bitset_type_name_get PARAMS ((bitset)); -#if BITSET_INLINE -static inline void bitset_set PARAMS ((bitset, bitset_bindex)); -static inline void bitset_reset PARAMS ((bitset, bitset_bindex)); -static inline int bitset_test PARAMS ((bitset, bitset_bindex)); /* Set bit BITNO in bitset BSET. */ -static inline void bitset_set (bset, bitno) - bitset bset; - bitset_bindex bitno; +static inline void +bitset_set (bitset bset, bitset_bindex bitno) { - bitset_windex index = bitno / BITSET_WORD_BITS; - bitset_windex offset = index - bset->b.cindex; - + bitset_windex windex = bitno / BITSET_WORD_BITS; + bitset_windex offset = windex - bset->b.cindex; + if (offset < bset->b.csize) bset->b.cdata[offset] |= ((bitset_word) 1 << (bitno % BITSET_WORD_BITS)); else @@ -111,13 +136,12 @@ static inline void bitset_set (bset, bitno) /* Reset bit BITNO in bitset BSET. */ -static inline void bitset_reset (bset, bitno) - bitset bset; - bitset_bindex bitno; +static inline void +bitset_reset (bitset bset, bitset_bindex bitno) { - bitset_windex index = bitno / BITSET_WORD_BITS; - bitset_windex offset = index - bset->b.cindex; - + bitset_windex windex = bitno / BITSET_WORD_BITS; + bitset_windex offset = windex - bset->b.cindex; + if (offset < bset->b.csize) bset->b.cdata[offset] &= ~((bitset_word) 1 << (bitno % BITSET_WORD_BITS)); else @@ -126,60 +150,17 @@ static inline void bitset_reset (bset, bitno) /* Test bit BITNO in bitset BSET. */ -static inline int bitset_test (bset, bitno) - bitset bset; - bitset_bindex bitno; +static inline int +bitset_test (bitset bset, bitset_bindex bitno) { - bitset_windex index = bitno / BITSET_WORD_BITS; - bitset_windex offset = index - bset->b.cindex; - + bitset_windex windex = bitno / BITSET_WORD_BITS; + bitset_windex offset = windex - bset->b.cindex; + if (offset < bset->b.csize) return (bset->b.cdata[offset] >> (bitno % BITSET_WORD_BITS)) & 1; else return BITSET_TEST_ (bset, bitno); } -#endif - -#if ! BITSET_INLINE - -/* Set bit BITNO in bitset BSET. */ -#define bitset_set(bset, bitno) \ -do \ -{ \ - bitset_bindex _bitno = (bitno); \ - bitset_windex _index = _bitno / BITSET_WORD_BITS; \ - bitset_windex _offset = _index - (bset)->b.cindex; \ - \ - if (_offset < (bset)->b.csize) \ - (bset)->b.cdata[_offset] |= \ - ((bitset_word) 1 << (_bitno % BITSET_WORD_BITS)); \ - else \ - BITSET_SET_ ((bset), _bitno); \ -} while (0) - - -/* Reset bit BITNO in bitset BSET. */ -#define bitset_reset(bset, bitno) \ -do \ -{ \ - bitset_bindex _bitno = (bitno); \ - bitset_windex _index = _bitno / BITSET_WORD_BITS; \ - bitset_windex _offset = _index - (bset)->b.cindex; \ - \ - if (_offset < (bset)->b.csize) \ - (bset)->b.cdata[_offset] &= ~(1 << (_bitno % BITSET_WORD_BITS)); \ - else \ - BITSET_RESET_ ((bset), _bitno); \ -} while (0) - - -/* Test bit BITNO in bitset BSET. */ -#define bitset_test(bset, bitno) \ -(((((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex) < (bset)->b.csize) \ - ? ((bset)->b.cdata[(((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex)] \ - >> ((bitno) % BITSET_WORD_BITS)) & 1 \ - : (unsigned int) BITSET_TEST_ ((bset), (bitno))) -#endif /* Toggle bit BITNO in bitset BSET and return non-zero if now set. */ @@ -273,24 +254,33 @@ do \ #define bitset_or_and_cmp(DST, SRC1, SRC2, SRC3)\ BITSET_OR_AND_CMP_ (DST, SRC1, SRC2, SRC3) -/* Find list of up to NUM bits set in BSET starting from and including +/* Find list of up to NUM bits set in BSET starting from and including *NEXT. Return with actual number of bits found and with *NEXT indicating where search stopped. */ #define bitset_list(BSET, LIST, NUM, NEXT) \ - BITSET_LIST_ (BSET, LIST, NUM, NEXT) + BITSET_LIST_ (BSET, LIST, NUM, NEXT) /* Find reverse list of up to NUM bits set in BSET starting from and including NEXT. Return with actual number of bits found and with *NEXT indicating where search stopped. */ #define bitset_list_reverse(BSET, LIST, NUM, NEXT) \ - BITSET_LIST_REVERSE_ (BSET, LIST, NUM, NEXT) + BITSET_LIST_REVERSE_ (BSET, LIST, NUM, NEXT) + +/* Find next set bit. */ +extern bitset_bindex bitset_next PARAMS ((bitset, bitset_bindex)); + +/* Find previous set bit. */ +extern bitset_bindex bitset_prev PARAMS ((bitset, bitset_bindex)); /* Find first set bit. */ -extern int bitset_first PARAMS ((bitset)); +extern bitset_bindex bitset_first PARAMS ((bitset)); /* Find last set bit. */ -extern int bitset_last PARAMS ((bitset)); +extern bitset_bindex bitset_last PARAMS ((bitset)); + +/* Return nonzero if this is the only set bit. */ +extern int bitset_only_set_p PARAMS ((bitset, bitset_bindex)); /* Dump bitset. */ extern void bitset_dump PARAMS ((FILE *, bitset)); @@ -312,12 +302,12 @@ extern void bitset_dump PARAMS ((FILE *, bitset)); for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE; \ (ITER.num == BITSET_LIST_SIZE) \ && (ITER.num = bitset_list (BSET, ITER.list, \ - BITSET_LIST_SIZE, &ITER.next));) \ + BITSET_LIST_SIZE, &ITER.next));) \ for (ITER.i = 0; (BIT) = ITER.list[ITER.i], ITER.i < ITER.num; ITER.i++) /* Loop over all elements of BSET, in reverse order starting with - MIN, setting BIT to the index of each set bit. For example, the + MIN, setting BIT to the index of each set bit. For example, the following will print the bits set in a bitset in reverse order: bitset_bindex i; @@ -333,30 +323,30 @@ extern void bitset_dump PARAMS ((FILE *, bitset)); for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE; \ (ITER.num == BITSET_LIST_SIZE) \ && (ITER.num = bitset_list_reverse (BSET, ITER.list, \ - BITSET_LIST_SIZE, &ITER.next));) \ + BITSET_LIST_SIZE, &ITER.next));) \ for (ITER.i = 0; (BIT) = ITER.list[ITER.i], ITER.i < ITER.num; ITER.i++) /* Define set operations in terms of logical operations. */ -#define bitset_diff(DST, SRC1, SRC2) bitset_andn (DST, SRC1, SRC2) -#define bitset_diff_cmp(DST, SRC1, SRC2) bitset_andn_cmp (DST, SRC1, SRC2) +#define bitset_diff(DST, SRC1, SRC2) bitset_andn (DST, SRC1, SRC2) +#define bitset_diff_cmp(DST, SRC1, SRC2) bitset_andn_cmp (DST, SRC1, SRC2) -#define bitset_intersection(DST, SRC1, SRC2) bitset_and (DST, SRC1, SRC2) -#define bitset_intersection_cmp(DST, SRC1, SRC2) bitset_and_cmp (DST, SRC1, SRC2) +#define bitset_intersection(DST, SRC1, SRC2) bitset_and (DST, SRC1, SRC2) +#define bitset_intersection_cmp(DST, SRC1, SRC2) bitset_and_cmp (DST, SRC1, SRC2) -#define bitset_union(DST, SRC1, SRC2) bitset_or (DST, SRC1, SRC2) -#define bitset_union_cmp(DST, SRC1, SRC2) bitset_or_cmp (DST, SRC1, SRC2) +#define bitset_union(DST, SRC1, SRC2) bitset_or (DST, SRC1, SRC2) +#define bitset_union_cmp(DST, SRC1, SRC2) bitset_or_cmp (DST, SRC1, SRC2) /* Symmetrical difference. */ -#define bitset_symdiff(DST, SRC1, SRC2) bitset_xor (DST, SRC1, SRC2) -#define bitset_symdiff_cmp(DST, SRC1, SRC2) bitset_xor_cmp (DST, SRC1, SRC2) +#define bitset_symdiff(DST, SRC1, SRC2) bitset_xor (DST, SRC1, SRC2) +#define bitset_symdiff_cmp(DST, SRC1, SRC2) bitset_xor_cmp (DST, SRC1, SRC2) /* Union of difference. */ #define bitset_diff_union(DST, SRC1, SRC2, SRC3) \ - bitset_andn_or (DST, SRC1, SRC2, SRC3) + bitset_andn_or (DST, SRC1, SRC2, SRC3) #define bitset_diff_union_cmp(DST, SRC1, SRC2, SRC3) \ - bitset_andn_or_cmp (DST, SRC1, SRC2, SRC3) + bitset_andn_or_cmp (DST, SRC1, SRC2, SRC3)