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

Merge pull request #2601 from ishigoya/test_slice

Browse Source 
slice: error on negative integers in indices method
This commit is contained in:
Jeong YunWon
2021-05-08 03:57:55 +09:00
committed by GitHub
parent dd1138f282 5499920075
commit c5d1f4afaa
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vm/src/builtins/slice.rs
View File

@@ -1,6 +1,6 @@
// sliceobject.{h,c} in CPython
use super::int::PyInt;
use super::int::{PyInt, PyIntRef};
use super::pytype::PyTypeRef;
use crate::function::{FuncArgs, OptionalArg};
use crate::pyobject::{
@@ -205,16 +205,17 @@ impl PySlice {
}
#[pymethod(name = "indices")]
fn indices(&self, length: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if let Some(length) = length.payload::<PyInt>() {
let (start, stop, step) = self.inner_indices(length.borrow_value(), vm)?;
fn indices(&self, length: PyIntRef, vm: &VirtualMachine) -> PyResult {
let length = length.borrow_value();
if length.is_negative() {
Err(vm.new_value_error("length should not be negative.".to_owned()))
} else {
let (start, stop, step) = self.inner_indices(length, vm)?;
Ok(vm.ctx.new_tuple(vec![
vm.ctx.new_int(start),
vm.ctx.new_int(stop),
vm.ctx.new_int(step),
]))
} else {
Ok(vm.ctx.not_implemented())
}
}
}