Skip to content

Fix dict __ior__ #3231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Oct 6, 2021
Merged

Fix dict __ior__ #3231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9204d2c
Fix dict __ior__
DimitrisJim Oct 6, 2021
3070807
clean up dict more
youknowone Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 49 additions & 54 deletions vm/src/builtins/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,61 +66,50 @@ impl PyDict {
kwargs: KwArgs,
vm: &VirtualMachine,
) -> PyResult<()> {
Self::merge(&self.entries, dict_obj, kwargs, vm)
self.update(dict_obj, kwargs, vm)
}

fn merge(
// Used in update and ior.
fn merge_object(
dict: &DictContentType,
dict_obj: OptionalArg<PyObjectRef>,
kwargs: KwArgs,
other: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult<()> {
if let OptionalArg::Present(dict_obj) = dict_obj {
let dicted: Result<PyDictRef, _> = dict_obj.clone().downcast_exact(vm);
if let Ok(dict_obj) = dicted {
let dict_size = &dict_obj.size();
for (key, value) in &dict_obj {
dict.insert(vm, key, value)?;
}
if dict_obj.entries.has_changed_size(dict_size) {
return Err(vm.new_runtime_error("dict mutated during update".to_owned()));
}
} else if let Some(keys) = vm.get_method(dict_obj.clone(), "keys") {
let keys = vm.invoke(&keys?, ())?.get_iter(vm)?;
while let PyIterReturn::Return(key) = keys.next(vm)? {
let val = dict_obj.get_item(key.clone(), vm)?;
dict.insert(vm, key, val)?;
let other = match other.downcast_exact(vm) {
Ok(dict_other) => return Self::merge_dict(dict, dict_other, vm),
Err(other) => other,
};
if let Some(keys) = vm.get_method(other.clone(), "keys") {
let keys = vm.invoke(&keys?, ())?.get_iter(vm)?;
while let PyIterReturn::Return(key) = keys.next(vm)? {
let val = other.get_item(key.clone(), vm)?;
dict.insert(vm, key, val)?;
}
} else {
let iter = other.get_iter(vm)?;
loop {
fn err(vm: &VirtualMachine) -> PyBaseExceptionRef {
vm.new_value_error("Iterator must have exactly two elements".to_owned())
}
} else {
let iter = dict_obj.get_iter(vm)?;
loop {
fn err(vm: &VirtualMachine) -> PyBaseExceptionRef {
vm.new_value_error("Iterator must have exactly two elements".to_owned())
}
let element = match iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => break,
};
let elem_iter = element.get_iter(vm)?;
let key = match elem_iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => return Err(err(vm)),
};
let value = match elem_iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => return Err(err(vm)),
};
if matches!(elem_iter.next(vm)?, PyIterReturn::Return(_)) {
return Err(err(vm));
}
dict.insert(vm, key, value)?;
let element = match iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => break,
};
let elem_iter = element.get_iter(vm)?;
let key = match elem_iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => return Err(err(vm)),
};
let value = match elem_iter.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(_) => return Err(err(vm)),
};
if matches!(elem_iter.next(vm)?, PyIterReturn::Return(_)) {
return Err(err(vm));
}
dict.insert(vm, key, value)?;
}
}

for (key, value) in kwargs.into_iter() {
dict.insert(vm, vm.ctx.new_utf8_str(key), value)?;
}
Ok(())
}

Expand All @@ -129,9 +118,13 @@ impl PyDict {
dict_other: PyDictRef,
vm: &VirtualMachine,
) -> PyResult<()> {
for (key, value) in dict_other {
let dict_size = &dict_other.size();
for (key, value) in &dict_other {
dict.insert(vm, key, value)?;
}
if dict_other.entries.has_changed_size(dict_size) {
return Err(vm.new_runtime_error("dict mutated during update".to_owned()));
}
Ok(())
}

Expand Down Expand Up @@ -326,17 +319,19 @@ impl PyDict {
kwargs: KwArgs,
vm: &VirtualMachine,
) -> PyResult<()> {
PyDict::merge(&self.entries, dict_obj, kwargs, vm)
if let OptionalArg::Present(dict_obj) = dict_obj {
Self::merge_object(&self.entries, dict_obj, vm)?;
}
for (key, value) in kwargs.into_iter() {
self.entries.insert(vm, vm.ctx.new_utf8_str(key), value)?;
}
Ok(())
}

#[pymethod(magic)]
fn ior(zelf: PyRef<Self>, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let dicted: Result<PyDictRef, _> = other.downcast();
if let Ok(other) = dicted {
PyDict::merge_dict(&zelf.entries, other, vm)?;
return Ok(zelf.into_object());
}
Ok(vm.ctx.not_implemented())
PyDict::merge_object(&zelf.entries, other, vm)?;
Ok(zelf.into_object())
}

#[pymethod(magic)]
Expand Down