epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

BitSet building convenience

Browse Source 
Allow set()/clear()/flip() to be chained.
Support c++11 initializer lists.
This commit is contained in:
Michael Davidsaver
2017-09-07 11:49:07 -05:00
parent db6ebfe71b
commit 787af8de18
3 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/misc/bitSet.cpp
View File

@@ -55,6 +55,19 @@ namespace epics { namespace pvData {
words.reserve((nbits == 0) ? 1 : WORD_INDEX(nbits-1) + 1);
}
#if __cplusplus>=201103L
BitSet::BitSet(std::initializer_list<uint32> I)
{
// optimistically guess that highest bit is last (not required)
words.reserve((I.size() == 0) ? 1 : WORD_INDEX(*(I.end()-1)) + 1);
for(uint32 idx : I)
{
set(idx);
}
}
#endif
BitSet::~BitSet() {}
void BitSet::recalculateWordsInUse() {
@@ -76,7 +89,7 @@ namespace epics { namespace pvData {
ensureCapacity(wordIndex+1);
}
void BitSet::flip(uint32 bitIndex) {
BitSet& BitSet::flip(uint32 bitIndex) {
uint32 wordIdx = WORD_INDEX(bitIndex);
expandTo(wordIdx);
@@ -84,25 +97,27 @@ namespace epics { namespace pvData {
words[wordIdx] ^= (((uint64)1) << WORD_OFFSET(bitIndex));
recalculateWordsInUse();
return *this;
}
void BitSet::set(uint32 bitIndex) {
BitSet& BitSet::set(uint32 bitIndex) {
uint32 wordIdx = WORD_INDEX(bitIndex);
expandTo(wordIdx);
words[wordIdx] |= (((uint64)1) << WORD_OFFSET(bitIndex));
return *this;
}
void BitSet::clear(uint32 bitIndex) {
BitSet& BitSet::clear(uint32 bitIndex) {
uint32 wordIdx = WORD_INDEX(bitIndex);
if (wordIdx >= words.size())
return;
if (wordIdx < words.size()) {
words[wordIdx] &= ~(((uint64)1) << WORD_OFFSET(bitIndex));
words[wordIdx] &= ~(((uint64)1) << WORD_OFFSET(bitIndex));
recalculateWordsInUse();
recalculateWordsInUse();
}
return *this;
}
void BitSet::set(uint32 bitIndex, bool value) {