Skip to content

Commit 2334202

Browse files
committed
Give reduction-type tests in Bitv more natural names
1 parent 9f3fd93 commit 2334202

File tree

1 file changed

+57
-6
lines changed

1 file changed

+57
-6
lines changed

src/libcollections/bitv.rs

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ impl SmallBitv {
9797
pub fn set_all(&mut self) { self.bits = !0; }
9898

9999
#[inline]
100-
pub fn is_true(&self, nbits: uint) -> bool {
100+
pub fn all(&self, nbits: uint) -> bool {
101101
small_mask(nbits) & !self.bits == 0
102102
}
103103

104104
#[inline]
105-
pub fn is_false(&self, nbits: uint) -> bool {
105+
pub fn none(&self, nbits: uint) -> bool {
106106
small_mask(nbits) & self.bits == 0
107107
}
108108

@@ -412,9 +412,9 @@ impl Bitv {
412412

413413
/// Returns `true` if all bits are 1
414414
#[inline]
415-
pub fn is_true(&self) -> bool {
415+
pub fn all(&self) -> bool {
416416
match self.rep {
417-
Small(ref b) => b.is_true(self.nbits),
417+
Small(ref b) => b.all(self.nbits),
418418
_ => {
419419
for i in self.iter() { if !i { return false; } }
420420
true
@@ -433,16 +433,22 @@ impl Bitv {
433433
}
434434

435435
/// Returns `true` if all bits are 0
436-
pub fn is_false(&self) -> bool {
436+
pub fn none(&self) -> bool {
437437
match self.rep {
438-
Small(ref b) => b.is_false(self.nbits),
438+
Small(ref b) => b.none(self.nbits),
439439
Big(_) => {
440440
for i in self.iter() { if i { return false; } }
441441
true
442442
}
443443
}
444444
}
445445

446+
#[inline]
447+
/// Returns `true` if any bit is 1
448+
pub fn any(&self) -> bool {
449+
!self.none()
450+
}
451+
446452
pub fn init_to_vec(&self, i: uint) -> uint {
447453
return if self.get(i) { 1 } else { 0 };
448454
}
@@ -1551,6 +1557,51 @@ mod tests {
15511557
assert!(b.contains(&1000));
15521558
}
15531559

1560+
#[test]
1561+
fn test_small_bitv_tests() {
1562+
let v = from_bytes([0]);
1563+
assert!(!v.all());
1564+
assert!(!v.any());
1565+
assert!(v.none());
1566+
1567+
let v = from_bytes([0b00010100]);
1568+
assert!(!v.all());
1569+
assert!(v.any());
1570+
assert!(!v.none());
1571+
1572+
let v = from_bytes([0xFF]);
1573+
assert!(v.all());
1574+
assert!(v.any());
1575+
assert!(!v.none());
1576+
}
1577+
1578+
#[test]
1579+
fn test_big_bitv_tests() {
1580+
let v = from_bytes([ // 88 bits
1581+
0, 0, 0, 0,
1582+
0, 0, 0, 0,
1583+
0, 0, 0]);
1584+
assert!(!v.all());
1585+
assert!(!v.any());
1586+
assert!(v.none());
1587+
1588+
let v = from_bytes([ // 88 bits
1589+
0, 0, 0b00010100, 0,
1590+
0, 0, 0, 0b00110100,
1591+
0, 0, 0]);
1592+
assert!(!v.all());
1593+
assert!(v.any());
1594+
assert!(!v.none());
1595+
1596+
let v = from_bytes([ // 88 bits
1597+
0xFF, 0xFF, 0xFF, 0xFF,
1598+
0xFF, 0xFF, 0xFF, 0xFF,
1599+
0xFF, 0xFF, 0xFF]);
1600+
assert!(v.all());
1601+
assert!(v.any());
1602+
assert!(!v.none());
1603+
}
1604+
15541605
fn rng() -> rand::IsaacRng {
15551606
let seed = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
15561607
rand::SeedableRng::from_seed(seed)

0 commit comments

Comments
 (0)