mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement bitwise operator traits for ints and uints

Browse Source
This commit is contained in:
Brendan Zabarauskas 2013-04-18 20:58:58 +10:00
parent 07e087bf31
commit d2a81b95c3
2 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/libcore/num/int-template.rs
View File

@ -199,6 +199,30 @@ impl ops::Modulo<T,T> for T {
impl ops::Neg<T> for T {
fn neg(&self) -> T { -*self }
}
#[cfg(notest)]
impl ops::BitOr<T,T> for T {
fn bitor(&self, other: &T) -> T { *self | *other }
}
#[cfg(notest)]
impl ops::BitAnd<T,T> for T {
fn bitand(&self, other: &T) -> T { *self & *other }
}
#[cfg(notest)]
impl ops::BitXor<T,T> for T {
fn bitxor(&self, other: &T) -> T { *self ^ *other }
}
#[cfg(notest)]
impl ops::Shl<T,T> for T {
fn shl(&self, other: &T) -> T { *self << *other }
}
#[cfg(notest)]
impl ops::Shr<T,T> for T {
fn shr(&self, other: &T) -> T { *self >> *other }
}
#[cfg(notest)]
impl ops::Not<T> for T {
fn not(&self) -> T { !*self }
}
// String conversion functions and impl str -> num
@ -283,6 +307,16 @@ mod tests {
use super::inst::T;
use prelude::*;
#[test]
fn test_bitwise_ops() {
assert!(0b1110 as T == (0b1100 as T).bitor(&(0b1010 as T)));
assert!(0b1000 as T == (0b1100 as T).bitand(&(0b1010 as T)));
assert!(0b0110 as T == (0b1100 as T).bitxor(&(0b1010 as T)));
assert!(0b1110 as T == (0b0111 as T).shl(&(1 as T)));
assert!(0b0111 as T == (0b1110 as T).shr(&(1 as T)));
assert!(-(0b11 as T) - (1 as T) == (0b11 as T).not());
}
#[test]
fn test_from_str() {
assert!(from_str(~"0") == Some(0 as T));

35
src/libcore/num/uint-template.rs
View File

@ -164,6 +164,30 @@ impl ops::Modulo<T,T> for T {
impl ops::Neg<T> for T {
fn neg(&self) -> T { -*self }
}
#[cfg(notest)]
impl ops::BitOr<T,T> for T {
fn bitor(&self, other: &T) -> T { *self | *other }
}
#[cfg(notest)]
impl ops::BitAnd<T,T> for T {
fn bitand(&self, other: &T) -> T { *self & *other }
}
#[cfg(notest)]
impl ops::BitXor<T,T> for T {
fn bitxor(&self, other: &T) -> T { *self ^ *other }
}
#[cfg(notest)]
impl ops::Shl<T,T> for T {
fn shl(&self, other: &T) -> T { *self << *other }
}
#[cfg(notest)]
impl ops::Shr<T,T> for T {
fn shr(&self, other: &T) -> T { *self >> *other }
}
#[cfg(notest)]
impl ops::Not<T> for T {
fn not(&self) -> T { !*self }
}
// String conversion functions and impl str -> num
@ -247,6 +271,17 @@ mod tests {
use super::*;
use super::inst::T;
use prelude::*;
#[test]
fn test_bitwise_ops() {
assert!(0b1110 as T == (0b1100 as T).bitor(&(0b1010 as T)));
assert!(0b1000 as T == (0b1100 as T).bitand(&(0b1010 as T)));
assert!(0b0110 as T == (0b1100 as T).bitxor(&(0b1010 as T)));
assert!(0b1110 as T == (0b0111 as T).shl(&(1 as T)));
assert!(0b0111 as T == (0b1110 as T).shr(&(1 as T)));
assert!(max_value - (0b1011 as T) == (0b1011 as T).not());
}
#[test]
pub fn test_to_str() {
assert!(to_str_radix(0 as T, 10u) == ~"0");