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

Merge pull request #997 from ZapAnton/objstr_refactor_mul

Browse Source 
objstr: Refactored the 'mul' method
This commit is contained in:
coolreader18
2019-05-25 12:11:44 -05:00
committed by GitHub
parent d0d4cb56c5 a2e64c0425
commit 7ce111b16c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/snippets/strings.py
View File

@@ -37,6 +37,8 @@ assert 3 * "xy" == "xyxyxy"
assert 0 * "x" == ""
assert -1 * "x" == ""
assert_raises(OverflowError, lambda: 'xy' * 234234234234234234234234234234)
a = 'Hallo'
assert a.lower() == 'hallo'
assert a.upper() == 'HALLO'

25
vm/src/obj/objstr.rs
View File

@@ -183,22 +183,17 @@ impl PyString {
#[pymethod(name = "__mul__")]
fn mul(&self, val: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
if objtype::isinstance(&val, &vm.ctx.int_type()) {
let value = &self.value;
let multiplier = objint::get_value(&val).to_i32().unwrap();
let capacity = if multiplier > 0 {
multiplier.to_usize().unwrap() * value.len()
} else {
0
};
let mut result = String::with_capacity(capacity);
for _x in 0..multiplier {
result.push_str(value.as_str());
}
Ok(result)
} else {
Err(vm.new_type_error(format!("Cannot multiply {} and {}", self, val)))
if !objtype::isinstance(&val, &vm.ctx.int_type()) {
return Err(vm.new_type_error(format!("Cannot multiply {} and {}", self, val)));
}
objint::get_value(&val)
.to_isize()
.map(|multiplier| multiplier.max(0))
.and_then(|multiplier| multiplier.to_usize())
.map(|multiplier| self.value.repeat(multiplier))
.ok_or_else(|| {
vm.new_overflow_error("cannot fit 'int' into an index-sized integer".to_string())
})
}
#[pymethod(name = "__rmul__")]