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

(bitset_bytes, bitset_alloc, bitset_obstack_alloc):

Browse Source 
Use size_t, not unsigned int, to count bytes.

(bitset_print): Use proper printf format for bitset types.

(bitset_next, bitset_prev, bitset_first, bitset_last):
Return BITSET_BINDEX_MAX (not -1) for no value,
since we now return the bitset_bindex type (not int).
This commit is contained in:
Paul Eggert
2002-10-02 07:45:37 +00:00
parent f6ebdb3174
commit d32fe6f64f
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/bitset.c
View File

@@ -35,12 +35,12 @@ static void bitset_print PARAMS ((FILE *, bitset, int));
/* Return number of bytes required to create a N_BIT bitset /* Return number of bytes required to create a N_BIT bitset
of TYPE. The bitset may grow to require more bytes than this. */ of TYPE. The bitset may grow to require more bytes than this. */
int size_t
bitset_bytes (type, n_bits) bitset_bytes (type, n_bits)
enum bitset_type type; enum bitset_type type;
bitset_bindex n_bits; bitset_bindex n_bits;
{ {
unsigned int bytes; size_t bytes;
if (bitset_stats_enabled) if (bitset_stats_enabled)
return bitset_stats_bytes (); return bitset_stats_bytes ();
@@ -132,7 +132,7 @@ bitset_alloc (n_bits, type)
bitset_bindex n_bits; bitset_bindex n_bits;
enum bitset_type type; enum bitset_type type;
{ {
unsigned int bytes; size_t bytes;
bitset bset; bitset bset;
bytes = bitset_bytes (type, n_bits); bytes = bitset_bytes (type, n_bits);
@@ -154,7 +154,7 @@ bitset_obstack_alloc (bobstack, n_bits, type)
bitset_bindex n_bits; bitset_bindex n_bits;
enum bitset_type type; enum bitset_type type;
{ {
unsigned int bytes; size_t bytes;
bitset bset; bitset bset;
bytes = bitset_bytes (type, n_bits); bytes = bitset_bytes (type, n_bits);
@@ -229,8 +229,8 @@ bitset_type_name_get (bset)
/* Find next bit set in SRC starting from and including BITNO. /* Find next bit set in SRC starting from and including BITNO.
Return -1 if SRC empty. */ Return BITSET_BINDEX_MAX if SRC empty. */
int bitset_bindex
bitset_next (src, bitno) bitset_next (src, bitno)
bitset src; bitset src;
bitset_bindex bitno; bitset_bindex bitno;
@@ -239,14 +239,14 @@ bitset_next (src, bitno)
bitset_bindex next = bitno; bitset_bindex next = bitno;
if (!bitset_list (src, &val, 1, &next)) if (!bitset_list (src, &val, 1, &next))
return -1; return BITSET_BINDEX_MAX;
return val; return val;
} }
/* Find previous bit set in SRC starting from and including BITNO. /* Find previous bit set in SRC starting from and including BITNO.
Return -1 if SRC empty. */ Return BITSET_BINDEX_MAX if SRC empty. */
int bitset_bindex
bitset_prev (src, bitno) bitset_prev (src, bitno)
bitset src; bitset src;
bitset_bindex bitno; bitset_bindex bitno;
@@ -255,13 +255,13 @@ bitset_prev (src, bitno)
bitset_bindex next = bitno; bitset_bindex next = bitno;
if (!bitset_list_reverse (src, &val, 1, &next)) if (!bitset_list_reverse (src, &val, 1, &next))
return -1; return BITSET_BINDEX_MAX;
return val; return val;
} }
/* Find first set bit. */ /* Find first set bit. */
int bitset_bindex
bitset_first (src) bitset_first (src)
bitset src; bitset src;
{ {
@@ -270,7 +270,7 @@ bitset_first (src)
/* Find last set bit. */ /* Find last set bit. */
int bitset_bindex
bitset_last (src) bitset_last (src)
bitset src; bitset src;
{ {
@@ -305,7 +305,8 @@ bitset_print (file, bset, verbose)
bitset_iterator iter; bitset_iterator iter;
if (verbose) if (verbose)
fprintf (file, "n_bits = %d, set = {", bitset_size (bset)); fprintf (file, "n_bits = %lu, set = {",
(unsigned long) bitset_size (bset));
pos = 30; pos = 30;
BITSET_FOR_EACH (iter, bset, i, 0) BITSET_FOR_EACH (iter, bset, i, 0)
@@ -368,14 +369,14 @@ bitset_toggle_ (bset, bitno)
/* Return number of bits set in bitset SRC. */ /* Return number of bits set in bitset SRC. */
int bitset_bindex
bitset_count_ (src) bitset_count_ (src)
bitset src; bitset src;
{ {
bitset_bindex list[BITSET_LIST_SIZE]; bitset_bindex list[BITSET_LIST_SIZE];
bitset_bindex next; bitset_bindex next;
int num; bitset_bindex num;
int count; bitset_bindex count;
/* This could be greatly sped up by adding a count method for each /* This could be greatly sped up by adding a count method for each
bitset implementation that uses a direct technique (based on bitset implementation that uses a direct technique (based on