mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00
Code Issues Projects Releases Packages Activity

fix edge case with clearing bitsets

Browse source
This commit is contained in:
mat 2022-11-07 20:57:32 -06:00
parent d112856ff6
commit 7844a05650
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
azalea-core/src/bitset.rs
View file

@ -51,8 +51,12 @@ impl BitSet {
end_word_index = self.data.len() - 1; end_word_index = self.data.len() - 1;
} }
let first_word_mask = u64::MAX << from_index; let first_word_mask = u64::MAX.wrapping_shl(
let last_word_mask = u64::MAX >> (64 - (to_index % 64)); from_index
.try_into()
.expect("from_index shouldn't be larger than u32"),
);
let last_word_mask = u64::MAX.wrapping_shr((64 - (to_index % 64)) as u32);
if start_word_index == end_word_index { if start_word_index == end_word_index {
// Case 1: One word // Case 1: One word
self.data[start_word_index] &= !(first_word_mask & last_word_mask); self.data[start_word_index] &= !(first_word_mask & last_word_mask);
@ -136,4 +140,22 @@ mod tests {
assert_eq!(bitset.index(65), true); assert_eq!(bitset.index(65), true);
assert_eq!(bitset.index(66), true); assert_eq!(bitset.index(66), true);
} }
#[test]
fn test_clear_2() {
let mut bitset = BitSet::new(128);
bitset.set(64);
bitset.set(65);
bitset.set(66);
bitset.set(67);
bitset.set(68);
bitset.clear(65, 67);
assert_eq!(bitset.index(64), true);
assert_eq!(bitset.index(65), false);
assert_eq!(bitset.index(66), false);
assert_eq!(bitset.index(67), true);
assert_eq!(bitset.index(68), true);
}
} }