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

Handle attempt to add non-hashable items to a set.

Browse Source
This commit is contained in:
Matthew Constable
2019-02-03 15:46:13 +00:00
parent d5801162bd
commit 6acb7eb006
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vm/src/obj/objset.rs
View File

@@ -43,20 +43,26 @@ fn set_add(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
match mut_obj.payload {
PyObjectPayload::Set { ref mut elements } => {
let hash_result: PyObjectRef = vm.call_method(item, "__hash__", vec![]).unwrap();
let hash_object = hash_result.borrow();
let key: BigInt;
match hash_object.payload {
PyObjectPayload::Integer { ref value } => {
let key = value.clone();
elements.insert(key, item.clone());
Ok(vm.get_none())
let hash_result: PyResult = vm.call_method(item, "__hash__", vec![]);
match hash_result {
Ok(hash_object) => {
let hash = hash_object.borrow();
let key: BigInt;
match hash.payload {
PyObjectPayload::Integer { ref value } => {
let key = value.clone();
elements.insert(key, item.clone());
Ok(vm.get_none())
},
_ => { Err(vm.new_type_error(format!("__hash__ method should return an integer"))) }
}
},
_ => { Err(vm.new_attribute_error(format!("Expected item to implment __hash__"))) }
Err(error) => Err(error),
}
},
_ => {
Err(vm.new_type_error("set.add is called with no list".to_string()))
Err(vm.new_type_error("set.add is called with no item".to_string()))
}
}
}

5
vm/src/vm.rs
View File

@@ -100,11 +100,6 @@ impl VirtualMachine {
self.new_exception(type_error, msg)
}
pub fn new_attribute_error(&mut self, msg: String) -> PyObjectRef {
let type_error = self.ctx.exceptions.attribute_error.clone();
self.new_exception(type_error, msg)
}
/// Create a new python ValueError object. Useful for raising errors from
/// python functions implemented in rust.
pub fn new_value_error(&mut self, msg: String) -> PyObjectRef {