Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-17 16:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(bitset_set, bitset_reset): Do not assume that bitset_word is the same

Browse Source 
width as int.
This commit is contained in:
Paul Eggert
2002-08-12 14:19:02 +00:00
parent c131cbff03
commit e601ff27f4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bitset.h
View File

@@ -107,7 +107,7 @@ static inline void bitset_set (bset, bitno)
bitset_windex offset = index - bset->b.cindex; bitset_windex offset = index - bset->b.cindex;
if (offset < bset->b.csize) if (offset < bset->b.csize)
bset->b.cdata[offset] |= (1 << (bitno % BITSET_WORD_BITS)); bset->b.cdata[offset] |= ((bitset_word) 1 << (bitno % BITSET_WORD_BITS));
else else
BITSET_SET_ (bset, bitno); BITSET_SET_ (bset, bitno);
} }
@@ -122,7 +122,7 @@ static inline void bitset_reset (bset, bitno)
bitset_windex offset = index - bset->b.cindex; bitset_windex offset = index - bset->b.cindex;
if (offset < bset->b.csize) if (offset < bset->b.csize)
bset->b.cdata[offset] &= ~(1 << (bitno % BITSET_WORD_BITS)); bset->b.cdata[offset] &= ~((bitset_word) 1 << (bitno % BITSET_WORD_BITS));
else else
BITSET_RESET_ (bset, bitno); BITSET_RESET_ (bset, bitno);
} }
@@ -154,7 +154,8 @@ do \
bitset_windex _offset = _index - (bset)->b.cindex; \ bitset_windex _offset = _index - (bset)->b.cindex; \
\ \
if (_offset < (bset)->b.csize) \ if (_offset < (bset)->b.csize) \
(bset)->b.cdata[_offset] |= (1 << (_bitno % BITSET_WORD_BITS)); \ (bset)->b.cdata[_offset] |= \
((bitset_word) 1 << (_bitno % BITSET_WORD_BITS)); \
else \ else \
BITSET_SET_ ((bset), _bitno); \ BITSET_SET_ ((bset), _bitno); \
} while (0) } while (0)
@@ -169,7 +170,8 @@ do \
bitset_windex _offset = _index - (bset)->b.cindex; \ bitset_windex _offset = _index - (bset)->b.cindex; \
\ \
if (_offset < (bset)->b.csize) \ if (_offset < (bset)->b.csize) \
(bset)->b.cdata[_offset] &= ~(1 << (_bitno % BITSET_WORD_BITS)); \ (bset)->b.cdata[_offset] &= \
~((bitset_word) 1 << (_bitno % BITSET_WORD_BITS)); \
else \ else \
BITSET_RESET_ ((bset), _bitno); \ BITSET_RESET_ ((bset), _bitno); \
} while (0) } while (0)
@@ -178,9 +180,11 @@ do \
/* Test bit BITNO in bitset BSET. */ /* Test bit BITNO in bitset BSET. */
#define bitset_test(bset, bitno) \ #define bitset_test(bset, bitno) \
(((((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex) < (bset)->b.csize) \ (((((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex) < (bset)->b.csize) \
? ((bset)->b.cdata[(((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex)] \ ? (((int) \
>> ((bitno) % BITSET_WORD_BITS)) & 1 \ ((bset)->b.cdata[(((bitno) / BITSET_WORD_BITS) - (bset)->b.cindex)] \
: (unsigned int) BITSET_TEST_ ((bset), (bitno))) >> ((bitno) % BITSET_WORD_BITS))) \
& 1) \
: BITSET_TEST_ ((bset), (bitno)))
#endif #endif