Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix __eq__ of range

Browse Source 
__eq__ compare length, start, step of range

Fixes #1389
This commit is contained in:
HyeockJinKim
2019-09-21 01:10:02 +09:00
parent 59d4e4e7c1
commit 1ff88fb662
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
vm/src/obj/objrange.rs
View File

@@ -104,6 +104,20 @@ impl PyRange {
let result = start + step * index;
Some(result)
}
#[inline]
fn length(&self) -> PyInt {
let start = self.start.as_bigint();
let stop = self.stop.as_bigint();
let step = self.step.as_bigint();
match step.sign() {
Sign::Plus if start < stop => PyInt::new((stop - start - 1usize) / step + 1),
Sign::Minus if start > stop => PyInt::new((start - stop - 1usize) / (-step) + 1),
Sign::Plus | Sign::Minus => PyInt::new(0),
Sign::NoSign => unreachable!(),
}
}
}
pub fn get_value(obj: &PyObjectRef) -> PyRange {
@@ -201,16 +215,7 @@ impl PyRange {
#[pymethod(name = "__len__")]
fn len(&self, _vm: &VirtualMachine) -> PyInt {
let start = self.start.as_bigint();
let stop = self.stop.as_bigint();
let step = self.step.as_bigint();
match step.sign() {
Sign::Plus if start < stop => PyInt::new((stop - start - 1usize) / step + 1),
Sign::Minus if start > stop => PyInt::new((start - stop - 1usize) / (-step) + 1),
Sign::Plus | Sign::Minus => PyInt::new(0),
Sign::NoSign => unreachable!(),
}
self.length()
}
#[pymethod(name = "__repr__")]
@@ -243,9 +248,24 @@ impl PyRange {
fn eq(&self, rhs: PyObjectRef, vm: &VirtualMachine) -> bool {
if objtype::isinstance(&rhs, &vm.ctx.range_type()) {
let rhs = get_value(&rhs);
self.start.as_bigint() == rhs.start.as_bigint()
&& self.stop.as_bigint() == rhs.stop.as_bigint()
&& self.step.as_bigint() == rhs.step.as_bigint()
if self.length().as_bigint() != rhs.length().as_bigint() {
return false;
}
if self.length().as_bigint().is_zero() {
return true;
}
if self.start.as_bigint() != rhs.start.as_bigint() {
return false;
}
let step = self.step.as_bigint();
if step.is_one() || step == rhs.step.as_bigint() {
return true;
}
false
} else {
false
}