auto merge of #4881 : bjz/rust/incoming, r=catamorphism

src/libcore/core.rc

@@ -199,7 +199,7 @@ pub use vec::{OwnedVector, OwnedCopyableVector};
 pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
 pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
 
-pub use num::Num;
+pub use num::{Num, NumCast};
 pub use ptr::Ptr;
 pub use to_str::ToStr;
 pub use clone::Clone;

src/libcore/num/f32.rs

@@ -14,6 +14,7 @@ use cmath;
 use cmp;
 use libc::{c_float, c_int};
 use num;
+use num::NumCast;
 use option::Option;
 use from_str;
 use to_str;
@@ -283,11 +284,6 @@ impl f32: num::Num {
     pure fn modulo(&self, other: &f32) -> f32 { return *self % *other; }
     #[inline(always)]
     pure fn neg(&self)                -> f32 { return -*self;        }
-
-    #[inline(always)]
-    pure fn to_int(&self)         -> int { return *self as int; }
-    #[inline(always)]
-    static pure fn from_int(n: int) -> f32 { return n as f32;    }
 }
 
 impl f32: num::Zero {
@@ -300,6 +296,30 @@ impl f32: num::One {
     static pure fn one() -> f32 { 1.0 }
 }
 
+pub impl f32: NumCast {
+    /**
+     * Cast `n` to an `f32`
+     */
+    #[inline(always)]
+    static pure fn from<N:NumCast>(n: N) -> f32 { n.to_f32() }
+
+    #[inline(always)] pure fn to_u8(&self)    -> u8    { *self as u8    }
+    #[inline(always)] pure fn to_u16(&self)   -> u16   { *self as u16   }
+    #[inline(always)] pure fn to_u32(&self)   -> u32   { *self as u32   }
+    #[inline(always)] pure fn to_u64(&self)   -> u64   { *self as u64   }
+    #[inline(always)] pure fn to_uint(&self)  -> uint  { *self as uint  }
+
+    #[inline(always)] pure fn to_i8(&self)    -> i8    { *self as i8    }
+    #[inline(always)] pure fn to_i16(&self)   -> i16   { *self as i16   }
+    #[inline(always)] pure fn to_i32(&self)   -> i32   { *self as i32   }
+    #[inline(always)] pure fn to_i64(&self)   -> i64   { *self as i64   }
+    #[inline(always)] pure fn to_int(&self)   -> int   { *self as int   }
+
+    #[inline(always)] pure fn to_f32(&self)   -> f32   { *self          }
+    #[inline(always)] pure fn to_f64(&self)   -> f64   { *self as f64   }
+    #[inline(always)] pure fn to_float(&self) -> float { *self as float }
+}
+
 #[abi="rust-intrinsic"]
 pub extern {
     fn floorf32(val: f32) -> f32;
@@ -545,6 +565,63 @@ impl f32: num::FromStrRadix {
     }
 }
 
+#[test]
+pub fn test_num() {
+    let ten: f32 = num::cast(10);
+    let two: f32 = num::cast(2);
+
+    assert (ten.add(&two)    == num::cast(12));
+    assert (ten.sub(&two)    == num::cast(8));
+    assert (ten.mul(&two)    == num::cast(20));
+    assert (ten.div(&two)    == num::cast(5));
+    assert (ten.modulo(&two) == num::cast(0));
+}
+
+#[test]
+fn test_numcast() {
+    assert (20u     == 20f32.to_uint());
+    assert (20u8    == 20f32.to_u8());
+    assert (20u16   == 20f32.to_u16());
+    assert (20u32   == 20f32.to_u32());
+    assert (20u64   == 20f32.to_u64());
+    assert (20i     == 20f32.to_int());
+    assert (20i8    == 20f32.to_i8());
+    assert (20i16   == 20f32.to_i16());
+    assert (20i32   == 20f32.to_i32());
+    assert (20i64   == 20f32.to_i64());
+    assert (20f     == 20f32.to_float());
+    assert (20f32   == 20f32.to_f32());
+    assert (20f64   == 20f32.to_f64());
+
+    assert (20f32 == NumCast::from(20u));
+    assert (20f32 == NumCast::from(20u8));
+    assert (20f32 == NumCast::from(20u16));
+    assert (20f32 == NumCast::from(20u32));
+    assert (20f32 == NumCast::from(20u64));
+    assert (20f32 == NumCast::from(20i));
+    assert (20f32 == NumCast::from(20i8));
+    assert (20f32 == NumCast::from(20i16));
+    assert (20f32 == NumCast::from(20i32));
+    assert (20f32 == NumCast::from(20i64));
+    assert (20f32 == NumCast::from(20f));
+    assert (20f32 == NumCast::from(20f32));
+    assert (20f32 == NumCast::from(20f64));
+
+    assert (20f32 == num::cast(20u));
+    assert (20f32 == num::cast(20u8));
+    assert (20f32 == num::cast(20u16));
+    assert (20f32 == num::cast(20u32));
+    assert (20f32 == num::cast(20u64));
+    assert (20f32 == num::cast(20i));
+    assert (20f32 == num::cast(20i8));
+    assert (20f32 == num::cast(20i16));
+    assert (20f32 == num::cast(20i32));
+    assert (20f32 == num::cast(20i64));
+    assert (20f32 == num::cast(20f));
+    assert (20f32 == num::cast(20f32));
+    assert (20f32 == num::cast(20f64));
+}
+
 //
 // Local Variables:
 // mode: rust

src/libcore/num/f64.rs

@@ -15,6 +15,7 @@ use cmp;
 use libc::{c_double, c_int};
 use libc;
 use num;
+use num::NumCast;
 use option::Option;
 use to_str;
 use from_str;
@@ -307,11 +308,30 @@ impl f64: num::Num {
     pure fn modulo(&self, other: &f64) -> f64 { return *self % *other; }
     #[inline(always)]
     pure fn neg(&self)                -> f64 { return -*self;        }
+}
 
+pub impl f64: NumCast {
+    /**
+     * Cast `n` to an `f64`
+     */
     #[inline(always)]
-    pure fn to_int(&self)         -> int { return *self as int; }
-    #[inline(always)]
-    static pure fn from_int(n: int) -> f64 { return n as f64;    }
+    static pure fn from<N:NumCast>(n: N) -> f64 { n.to_f64() }
+
+    #[inline(always)] pure fn to_u8(&self)    -> u8    { *self as u8    }
+    #[inline(always)] pure fn to_u16(&self)   -> u16   { *self as u16   }
+    #[inline(always)] pure fn to_u32(&self)   -> u32   { *self as u32   }
+    #[inline(always)] pure fn to_u64(&self)   -> u64   { *self as u64   }
+    #[inline(always)] pure fn to_uint(&self)  -> uint  { *self as uint  }
+
+    #[inline(always)] pure fn to_i8(&self)    -> i8    { *self as i8    }
+    #[inline(always)] pure fn to_i16(&self)   -> i16   { *self as i16   }
+    #[inline(always)] pure fn to_i32(&self)   -> i32   { *self as i32   }
+    #[inline(always)] pure fn to_i64(&self)   -> i64   { *self as i64   }
+    #[inline(always)] pure fn to_int(&self)   -> int   { *self as int   }
+
+    #[inline(always)] pure fn to_f32(&self)   -> f32   { *self as f32   }
+    #[inline(always)] pure fn to_f64(&self)   -> f64   { *self          }
+    #[inline(always)] pure fn to_float(&self) -> float { *self as float }
 }
 
 impl f64: num::Zero {
@@ -569,6 +589,63 @@ impl f64: num::FromStrRadix {
     }
 }
 
+#[test]
+pub fn test_num() {
+    let ten: f64 = num::cast(10);
+    let two: f64 = num::cast(2);
+
+    assert (ten.add(&two)    == num::cast(12));
+    assert (ten.sub(&two)    == num::cast(8));
+    assert (ten.mul(&two)    == num::cast(20));
+    assert (ten.div(&two)    == num::cast(5));
+    assert (ten.modulo(&two) == num::cast(0));
+}
+
+#[test]
+fn test_numcast() {
+    assert (20u   == 20f64.to_uint());
+    assert (20u8  == 20f64.to_u8());
+    assert (20u16 == 20f64.to_u16());
+    assert (20u32 == 20f64.to_u32());
+    assert (20u64 == 20f64.to_u64());
+    assert (20i   == 20f64.to_int());
+    assert (20i8  == 20f64.to_i8());
+    assert (20i16 == 20f64.to_i16());
+    assert (20i32 == 20f64.to_i32());
+    assert (20i64 == 20f64.to_i64());
+    assert (20f   == 20f64.to_float());
+    assert (20f32 == 20f64.to_f32());
+    assert (20f64 == 20f64.to_f64());
+
+    assert (20f64 == NumCast::from(20u));
+    assert (20f64 == NumCast::from(20u8));
+    assert (20f64 == NumCast::from(20u16));
+    assert (20f64 == NumCast::from(20u32));
+    assert (20f64 == NumCast::from(20u64));
+    assert (20f64 == NumCast::from(20i));
+    assert (20f64 == NumCast::from(20i8));
+    assert (20f64 == NumCast::from(20i16));
+    assert (20f64 == NumCast::from(20i32));
+    assert (20f64 == NumCast::from(20i64));
+    assert (20f64 == NumCast::from(20f));
+    assert (20f64 == NumCast::from(20f32));
+    assert (20f64 == NumCast::from(20f64));
+
+    assert (20f64 == num::cast(20u));
+    assert (20f64 == num::cast(20u8));
+    assert (20f64 == num::cast(20u16));
+    assert (20f64 == num::cast(20u32));
+    assert (20f64 == num::cast(20u64));
+    assert (20f64 == num::cast(20i));
+    assert (20f64 == num::cast(20i8));
+    assert (20f64 == num::cast(20i16));
+    assert (20f64 == num::cast(20i32));
+    assert (20f64 == num::cast(20i64));
+    assert (20f64 == num::cast(20f));
+    assert (20f64 == num::cast(20f32));
+    assert (20f64 == num::cast(20f64));
+}
+
 //
 // Local Variables:
 // mode: rust

src/libcore/num/float.rs

@@ -26,7 +26,7 @@ use cmp::{Eq, Ord};
 use cmp;
 use f64;
 use num;
-use num::Num::from_int;
+use num::NumCast;
 use option::{None, Option, Some};
 use str;
 use uint;
@@ -417,11 +417,6 @@ impl float: num::Num {
     pure fn modulo(&self, other: &float) -> float { return *self % *other; }
     #[inline(always)]
     pure fn neg(&self)                  -> float { return -*self;        }
-
-    #[inline(always)]
-    pure fn to_int(&self)         -> int   { return *self as int; }
-    #[inline(always)]
-    static pure fn from_int(&self, n: int) -> float { return n as float;  }
 }
 
 impl float: num::Zero {
@@ -434,6 +429,30 @@ impl float: num::One {
     static pure fn one() -> float { 1.0 }
 }
 
+pub impl float: NumCast {
+    /**
+     * Cast `n` to a `float`
+     */
+    #[inline(always)]
+    static pure fn from<N:NumCast>(n: N) -> float { n.to_float() }
+
+    #[inline(always)] pure fn to_u8(&self)    -> u8    { *self as u8    }
+    #[inline(always)] pure fn to_u16(&self)   -> u16   { *self as u16   }
+    #[inline(always)] pure fn to_u32(&self)   -> u32   { *self as u32   }
+    #[inline(always)] pure fn to_u64(&self)   -> u64   { *self as u64   }
+    #[inline(always)] pure fn to_uint(&self)  -> uint  { *self as uint  }
+
+    #[inline(always)] pure fn to_i8(&self)    -> i8    { *self as i8    }
+    #[inline(always)] pure fn to_i16(&self)   -> i16   { *self as i16   }
+    #[inline(always)] pure fn to_i32(&self)   -> i32   { *self as i32   }
+    #[inline(always)] pure fn to_i64(&self)   -> i64   { *self as i64   }
+    #[inline(always)] pure fn to_int(&self)   -> int   { *self as int   }
+
+    #[inline(always)] pure fn to_f32(&self)   -> f32   { *self as f32   }
+    #[inline(always)] pure fn to_f64(&self)   -> f64   { *self as f64   }
+    #[inline(always)] pure fn to_float(&self) -> float { *self          }
+}
+
 impl float: num::Round {
     #[inline(always)]
     pure fn round(&self, mode: num::RoundMode) -> float {
@@ -657,21 +676,60 @@ pub fn test_round() {
 }
 
 #[test]
-pub fn test_traits() {
-    fn test<U:num::Num cmp::Eq>(ten: &U) {
-        assert (ten.to_int() == 10);
-
-        let two: U = from_int(2);
-        assert (two.to_int() == 2);
-
-        assert (ten.add(&two) == from_int(12));
-        assert (ten.sub(&two) == from_int(8));
-        assert (ten.mul(&two) == from_int(20));
-        assert (ten.div(&two) == from_int(5));
-        assert (ten.modulo(&two) == from_int(0));
-    }
+pub fn test_num() {
+    let ten: float = num::cast(10);
+    let two: float = num::cast(2);
 
-    test(&10.0);
+    assert (ten.add(&two)    == num::cast(12));
+    assert (ten.sub(&two)    == num::cast(8));
+    assert (ten.mul(&two)    == num::cast(20));
+    assert (ten.div(&two)    == num::cast(5));
+    assert (ten.modulo(&two) == num::cast(0));
+}
+
+#[test]
+fn test_numcast() {
+    assert (20u   == 20f.to_uint());
+    assert (20u8  == 20f.to_u8());
+    assert (20u16 == 20f.to_u16());
+    assert (20u32 == 20f.to_u32());
+    assert (20u64 == 20f.to_u64());
+    assert (20i   == 20f.to_int());
+    assert (20i8  == 20f.to_i8());
+    assert (20i16 == 20f.to_i16());
+    assert (20i32 == 20f.to_i32());
+    assert (20i64 == 20f.to_i64());
+    assert (20f   == 20f.to_float());
+    assert (20f32 == 20f.to_f32());
+    assert (20f64 == 20f.to_f64());
+
+    assert (20f == NumCast::from(20u));
+    assert (20f == NumCast::from(20u8));
+    assert (20f == NumCast::from(20u16));
+    assert (20f == NumCast::from(20u32));
+    assert (20f == NumCast::from(20u64));
+    assert (20f == NumCast::from(20i));
+    assert (20f == NumCast::from(20i8));
+    assert (20f == NumCast::from(20i16));
+    assert (20f == NumCast::from(20i32));
+    assert (20f == NumCast::from(20i64));
+    assert (20f == NumCast::from(20f));
+    assert (20f == NumCast::from(20f32));
+    assert (20f == NumCast::from(20f64));
+
+    assert (20f == num::cast(20u));
+    assert (20f == num::cast(20u8));
+    assert (20f == num::cast(20u16));
+    assert (20f == num::cast(20u32));
+    assert (20f == num::cast(20u64));
+    assert (20f == num::cast(20i));
+    assert (20f == num::cast(20i8));
+    assert (20f == num::cast(20i16));
+    assert (20f == num::cast(20i32));
+    assert (20f == num::cast(20i64));
+    assert (20f == num::cast(20f));
+    assert (20f == num::cast(20f32));
+    assert (20f == num::cast(20f64));
 }