nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-15 18:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Ord implementation to use lexical ordering

Browse Source
This commit is contained in:
Brendan Zabarauskas 2013-05-19 01:11:50 +10:00
parent db453ec0e5
commit d9eec664fd
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcore/tuple.rs
View File

@ -165,7 +165,6 @@ macro_rules! tuple_impls(
fn eq(&self, other: &($($T),+)) -> bool {
$(*self.$get_ref_fn() == *other.$get_ref_fn())&&+
}
#[inline(always)]
fn ne(&self, other: &($($T),+)) -> bool {
!(*self == *other)
@ -176,29 +175,30 @@ macro_rules! tuple_impls(
impl<$($T:Ord),+> Ord for ($($T),+) {
#[inline(always)]
fn lt(&self, other: &($($T),+)) -> bool {
$(*self.$get_ref_fn() < *other.$get_ref_fn())&&+
lexical_lt!($(*self.$get_ref_fn(), *other.$get_ref_fn()),+)
}
#[inline(always)]
fn le(&self, other: &($($T),+)) -> bool {
$(*self.$get_ref_fn() <= *other.$get_ref_fn())&&+
}
fn le(&self, other: &($($T),+)) -> bool { !(*other).lt(&(*self)) }
#[inline(always)]
fn ge(&self, other: &($($T),+)) -> bool {
$(*self.$get_ref_fn() >= *other.$get_ref_fn())&&+
}
fn ge(&self, other: &($($T),+)) -> bool { !(*self).lt(other) }
#[inline(always)]
fn gt(&self, other: &($($T),+)) -> bool {
$(*self.$get_ref_fn() > *other.$get_ref_fn())&&+
}
fn gt(&self, other: &($($T),+)) -> bool { (*other).lt(&(*self)) }
}
)+
}
)
)
// Constructs an expression that performs a lexical less-than ordering.
// The values are interleaved, so the macro invocation for
// `(a1, a2, a3) < (b1, b2, b3)` would be `lexical_lt!(a1, b1, a2, b2, a3, b3)`
macro_rules! lexical_lt(
($a:expr, $b:expr, $($rest_a:expr, $rest_b:expr),+) => (
if $a < $b { true } else { lexical_lt!($($rest_a, $rest_b),+) }
);
($a:expr, $b:expr) => ($a < $b);
)
tuple_impls!(
(CloneableTuple2, ImmutableTuple2) {
(n0, n0_ref) -> A { (ref a,_) => a }