Skip to content

Commit 1f62190

Browse files
committed
Use Sequence protocol for in operation
1 parent f839e6c commit 1f62190

12 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎Lib/test/test_types.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,6 @@ def __missing__(self, key):
10751075
self.assertTrue('x' in view)
10761076
self.assertFalse('y' in view)
10771077

1078-
# TODO: RUSTPYTHON
1079-
@unittest.expectedFailure
10801078
def test_customdict(self):
10811079
class customdict(dict):
10821080
def __contains__(self, key):

‎vm/src/builtins/dict.rs‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ impl PyDict {
168168
PyRef,
169169
Constructor,
170170
Initializer,
171-
AsMapping,
172171
Comparable,
173172
Iterable,
174173
AsSequence,
175174
AsNumber,
175+
AsMapping,
176176
Representable
177177
),
178178
flags(BASETYPE)
@@ -1113,8 +1113,8 @@ impl ViewSetOps for PyDictKeys {}
11131113
))]
11141114
impl PyDictKeys {
11151115
#[pymethod(magic)]
1116-
fn contains(zelf: PyRef<Self>, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
1117-
zelf.dict().contains(key, vm)
1116+
fn contains(zelf: PyObjectRef, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
1117+
zelf.to_sequence().contains(&key, vm)
11181118
}
11191119

11201120
#[pygetset]
@@ -1177,23 +1177,8 @@ impl ViewSetOps for PyDictItems {}
11771177
))]
11781178
impl PyDictItems {
11791179
#[pymethod(magic)]
1180-
fn contains(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
1181-
let needle = match_class! {
1182-
match needle {
1183-
tuple @ PyTuple => tuple,
1184-
_ => return Ok(false),
1185-
}
1186-
};
1187-
if needle.len() != 2 {
1188-
return Ok(false);
1189-
}
1190-
let key = needle.fast_getitem(0);
1191-
if !zelf.dict().contains(key.clone(), vm)? {
1192-
return Ok(false);
1193-
}
1194-
let value = needle.fast_getitem(1);
1195-
let found = zelf.dict().getitem(key, vm)?;
1196-
vm.identical_or_equal(&found, &value)
1180+
fn contains(zelf: PyObjectRef, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
1181+
zelf.to_sequence().contains(&needle, vm)
11971182
}
11981183
#[pygetset]
11991184
fn mapping(zelf: PyRef<Self>) -> PyMappingProxy {
@@ -1218,10 +1203,22 @@ impl AsSequence for PyDictItems {
12181203
static AS_SEQUENCE: Lazy<PySequenceMethods> = Lazy::new(|| PySequenceMethods {
12191204
length: atomic_func!(|seq, _vm| Ok(PyDictItems::sequence_downcast(seq).len())),
12201205
contains: atomic_func!(|seq, target, vm| {
1221-
PyDictItems::sequence_downcast(seq)
1222-
.dict
1223-
.entries
1224-
.contains(vm, target)
1206+
let needle: &Py<PyTuple> = match target.downcast_ref() {
1207+
Some(needle) => needle,
1208+
None => return Ok(false),
1209+
};
1210+
if needle.len() != 2 {
1211+
return Ok(false);
1212+
}
1213+
1214+
let zelf = PyDictItems::sequence_downcast(seq);
1215+
let key = needle.fast_getitem(0);
1216+
if !zelf.dict.contains(key.clone(), vm)? {
1217+
return Ok(false);
1218+
}
1219+
let value = needle.fast_getitem(1);
1220+
let found = zelf.dict().getitem(key, vm)?;
1221+
vm.identical_or_equal(&found, &value)
12251222
}),
12261223
..PySequenceMethods::NOT_IMPLEMENTED
12271224
});

‎vm/src/builtins/list.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ where
347347
} else {
348348
let iter = obj.to_owned().get_iter(vm)?;
349349
let iter = iter.iter::<PyObjectRef>(vm)?;
350-
let len = obj.to_sequence(vm).length_opt(vm).transpose()?.unwrap_or(0);
350+
let len = obj.to_sequence().length_opt(vm).transpose()?.unwrap_or(0);
351351
let mut v = Vec::with_capacity(len);
352352
for x in iter {
353353
v.push(f(x?)?);

‎vm/src/builtins/mappingproxy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ impl PyMappingProxy {
127127
MappingProxyInner::Class(class) => Ok(key
128128
.as_interned_str(vm)
129129
.map_or(false, |key| class.attributes.read().contains_key(key))),
130-
MappingProxyInner::Mapping(mapping) => mapping.to_sequence(vm).contains(key, vm),
130+
MappingProxyInner::Mapping(mapping) => mapping.to_sequence().contains(key, vm),
131131
}
132132
}
133133

‎vm/src/builtins/weakproxy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl PyWeakProxy {
106106
}
107107
#[pymethod(magic)]
108108
fn contains(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
109-
self.try_upgrade(vm)?.to_sequence(vm).contains(&needle, vm)
109+
self.try_upgrade(vm)?.to_sequence().contains(&needle, vm)
110110
}
111111

112112
fn getitem(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {

‎vm/src/dictdatatype.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ impl<T: Clone> Dict<T> {
298298
}
299299

300300
pub fn contains<K: DictKey + ?Sized>(&self, vm: &VirtualMachine, key: &K) -> PyResult<bool> {
301-
let (entry, _) = self.lookup(vm, key, key.key_hash(vm)?, None)?;
301+
let key_hash = key.key_hash(vm)?;
302+
let (entry, _) = self.lookup(vm, key, key_hash, None)?;
302303
Ok(entry.index().is_some())
303304
}
304305

‎vm/src/frame.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ impl ExecutingFrame<'_> {
17841784
{
17851785
Ok(d) => d.contains_key(__annotations__, vm),
17861786
Err(o) => {
1787-
let needle = __annotations__.to_object();
1787+
let needle = __annotations__.as_object();
17881788
self._in(vm, needle, &o)?
17891789
}
17901790
};
@@ -1857,16 +1857,16 @@ impl ExecutingFrame<'_> {
18571857
Ok(None)
18581858
}
18591859

1860-
fn _in(&self, vm: &VirtualMachine, needle: PyObjectRef, haystack: &PyObject) -> PyResult<bool> {
1860+
fn _in(&self, vm: &VirtualMachine, needle: &PyObject, haystack: &PyObject) -> PyResult<bool> {
18611861
let found = vm._contains(haystack, needle)?;
1862-
found.try_to_bool(vm)
1862+
Ok(found)
18631863
}
18641864

18651865
#[inline(always)]
18661866
fn _not_in(
18671867
&self,
18681868
vm: &VirtualMachine,
1869-
needle: PyObjectRef,
1869+
needle: &PyObject,
18701870
haystack: &PyObject,
18711871
) -> PyResult<bool> {
18721872
Ok(!self._in(vm, needle, haystack)?)
@@ -1879,8 +1879,8 @@ impl ExecutingFrame<'_> {
18791879
let value = match op {
18801880
bytecode::TestOperator::Is => a.is(&b),
18811881
bytecode::TestOperator::IsNot => !a.is(&b),
1882-
bytecode::TestOperator::In => self._in(vm, a, &b)?,
1883-
bytecode::TestOperator::NotIn => self._not_in(vm, a, &b)?,
1882+
bytecode::TestOperator::In => self._in(vm, &a, &b)?,
1883+
bytecode::TestOperator::NotIn => self._not_in(vm, &a, &b)?,
18841884
bytecode::TestOperator::ExceptionMatch => {
18851885
if let Some(tuple_of_exceptions) = b.downcast_ref::<PyTuple>() {
18861886
for exception in tuple_of_exceptions.iter() {

‎vm/src/protocol/object.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ impl PyObject {
569569
}
570570

571571
pub fn length_opt(&self, vm: &VirtualMachine) -> Option<PyResult<usize>> {
572-
self.to_sequence(vm)
572+
self.to_sequence()
573573
.length_opt(vm)
574574
.or_else(|| self.to_mapping().length_opt(vm))
575575
}
@@ -628,7 +628,7 @@ impl PyObject {
628628
return f(mapping, &needle, Some(value), vm);
629629
}
630630

631-
let seq = self.to_sequence(vm);
631+
let seq = self.to_sequence();
632632
if let Some(f) = seq.methods.ass_item.load() {
633633
let i = needle.key_as_isize(vm)?;
634634
return f(seq, i, Some(value), vm);
@@ -650,7 +650,7 @@ impl PyObject {
650650
let needle = needle.to_pyobject(vm);
651651
return f(mapping, &needle, None, vm);
652652
}
653-
let seq = self.to_sequence(vm);
653+
let seq = self.to_sequence();
654654
if let Some(f) = seq.methods.ass_item.load() {
655655
let i = needle.key_as_isize(vm)?;
656656
return f(seq, i, None, vm);

‎vm/src/protocol/sequence.rs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{
44
function::PyArithmeticValue,
55
object::{Traverse, TraverseFn},
66
protocol::{PyMapping, PyNumberBinaryOp},
7-
AsObject, PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine,
7+
PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine,
88
};
99
use crossbeam_utils::atomic::AtomicCell;
1010
use itertools::Itertools;
@@ -15,11 +15,11 @@ use std::fmt::Debug;
1515

1616
impl PyObject {
1717
#[inline]
18-
pub fn to_sequence(&self, vm: &VirtualMachine) -> PySequence<'_> {
18+
pub fn to_sequence(&self) -> PySequence<'_> {
1919
static GLOBAL_NOT_IMPLEMENTED: PySequenceMethods = PySequenceMethods::NOT_IMPLEMENTED;
2020
PySequence {
2121
obj: self,
22-
methods: PySequence::find_methods(self, vm)
22+
methods: PySequence::find_methods(self)
2323
.map_or(&GLOBAL_NOT_IMPLEMENTED, |x| unsafe { x.borrow_static() }),
2424
}
2525
}
@@ -79,7 +79,7 @@ impl<'a> PySequence<'a> {
7979
}
8080

8181
pub fn try_protocol(obj: &'a PyObject, vm: &VirtualMachine) -> PyResult<Self> {
82-
let seq = obj.to_sequence(vm);
82+
let seq = obj.to_sequence();
8383
if seq.check() {
8484
Ok(seq)
8585
} else {
@@ -93,15 +93,8 @@ impl PySequence<'_> {
9393
self.methods.item.load().is_some()
9494
}
9595

96-
pub fn find_methods(
97-
obj: &PyObject,
98-
vm: &VirtualMachine,
99-
) -> Option<PointerSlot<PySequenceMethods>> {
96+
pub fn find_methods(obj: &PyObject) -> Option<PointerSlot<PySequenceMethods>> {
10097
let cls = obj.class();
101-
// if cls.fast_issubclass(vm.ctx.types.dict_type) {
102-
if cls.is(vm.ctx.types.dict_type) {
103-
return None;
104-
}
10598
cls.mro_find_map(|x| x.slots.as_sequence.load())
10699
}
107100

@@ -124,7 +117,7 @@ impl PySequence<'_> {
124117
}
125118

126119
// if both arguments apear to be sequences, try fallback to __add__
127-
if self.check() && other.to_sequence(vm).check() {
120+
if self.check() && other.to_sequence().check() {
128121
let ret = vm.binary_op1(self.obj, other, PyNumberBinaryOp::Add)?;
129122
if let PyArithmeticValue::Implemented(ret) = PyArithmeticValue::from_object(vm, ret) {
130123
return Ok(ret);
@@ -162,7 +155,7 @@ impl PySequence<'_> {
162155
}
163156

164157
// if both arguments apear to be sequences, try fallback to __iadd__
165-
if self.check() && other.to_sequence(vm).check() {
158+
if self.check() && other.to_sequence().check() {
166159
let ret = vm._iadd(self.obj, other)?;
167160
if let PyArithmeticValue::Implemented(ret) = PyArithmeticValue::from_object(vm, ret) {
168161
return Ok(ret);

‎vm/src/stdlib/operator.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ mod _operator {
172172
}
173173

174174
#[pyfunction]
175-
fn contains(a: PyObjectRef, b: PyObjectRef, vm: &VirtualMachine) -> PyResult {
176-
vm._contains(&a, b)
175+
fn contains(a: PyObjectRef, b: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
176+
vm._contains(&a, &b)
177177
}
178178

179179
#[pyfunction(name = "countOf")]

0 commit comments

Comments
 (0)