mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Cargo Format

Browse Source
This commit is contained in:
Daniel Alley
2019-09-24 00:35:32 -04:00
parent ecb3cd4df5
commit 6a3e38d4da
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,8 +335,16 @@ impl PyRange {
};
let negative_step = substep.is_negative();
let lower_bound = if negative_step { -BigInt::one() } else { BigInt::zero() };
let upper_bound = if negative_step { &lower_bound + range_length } else { range_length.clone() };
let lower_bound = if negative_step {
-BigInt::one()
} else {
BigInt::zero()
};
let upper_bound = if negative_step {
&lower_bound + range_length
} else {
range_length.clone()
};
let substart = if let Some(slice_start) = slice.start_index(vm)? {
if slice_start.is_negative() {
@@ -354,7 +362,11 @@ impl PyRange {
}
}
} else {
if negative_step { upper_bound.clone() } else { lower_bound.clone() }
if negative_step {
upper_bound.clone()
} else {
lower_bound.clone()
}
};
let substop = if let Some(slice_stop) = slice.stop_index(vm)? {
@@ -373,7 +385,11 @@ impl PyRange {
}
}
} else {
if negative_step { lower_bound.clone() } else { upper_bound.clone() }
if negative_step {
lower_bound.clone()
} else {
upper_bound.clone()
}
};
let step = range_step * &substep;
@@ -388,12 +404,10 @@ impl PyRange {
.into_ref(vm)
.into_object())
}
RangeIndex::Int(index) => {
match self.get(index.as_bigint()) {
Some(value) => Ok(PyInt::new(value).into_ref(vm).into_object()),
None => Err(vm.new_index_error("range object index out of range".to_string()))
}
}
RangeIndex::Int(index) => match self.get(index.as_bigint()) {
Some(value) => Ok(PyInt::new(value).into_ref(vm).into_object()),
None => Err(vm.new_index_error("range object index out of range".to_string())),
},
}
}