+2020-11-29 Akim Demaille <akim@lrde.epita.fr>
+
+ bitset: style: use consistent names
+ * bitset/list.c (lbitset_list_reverse): Rename 'bcount' as 'bitcnt',
+ and 'boffset' as 'bitoff', for consistency with the other
+ implementations.
+ * bitset/table.c (tbitset_list_reverse): Likewise.
+
2020-11-29 Akim Demaille <akim@lrde.epita.fr>
bitset: style: sort header
if (!elt)
return 0;
- unsigned bcount;
+ unsigned bitcnt;
if (windex >= elt->index + LBITSET_ELT_WORDS)
{
/* We are trying to start in no-mans land so start
at end of current elt. */
- bcount = BITSET_WORD_BITS - 1;
+ bitcnt = BITSET_WORD_BITS - 1;
windex = elt->index + LBITSET_ELT_WORDS - 1;
}
else
{
- bcount = bitno % BITSET_WORD_BITS;
+ bitcnt = bitno % BITSET_WORD_BITS;
}
bitset_bindex count = 0;
- bitset_bindex boffset = windex * BITSET_WORD_BITS;
+ bitset_bindex bitoff = windex * BITSET_WORD_BITS;
/* If num is 1, we could speed things up with a binary search
of the word of interest. */
bitset_word *srcp = elt->words;
for (; (windex - elt->index) < LBITSET_ELT_WORDS;
- windex--, boffset -= BITSET_WORD_BITS,
- bcount = BITSET_WORD_BITS - 1)
+ windex--, bitoff -= BITSET_WORD_BITS,
+ bitcnt = BITSET_WORD_BITS - 1)
{
bitset_word word =
- srcp[windex - elt->index] << (BITSET_WORD_BITS - 1 - bcount);
+ srcp[windex - elt->index] << (BITSET_WORD_BITS - 1 - bitcnt);
- for (; word; bcount--)
+ for (; word; bitcnt--)
{
if (word & BITSET_MSB)
{
- list[count++] = boffset + bcount;
+ list[count++] = bitoff + bitcnt;
if (count >= num)
{
- *next = n_bits - (boffset + bcount);
+ *next = n_bits - (bitoff + bitcnt);
return count;
}
}
if (elt)
{
windex = elt->index + LBITSET_ELT_WORDS - 1;
- boffset = windex * BITSET_WORD_BITS;
+ bitoff = windex * BITSET_WORD_BITS;
}
}
- *next = n_bits - (boffset + 1);
+ *next = n_bits - (bitoff + 1);
return count;
}
/* If num is 1, we could speed things up with a binary search
of the word of interest. */
bitset_bindex count = 0;
- unsigned bcount = bitno % BITSET_WORD_BITS;
- bitset_bindex boffset = windex * BITSET_WORD_BITS;
+ unsigned bitcnt = bitno % BITSET_WORD_BITS;
+ bitset_bindex bitoff = windex * BITSET_WORD_BITS;
do
{
do
{
- for (bitset_word word = srcp[woffset] << (BITSET_WORD_BITS - 1 - bcount);
- word; bcount--)
+ for (bitset_word word = srcp[woffset] << (BITSET_WORD_BITS - 1 - bitcnt);
+ word; bitcnt--)
{
if (word & BITSET_MSB)
{
- list[count++] = boffset + bcount;
+ list[count++] = bitoff + bitcnt;
if (count >= num)
{
- *next = n_bits - (boffset + bcount);
+ *next = n_bits - (bitoff + bitcnt);
return count;
}
}
word <<= 1;
}
- boffset -= BITSET_WORD_BITS;
- bcount = BITSET_WORD_BITS - 1;
+ bitoff -= BITSET_WORD_BITS;
+ bitcnt = BITSET_WORD_BITS - 1;
}
while (woffset--);
}
woffset = TBITSET_ELT_WORDS - 1;
- boffset = eindex * TBITSET_ELT_BITS - BITSET_WORD_BITS;
+ bitoff = eindex * TBITSET_ELT_BITS - BITSET_WORD_BITS;
}
while (eindex--);
- *next = n_bits - (boffset + 1);
+ *next = n_bits - (bitoff + 1);
return count;
}