rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compare bigints by value not by pointer (#1183)

Browse Source
This commit is contained in:
Mark Thom
2022-01-09 18:48:32 -07:00
parent 976b8e426d
commit bcacb49c05
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/arithmetic.rs
View File

@@ -603,33 +603,33 @@ impl Ord for Number {
} }
(&Number::Fixnum(n1), &Number::Float(n2)) => OrderedFloat(n1.get_num() as f64).cmp(&n2), (&Number::Fixnum(n1), &Number::Float(n2)) => OrderedFloat(n1.get_num() as f64).cmp(&n2),
(&Number::Float(n1), &Number::Fixnum(n2)) => n1.cmp(&OrderedFloat(n2.get_num() as f64)), (&Number::Float(n1), &Number::Fixnum(n2)) => n1.cmp(&OrderedFloat(n2.get_num() as f64)),
(&Number::Integer(ref n1), &Number::Integer(ref n2)) => n1.cmp(n2), (&Number::Integer(n1), &Number::Integer(n2)) => (*n1).cmp(&*n2),
(&Number::Integer(ref n1), Number::Float(n2)) => OrderedFloat(n1.to_f64()).cmp(n2), (&Number::Integer(n1), Number::Float(n2)) => OrderedFloat(n1.to_f64()).cmp(n2),
(&Number::Float(n1), &Number::Integer(ref n2)) => n1.cmp(&OrderedFloat(n2.to_f64())), (&Number::Float(n1), &Number::Integer(ref n2)) => n1.cmp(&OrderedFloat(n2.to_f64())),
(&Number::Integer(ref n1), &Number::Rational(ref n2)) => { (&Number::Integer(n1), &Number::Rational(n2)) => {
#[cfg(feature = "num")] #[cfg(feature = "num")]
{ {
Rational::from(&**n1).cmp(n2) Rational::from(&**n1).cmp(n2)
} }
#[cfg(not(feature = "num"))] #[cfg(not(feature = "num"))]
{ {
(&**n1).partial_cmp(&**n2).unwrap_or(Ordering::Less) (&*n1).partial_cmp(&*n2).unwrap_or(Ordering::Less)
} }
} }
(&Number::Rational(ref n1), &Number::Integer(ref n2)) => { (&Number::Rational(n1), &Number::Integer(n2)) => {
#[cfg(feature = "num")] #[cfg(feature = "num")]
{ {
(&**n1).cmp(&Rational::from(&**n2)) (&**n1).cmp(&Rational::from(&**n2))
} }
#[cfg(not(feature = "num"))] #[cfg(not(feature = "num"))]
{ {
(&**n1).partial_cmp(&**n2).unwrap_or(Ordering::Less) (&*n1).partial_cmp(&*n2).unwrap_or(Ordering::Less)
} }
} }
(&Number::Rational(ref n1), &Number::Float(n2)) => OrderedFloat(n1.to_f64()).cmp(&n2), (&Number::Rational(n1), &Number::Float(n2)) => OrderedFloat(n1.to_f64()).cmp(&n2),
(&Number::Float(n1), &Number::Rational(ref n2)) => n1.cmp(&OrderedFloat(n2.to_f64())), (&Number::Float(n1), &Number::Rational(n2)) => n1.cmp(&OrderedFloat(n2.to_f64())),
(&Number::Float(f1), &Number::Float(f2)) => f1.cmp(&f2), (&Number::Float(f1), &Number::Float(f2)) => f1.cmp(&f2),
(&Number::Rational(ref r1), &Number::Rational(ref r2)) => r1.cmp(&r2), (&Number::Rational(r1), &Number::Rational(r2)) => (*r1).cmp(&*r2),
} }
} }
} }