---

yaml
---
r: 57206
b: refs/heads/try
c: b624210
h: refs/heads/master
v: v3

Author: brendanzab

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: f40be999cab20ee51758620d9ccf435c62fcb51f
+refs/heads/try: b62421000c8e0e9b08590b81af03e05c6edd3c10
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/core.rc

@@ -106,6 +106,8 @@ pub use iter::{ExtendedMutableIter};
 pub use num::{Num, NumCast};
 pub use num::{Signed, Unsigned, Integer};
 pub use num::{Round, Fractional, Real, RealExt};
+pub use num::{Bitwise, Bounded};
+pub use num::{Primitive, PrimitiveInt};
 pub use ptr::Ptr;
 pub use to_str::ToStr;
 pub use clone::Clone;

branches/try/src/libcore/num/f32.rs

@@ -509,6 +509,14 @@ impl Real for f32 {
     fn tanh(&self) -> f32 { tanh(*self) }
 }
 
+impl Primitive for f32 {
+    #[inline(always)]
+    fn bits() -> uint { 32 }
+
+    #[inline(always)]
+    fn bytes() -> uint { Primitive::bits::<f32>() / 8 }
+}
+
 //
 // Section: String Conversions
 //
@@ -873,6 +881,12 @@ mod tests {
         assert!((1f32/neg_infinity).is_negative());
         assert!(!NaN.is_negative());
     }
+
+    #[test]
+    fn test_primitive() {
+        assert_eq!(Primitive::bits::<f32>(), sys::size_of::<f32>() * 8);
+        assert_eq!(Primitive::bytes::<f32>(), sys::size_of::<f32>());
+    }
 }
 
 //

branches/try/src/libcore/num/f64.rs

@@ -549,6 +549,14 @@ impl RealExt for f64 {
     fn yn(&self, n: int) -> f64 { yn(n as c_int, *self) }
 }
 
+impl Primitive for f64 {
+    #[inline(always)]
+    fn bits() -> uint { 64 }
+
+    #[inline(always)]
+    fn bytes() -> uint { Primitive::bits::<f64>() / 8 }
+}
+
 //
 // Section: String Conversions
 //
@@ -914,6 +922,12 @@ mod tests {
         assert!((1f64/neg_infinity).is_negative());
         assert!(!NaN.is_negative());
     }
+
+    #[test]
+    fn test_primitive() {
+        assert_eq!(Primitive::bits::<f64>(), sys::size_of::<f64>() * 8);
+        assert_eq!(Primitive::bytes::<f64>(), sys::size_of::<f64>());
+    }
 }
 
 //

branches/try/src/libcore/num/float.rs

@@ -689,6 +689,14 @@ impl Signed for float {
     fn is_negative(&self) -> bool { *self < 0.0 || (1.0 / *self) == neg_infinity }
 }
 
