Skip to content

Dont call eq #441

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
windelbouwman merged 2 commits into from
Feb 11, 2019
Merged

Dont call eq #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50be99a
Failing test case for in and index where types don't match.
cthulahoops Feb 11, 2019
67710d6
Don't call __eq__ directly.
cthulahoops Feb 11, 2019
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
3 changes: 3 additions & 0 deletions tests/snippets/tuple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@
recursive = (recursive_list,)
recursive_list.append(recursive)
assert repr(recursive) == "([(...)],)"

assert (None, "", 1).index(1) == 2
assert 1 in (None, "", 1)
2 changes: 1 addition & 1 deletion vm/src/obj/objiter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fn contains(vm: &mut VirtualMachine, args: PyFuncArgs, iter_type: PyObjectRef) -
);
loop {
if let Some(element) = get_next_object(vm, iter)? {
let equal = vm.call_method(needle, "__eq__", vec![element.clone()])?;
let equal = vm._eq(needle.clone(), element.clone())?;
if objbool::get_value(&equal) {
return Ok(vm.new_bool(true));
} else {
Expand Down
4 changes: 2 additions & 2 deletions vm/src/obj/objlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fn list_index(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
required = [(list, Some(vm.ctx.list_type())), (needle, None)]
);
for (index, element) in get_elements(list).iter().enumerate() {
let py_equal = vm.call_method(needle, "__eq__", vec![element.clone()])?;
let py_equal = vm._eq(needle.clone(), element.clone())?;
if objbool::get_value(&py_equal) {
return Ok(vm.context().new_int(index));
}
Expand Down Expand Up @@ -296,7 +296,7 @@ fn list_contains(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
required = [(list, Some(vm.ctx.list_type())), (needle, None)]
);
for element in get_elements(list).iter() {
match vm.call_method(needle, "__eq__", vec![element.clone()]) {
match vm._eq(needle.clone(), element.clone()) {
Ok(value) => {
if objbool::get_value(&value) {
return Ok(vm.new_bool(true));
Expand Down
4 changes: 2 additions & 2 deletions vm/src/obj/objtuple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ pub fn tuple_index(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
required = [(tuple, Some(vm.ctx.tuple_type())), (needle, None)]
);
for (index, element) in get_elements(tuple).iter().enumerate() {
let py_equal = vm.call_method(needle, "__eq__", vec![element.clone()])?;
let py_equal = vm._eq(needle.clone(), element.clone())?;
if objbool::get_value(&py_equal) {
return Ok(vm.context().new_int(index));
}
Expand All @@ -279,7 +279,7 @@ pub fn tuple_contains(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
required = [(tuple, Some(vm.ctx.tuple_type())), (needle, None)]
);
for element in get_elements(tuple).iter() {
match vm.call_method(needle, "__eq__", vec![element.clone()]) {
match vm._eq(needle.clone(), element.clone()) {
Ok(value) => {
if objbool::get_value(&value) {
return Ok(vm.new_bool(true));
Expand Down