Skip to content

introduce and adapt vm.identical_or_equal to test is or else __eq__ #1501

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
merged 1 commit into from
Oct 12, 2019
Merged

introduce and adapt vm.identical_or_equal to test is or else __eq__ #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions vm/src/dictdatatype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::obj::objbool;
use crate::obj::objstr::PyString;
use crate::pyhash;
use crate::pyobject::{IdProtocol, IntoPyObject, PyObjectRef, PyResult};
Expand Down Expand Up @@ -305,8 +304,7 @@ impl DictKey for &PyObjectRef {
}

fn do_eq(self, vm: &VirtualMachine, other_key: &PyObjectRef) -> PyResult<bool> {
let result = vm._eq(self.clone(), other_key.clone())?;
objbool::boolval(vm, result)
vm.identical_or_equal(self, other_key)
}
}

Expand Down Expand Up @@ -399,7 +397,7 @@ mod tests {
assert_eq!(true, dict.contains(&vm, "x").unwrap());

let val = dict.get(&vm, "x").unwrap().unwrap();
vm._eq(val, value2)
vm.bool_eq(val, value2)
.expect("retrieved value must be equal to inserted value.");
}

Expand Down
4 changes: 1 addition & 3 deletions vm/src/obj/objdict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::cell::{Cell, RefCell};
use std::fmt;