+impl Primitive for float {
+    #[inline(always)]
+    fn bits() -> uint { Primitive::bits::<f64>() }
+
+    #[inline(always)]
+    fn bytes() -> uint { Primitive::bytes::<f64>() }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -836,6 +844,12 @@ mod tests {
         assert!(!NaN.is_negative());
     }
 
+    #[test]
+    fn test_primitive() {
+        assert_eq!(Primitive::bits::<float>(), sys::size_of::<float>() * 8);
+        assert_eq!(Primitive::bytes::<float>(), sys::size_of::<float>());
+    }
+
     #[test]
     pub fn test_to_str_exact_do_decimal() {
         let s = to_str_exact(5.0, 4u);

branches/try/src/libcore/num/int-template.rs

@@ -399,6 +399,8 @@ impl Integer for T {
     fn is_odd(&self) -> bool { !self.is_even() }
 }
 
+impl Bitwise for T {}
+
 #[cfg(notest)]
 impl BitOr<T,T> for T {
     #[inline(always)]
@@ -435,6 +437,16 @@ impl Not<T> for T {
     fn not(&self) -> T { !*self }
 }
 
+impl Bounded for T {
+    #[inline(always)]
+    fn min_value() -> T { min_value }
+
+    #[inline(always)]
+    fn max_value() -> T { max_value }
+}
+
+impl PrimitiveInt for T {}
+
 // String conversion functions and impl str -> num
 
 /// Parse a string as a number in base 10.
@@ -641,6 +653,12 @@ mod tests {
         assert_eq!(-(0b11 as T) - (1 as T), (0b11 as T).not());
     }
 
+    #[test]
+    fn test_primitive() {
+        assert_eq!(Primitive::bits::<T>(), sys::size_of::<T>() * 8);
+        assert_eq!(Primitive::bytes::<T>(), sys::size_of::<T>());
+    }
+
     #[test]
     fn test_from_str() {
         assert_eq!(from_str(~"0"), Some(0 as T));

branches/try/src/libcore/num/int-template/i16.rs

@@ -11,6 +11,16 @@
 //! Operations and constants for `i16`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = i16;
     pub static bits: uint = ::u16::bits;
+
+    impl Primitive for i16 {
+        #[inline(always)]
+        fn bits() -> uint { 16 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<i16>() / 8 }
+    }
 }

branches/try/src/libcore/num/int-template/i32.rs

@@ -11,6 +11,16 @@
 //! Operations and constants for `i32`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = i32;
     pub static bits: uint = ::u32::bits;
+
+    impl Primitive for i32 {
+        #[inline(always)]
+        fn bits() -> uint { 32 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<i32>() / 8 }
+    }
 }

branches/try/src/libcore/num/int-template/i64.rs

@@ -11,6 +11,16 @@
 //! Operations and constants for `i64`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = i64;
     pub static bits: uint = ::u64::bits;
+
+    impl Primitive for i64 {
+        #[inline(always)]
+        fn bits() -> uint { 64 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<i64>() / 8 }
+    }
 }

branches/try/src/libcore/num/int-template/i8.rs

@@ -11,6 +11,16 @@
 //! Operations and constants for `i8`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = i8;
     pub static bits: uint = ::u8::bits;
+
+    impl Primitive for i8 {
+        #[inline(always)]
+        fn bits() -> uint { 8 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<i8>() / 8 }
+    }
 }

branches/try/src/libcore/num/int-template/int.rs

