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 range len() for negative and non-divisible steps

Browse Source
This commit is contained in:
silmeth
2019-02-05 19:49:14 +01:00
parent 7941480fca
commit b43c511542
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ use super::super::pyobject::{
use super::super::vm::VirtualMachine;
use super::objint;
use super::objtype;
use num_bigint::{BigInt, ToBigInt};
use num_bigint::{BigInt, ToBigInt, Sign};
use num_traits::{One, Signed, ToPrimitive, Zero};
#[derive(Debug, Clone)]
@@ -19,10 +19,13 @@ pub struct RangeType {
impl RangeType {
#[inline]
pub fn len(&self) -> usize {
((self.end.clone() - self.start.clone()) / self.step.clone())
.abs()
.to_usize()
.unwrap()
match self.step.sign() {
Sign::Plus if self.start < self.end =>
((&self.end - &self.start - 1usize) / &self.step).to_usize().unwrap() + 1,
Sign::Minus if self.start > self.end =>
((&self.start - &self.end - 1usize) / (-&self.step)).to_usize().unwrap() + 1,
_ => 0,
}
}
#[inline]