bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc: Make <=, >=, and > use traits as well

Browse source
This commit is contained in:
Patrick Walton 2012-08-29 19:23:15 -07:00
parent 70d3633c0b
commit a1c11cab2d
14 changed files with 192 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/libcore/str.rs
View file

@ -707,7 +707,30 @@ pure fn lt(a: &str, b: &str) -> bool {
}
/// Bytewise less than or equal
pure fn le(a: &~str, b: &~str) -> bool { *a <= *b }
pure fn le(a: &str, b: &str) -> bool {
let (a_len, b_len) = (a.len(), b.len());
let mut end = uint::min(&a_len, &b_len);
let mut i = 0;
while i < end {
let (c_a, c_b) = (a[i], b[i]);
if c_a < c_b { return true; }
if c_a > c_b { return false; }
i += 1;
}
return a_len <= b_len;
}
/// Bytewise greater than or equal
pure fn ge(a: &str, b: &str) -> bool {
!lt(b, a)
}
/// Bytewise greater than
pure fn gt(a: &str, b: &str) -> bool {
!le(b, a)
}
impl &str: Eq {
#[inline(always)]
@ -733,16 +756,34 @@ impl @str: Eq {
impl ~str : Ord {
#[inline(always)]
pure fn lt(&&other: ~str) -> bool { lt(self, other) }
#[inline(always)]
pure fn le(&&other: ~str) -> bool { le(self, other) }
#[inline(always)]
pure fn ge(&&other: ~str) -> bool { ge(self, other) }
#[inline(always)]
pure fn gt(&&other: ~str) -> bool { gt(self, other) }
}
impl &str : Ord {
#[inline(always)]
pure fn lt(&&other: &str) -> bool { lt(self, other) }
#[inline(always)]
pure fn le(&&other: &str) -> bool { le(self, other) }
#[inline(always)]
pure fn ge(&&other: &str) -> bool { ge(self, other) }
#[inline(always)]
pure fn gt(&&other: &str) -> bool { gt(self, other) }
}
impl @str : Ord {
#[inline(always)]
pure fn lt(&&other: @str) -> bool { lt(self, other) }
#[inline(always)]
pure fn le(&&other: @str) -> bool { le(self, other) }
#[inline(always)]
pure fn ge(&&other: @str) -> bool { ge(self, other) }
#[inline(always)]
pure fn gt(&&other: @str) -> bool { gt(self, other) }
}
/// String hash function