@@ -13,9 +13,30 @@
 pub use self::inst::pow;
 
 mod inst {
+    use num::Primitive;
+
     pub type T = int;
     pub static bits: uint = ::uint::bits;
 
+    impl Primitive for int {
+        #[cfg(target_word_size = "32")]
+        #[inline(always)]
+        fn bits() -> uint { 32 }
+
+        #[cfg(target_word_size = "64")]
+        #[inline(always)]
+        fn bits() -> uint { 64 }
+
+        // fallback if we don't have access to the current word size
+        #[cfg(not(target_word_size = "32"),
+              not(target_word_size = "64"))]
+        #[inline(always)]
+        fn bits() -> uint { sys::size_of::<int>() * 8 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<int>() / 8 }
+    }
+
     /// Returns `base` raised to the power of `exponent`
     pub fn pow(base: int, exponent: uint) -> int {
         if exponent == 0u {

branches/try/src/libcore/num/num.rs

@@ -18,6 +18,7 @@ use Quot = ops::Div;
 use Rem = ops::Modulo;
 #[cfg(not(stage0))]
 use ops::{Add, Sub, Mul, Quot, Rem, Neg};
+use ops::{Not, BitAnd, BitOr, BitXor, Shl, Shr};
 use option::Option;
 use kinds::Copy;
 
@@ -173,6 +174,60 @@ pub trait RealExt: Real {
     fn yn(&self, n: int) -> Self;
 }
 
+///
+/// Collects the bitwise operators under one trait.
+///
+pub trait Bitwise: Not<Self>
+                 + BitAnd<Self,Self>
+                 + BitOr<Self,Self>
+                 + BitXor<Self,Self>
+                 + Shl<Self,Self>
+                 + Shr<Self,Self> {}
+
+pub trait Bounded {
+    // FIXME (#5527): These should be associated constants
+    fn min_value() -> Self;
+    fn max_value() -> Self;
+}
+
+///
+/// Specifies the available operations common to all of Rust's core numeric primitives.
+/// These may not always make sense from a purely mathematical point of view, but
+/// may be useful for systems programming.
+///
+pub trait Primitive: Num
+                   + NumCast
+                   + Neg<Self>
+                   + Add<Self,Self>
+                   + Sub<Self,Self>
+                   + Mul<Self,Self>
+                   + Quot<Self,Self>
+                   + Rem<Self,Self> {
+    // FIXME (#5527): These should be associated constants
+    fn bits() -> uint;
+    fn bytes() -> uint;
+}
+
+///
+/// A collection of traits relevant to primitive signed and unsigned integers
+///
+pub trait PrimitiveInt: Integer
+                      + Primitive
+                      + Bounded
+                      + Bitwise {}
+
+///
+/// Specialisation of `PrimitiveInt` for unsigned integers
+///
+pub trait Uint: PrimitiveInt
+              + Unsigned {}
+
+///
+/// Specialisation of `PrimitiveInt` for signed integers
+///
+pub trait Int: PrimitiveInt
+             + Signed {}
+
 ///
 /// Cast from one machine scalar to another
 ///

branches/try/src/libcore/num/uint-template.rs

@@ -231,6 +231,8 @@ impl Integer for T {
     fn is_odd(&self) -> bool { !self.is_even() }
 }
 
+impl Bitwise for T {}
+
 #[cfg(notest)]
 impl BitOr<T,T> for T {
     #[inline(always)]
@@ -267,6 +269,16 @@ impl Not<T> for T {
     fn not(&self) -> T { !*self }
 }
 
+impl Bounded for T {
+    #[inline(always)]
+    fn min_value() -> T { min_value }
+
+    #[inline(always)]
+    fn max_value() -> T { max_value }
+}
+
+impl PrimitiveInt for T {}
+
 // String conversion functions and impl str -> num
 
 /// Parse a string as a number in base 10.
@@ -384,6 +396,12 @@ mod tests {
         assert_eq!(max_value - (0b1011 as T), (0b1011 as T).not());
     }
 
+    #[test]
+    fn test_primitive() {
+        assert_eq!(Primitive::bits::<T>(), sys::size_of::<T>() * 8);
+        assert_eq!(Primitive::bytes::<T>(), sys::size_of::<T>());
+    }
+
     #[test]
     pub fn test_to_str() {
         assert_eq!(to_str_radix(0 as T, 10u), ~"0");

branches/try/src/libcore/num/uint-template/u16.rs

@@ -11,8 +11,18 @@
 //! Operations and constants for `u16`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = u16;
     #[allow(non_camel_case_types)]
     pub type T_SIGNED = i16;
     pub static bits: uint = 16;
+
+    impl Primitive for u16 {
+        #[inline(always)]
+        fn bits() -> uint { 16 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<u16>() / 8 }
+    }
 }

branches/try/src/libcore/num/uint-template/u32.rs

@@ -11,8 +11,18 @@
 //! Operations and constants for `u32`
 
 mod inst {
+    use num::Primitive;
+
     pub type T = u32;
     #[allow(non_camel_case_types)]
     pub type T_SIGNED = i32;
     pub static bits: uint = 32;
+
+    impl Primitive for u32 {
+        #[inline(always)]
+        fn bits() -> uint { 32 }
+
+        #[inline(always)]
+        fn bytes() -> uint { Primitive::bits::<u32>() / 8 }
+    }
 }