use super::objbool;
use super::objiter;
use super::objstr;
use super::objtype::{self, PyClassRef};
Expand Down Expand Up @@ -121,8 +120,7 @@ impl PyDictRef {
if v1.is(&v2) {
continue;
}
let value = objbool::boolval(vm, vm._eq(v1, v2)?)?;
if !value {
if !vm.bool_eq(v1, v2)? {
return Ok(false);
}
}
Expand Down
26 changes: 4 additions & 22 deletions vm/src/obj/objlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,25 +447,16 @@ impl PyListRef {
fn count(self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
let mut count: usize = 0;
for element in self.elements.borrow().iter() {
if needle.is(element) {
if vm.identical_or_equal(element, &needle)? {
count += 1;
} else {
let py_equal = vm._eq(element.clone(), needle.clone())?;
if objbool::boolval(vm, py_equal)? {
count += 1;
}
}
}
Ok(count)
}

fn contains(self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
for element in self.elements.borrow().iter() {
if needle.is(element) {
return Ok(true);
}
let py_equal = vm._eq(element.clone(), needle.clone())?;
if objbool::boolval(vm, py_equal)? {
if vm.identical_or_equal(element, &needle)? {
return Ok(true);
}
}
Expand All @@ -475,11 +466,7 @@ impl PyListRef {

fn index(self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
for (index, element) in self.elements.borrow().iter().enumerate() {
if needle.is(element) {
return Ok(index);
}
let py_equal = vm._eq(needle.clone(), element.clone())?;
if objbool::boolval(vm, py_equal)? {
if vm.identical_or_equal(element, &needle)? {
return Ok(index);
}
}
Expand All @@ -505,12 +492,7 @@ impl PyListRef {
fn remove(self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
let mut ri: Option<usize> = None;
for (index, element) in self.elements.borrow().iter().enumerate() {
if needle.is(element) {
ri = Some(index);
break;
}
let py_equal = vm._eq(needle.clone(), element.clone())?;
if objbool::get_value(&py_equal) {
if vm.identical_or_equal(element, &needle)? {
ri = Some(index);
break;
}
Expand Down
6 changes: 3 additions & 3 deletions vm/src/obj/objslice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ impl PySlice {
}

fn inner_eq(&self, other: &PySlice, vm: &VirtualMachine) -> PyResult<bool> {
if !vm.bool_eq(self.start(vm), other.start(vm))? {
if !vm.identical_or_equal(&self.start(vm), &other.start(vm))? {
return Ok(false);
}
if !vm.bool_eq(self.stop(vm), other.stop(vm))? {
if !vm.identical_or_equal(&self.stop(vm), &other.stop(vm))? {
return Ok(false);
}
if !vm.bool_eq(self.step(vm), other.step(vm))? {
if !vm.identical_or_equal(&self.step(vm), &other.step(vm))? {
return Ok(false);
}
Ok(true)
Expand Down
22 changes: 4 additions & 18 deletions vm/src/obj/objtuple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::cell::Cell;
use std::fmt;

use super::objbool;
use super::objiter;
use super::objsequence::{
get_elements_tuple, get_item, seq_equal, seq_ge, seq_gt, seq_le, seq_lt, seq_mul,
Expand All @@ -10,7 +9,7 @@ use super::objtype::{self, PyClassRef};
use crate::function::OptionalArg;
use crate::pyhash;
use crate::pyobject::{
IdProtocol, IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue,
IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue,
};
use crate::vm::{ReprGuard, VirtualMachine};

Expand Down Expand Up @@ -142,13 +141,8 @@ impl PyTuple {
fn count(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
let mut count: usize = 0;
for element in self.elements.iter() {
if element.is(&needle) {
if vm.identical_or_equal(element, &needle)? {
count += 1;
} else {
let is_eq = vm._eq(element.clone(), needle.clone())?;
if objbool::boolval(vm, is_eq)? {
count += 1;
}
}
}
Ok(count)
Expand Down Expand Up @@ -236,11 +230,7 @@ impl PyTuple {
#[pymethod(name = "index")]
fn index(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
for (index, element) in self.elements.iter().enumerate() {
if element.is(&needle) {
return Ok(index);
}
let is_eq = vm._eq(needle.clone(), element.clone())?;
if objbool::boolval(vm, is_eq)? {
if vm.identical_or_equal(element, &needle)? {
return Ok(index);
}
}
Expand All @@ -250,11 +240,7 @@ impl PyTuple {
#[pymethod(name = "__contains__")]
fn contains(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
for element in self.elements.iter() {
if element.is(&needle) {
return Ok(true);
}
let is_eq = vm._eq(needle.clone(), element.clone())?;
if objbool::boolval(vm, is_eq)? {
if vm.identical_or_equal(element, &needle)? {
return Ok(true);
}
}
Expand Down
8 changes: 4 additions & 4 deletions vm/src/stdlib/collections.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::function::OptionalArg;
use crate::obj::{objbool, objiter, objsequence, objtype::PyClassRef};
use crate::obj::{objiter, objsequence, objtype::PyClassRef};
use crate::pyobject::{IdProtocol, PyClassImpl, PyIterable, PyObjectRef, PyRef, PyResult, PyValue};
use crate::vm::ReprGuard;
use crate::VirtualMachine;
Expand Down Expand Up @@ -78,7 +78,7 @@ impl PyDeque {
fn count(&self, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
let mut count = 0;
for elem in self.deque.borrow().iter() {
if objbool::boolval(vm, vm._eq(elem.clone(), obj.clone())?)? {
if vm.identical_or_equal(elem, &obj)? {
count += 1;
}
}
Expand Down Expand Up @@ -114,7 +114,7 @@ impl PyDeque {
let start = start.unwrap_or(0);
let stop = stop.unwrap_or_else(|| deque.len());
for (i, elem) in deque.iter().skip(start).take(stop - start).enumerate() {
if objbool::boolval(vm, vm._eq(elem.clone(), obj.clone())?)? {
if vm.identical_or_equal(elem, &obj)? {
return Ok(i);
}
}
Expand Down Expand Up @@ -171,7 +171,7 @@ impl PyDeque {
let mut deque = self.deque.borrow_mut();
let mut idx = None;
for (i, elem) in deque.iter().enumerate() {
if objbool::boolval(vm, vm._eq(elem.clone(), obj.clone())?)? {
if vm.identical_or_equal(elem, &obj)? {
idx = Some(i);
break;
}
Expand Down
13 changes: 10 additions & 3 deletions vm/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,8 +1236,7 @@ impl VirtualMachine {
let iter = objiter::get_iter(self, &haystack)?;
loop {
if let Some(element) = objiter::get_next_object(self, &iter)? {
let equal = self._eq(needle.clone(), element.clone())?;
if objbool::get_value(&equal) {
if self.bool_eq(needle.clone(), element.clone())? {
return Ok(self.new_bool(true));
} else {
continue;
Expand Down Expand Up @@ -1270,11 +1269,19 @@ impl VirtualMachine {
}

pub fn bool_eq(&self, a: PyObjectRef, b: PyObjectRef) -> PyResult<bool> {
let eq = self._eq(a.clone(), b.clone())?;
let eq = self._eq(a, b)?;
let value = objbool::boolval(self, eq)?;
Ok(value)
}

pub fn identical_or_equal(&self, a: &PyObjectRef, b: &PyObjectRef) -> PyResult<bool> {
if a.is(b) {
Ok(true)
} else {
self.bool_eq(a.clone(), b.clone())
}
}

pub fn bool_seq_lt(&self, a: PyObjectRef, b: PyObjectRef) -> PyResult<Option<bool>> {
let value = if objbool::boolval(self, self._lt(a.clone(), b.clone())?)? {
Some(true)
Expand Down