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

static_as_sequence_generic

Browse Source
This commit is contained in:
Jeong Yunwon
2022-05-29 02:26:45 +09:00
parent 38a36d7593
commit 4d02fe0aa6
10 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vm/src/builtins/bytes.rs
View File

@@ -602,7 +602,7 @@ impl AsSequence for PyBytes {
let other = <Either<PyBytesInner, PyIntRef>>::try_from_object(vm, other.to_owned())?;
Self::sequence_downcast(seq).contains(other, vm)
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

8
vm/src/builtins/dict.rs
View File

@@ -480,7 +480,7 @@ impl AsMapping for PyDict {
impl AsSequence for PyDict {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
contains: Some(|seq, target, vm| Self::sequence_downcast(seq).entries.contains(vm, target)),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}
@@ -1056,7 +1056,7 @@ impl AsSequence for PyDictKeys {
.entries
.contains(vm, target)
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}
@@ -1105,7 +1105,7 @@ impl AsSequence for PyDictItems {
.entries
.contains(vm, target)
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}
@@ -1116,7 +1116,7 @@ impl Unconstructible for PyDictValues {}
impl AsSequence for PyDictValues {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
length: Some(|seq, _vm| Ok(Self::sequence_downcast(seq).len())),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

2
vm/src/builtins/mappingproxy.rs
View File

@@ -158,7 +158,7 @@ impl AsMapping for PyMappingProxy {
impl AsSequence for PyMappingProxy {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
contains: Some(|seq, target, vm| Self::sequence_downcast(seq)._contains(target, vm)),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

2
vm/src/builtins/memory.rs
View File

@@ -987,7 +987,7 @@ impl AsSequence for PyMemoryView {
zelf.try_not_released(vm)?;
zelf.getitem_by_idx(i, vm)
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

2
vm/src/builtins/range.rs
View File

@@ -413,7 +413,7 @@ impl AsSequence for PyRange {
contains: Some(|seq, needle, vm| {
Ok(Self::sequence_downcast(seq).contains(needle.to_owned(), vm))
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

4
vm/src/builtins/set.rs
View File

@@ -665,7 +665,7 @@ impl AsSequence for PySet {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
length: Some(|seq, _vm| Ok(Self::sequence_downcast(seq).len())),
contains: Some(|seq, needle, vm| Self::sequence_downcast(seq).inner.contains(needle, vm)),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}
@@ -897,7 +897,7 @@ impl AsSequence for PyFrozenSet {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
length: Some(|seq, _vm| Ok(Self::sequence_downcast(seq).len())),
contains: Some(|seq, needle, vm| Self::sequence_downcast(seq).inner.contains(needle, vm)),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

2
vm/src/builtins/str.rs
View File

@@ -1325,7 +1325,7 @@ impl AsSequence for PyStr {
.map(|x| zelf.new_substr(x.to_string()).into_ref(vm).into())
}),
contains: Some(|seq, needle, vm| Self::sequence_downcast(seq)._contains(needle, vm)),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

2
vm/src/builtins/tuple.rs
View File

@@ -378,7 +378,7 @@ impl AsSequence for PyTuple {
let zelf = Self::sequence_downcast(seq);
zelf._contains(needle, vm)
}),
..*PySequenceMethods::not_implemented()
..PySequenceMethods::NOT_IMPLEMENTED
};
}

26
vm/src/protocol/sequence.rs
View File

@@ -30,9 +30,16 @@ pub struct PySequenceMethods {
}
impl PySequenceMethods {
pub const fn not_implemented() -> &'static Self {
&NOT_IMPLEMENTED
}
pub const NOT_IMPLEMENTED: PySequenceMethods = PySequenceMethods {
length: None,
concat: None,
repeat: None,
item: None,
ass_item: None,
contains: None,
inplace_concat: None,
inplace_repeat: None,
};
}
impl Debug for PySequenceMethods {
@@ -101,7 +108,7 @@ impl PySequence<'_> {
return f(self.obj, vm);
}
}
Cow::Borrowed(PySequenceMethods::not_implemented())
Cow::Borrowed(&PySequenceMethods::NOT_IMPLEMENTED)
})
}
@@ -393,14 +400,3 @@ impl PySequence<'_> {
}
}
}
const NOT_IMPLEMENTED: PySequenceMethods = PySequenceMethods {
length: None,
concat: None,
repeat: None,
item: None,
ass_item: None,
contains: None,
inplace_concat: None,
inplace_repeat: None,
};

114
vm/src/types/slot.rs
View File

@@ -164,16 +164,6 @@ pub(crate) type InitFunc = fn(PyObjectRef, FuncArgs, &VirtualMachine) -> PyResul
pub(crate) type DelFunc = fn(&PyObject, &VirtualMachine) -> PyResult<()>;
pub(crate) type AsSequenceFunc = fn(&PyObject, &VirtualMachine) -> Cow<'static, PySequenceMethods>;
macro_rules! then_some_closure {
($cond:expr, $closure:expr) => {
if $cond {
Some($closure)
} else {
None
}
};
}
fn length_wrapper(obj: &PyObject, vm: &VirtualMachine) -> PyResult<usize> {
let ret = vm.call_special_method(obj.to_owned(), identifier!(vm, __len__), ())?;
let len = ret.payload::<PyInt>().ok_or_else(|| {
@@ -282,45 +272,73 @@ fn as_mapping_generic(zelf: &PyObject, vm: &VirtualMachine) -> &'static PyMappin
static_as_mapping_generic(has_length, has_subscript, has_ass_subscript)
}
fn as_sequence_wrapper(zelf: &PyObject, vm: &VirtualMachine) -> Cow<'static, PySequenceMethods> {
if !zelf.class().has_attr(identifier!(vm, __getitem__)) {
return Cow::Borrowed(PySequenceMethods::not_implemented());
pub(crate) fn static_as_sequence_generic(
has_length: bool,
has_ass_item: bool,
) -> &'static PySequenceMethods {
static METHODS: &[PySequenceMethods] = &[
new_generic(false, false),
new_generic(true, false),
new_generic(false, true),
new_generic(true, true),
];
fn length(seq: &PySequence, vm: &VirtualMachine) -> PyResult<usize> {
length_wrapper(seq.obj, vm)
}
fn item(seq: &PySequence, i: isize, vm: &VirtualMachine) -> PyResult {
vm.call_special_method(seq.obj.to_owned(), identifier!(vm, __getitem__), (i,))
}
fn ass_item(
seq: &PySequence,
i: isize,
value: Option<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
match value {
Some(value) => vm
.call_special_method(
seq.obj.to_owned(),
identifier!(vm, __setitem__),
(i.to_pyobject(vm), value),
)
.map(|_| Ok(()))?,
None => vm
.call_special_method(
seq.obj.to_owned(),
identifier!(vm, __delitem__),
(i.to_pyobject(vm),),
)
.map(|_| Ok(()))?,
}
}
Cow::Owned(PySequenceMethods {
length: then_some_closure!(
zelf.class().has_attr(identifier!(vm, __len__)),
|seq, vm| { length_wrapper(seq.obj, vm) }
),
item: Some(|seq, i, vm| {
vm.call_special_method(
seq.obj.to_owned(),
identifier!(vm, __getitem__),
(i.to_pyobject(vm),),
)
}),
ass_item: then_some_closure!(
zelf.class().has_attr(identifier!(vm, __setitem__))
| zelf.class().has_attr(identifier!(vm, __delitem__)),
|seq, i, value, vm| match value {
Some(value) => vm
.call_special_method(
seq.obj.to_owned(),
identifier!(vm, __setitem__),
(i.to_pyobject(vm), value),
)
.map(|_| Ok(()))?,
None => vm
.call_special_method(
seq.obj.to_owned(),
identifier!(vm, __delitem__),
(i.to_pyobject(vm),)
)
.map(|_| Ok(()))?,
}
),
..Default::default()
})
const fn new_generic(has_length: bool, has_ass_item: bool) -> PySequenceMethods {
PySequenceMethods {
length: if has_length { Some(length) } else { None },
item: Some(item),
ass_item: if has_ass_item { Some(ass_item) } else { None },
..PySequenceMethods::NOT_IMPLEMENTED
}
}
let key = bool_int(has_length) | (bool_int(has_ass_item) << 1);
&METHODS[key]
}
fn as_sequence_generic(zelf: &PyObject, vm: &VirtualMachine) -> Cow<'static, PySequenceMethods> {
if !zelf.class().has_attr(identifier!(vm, __getitem__)) {
return Cow::Borrowed(&PySequenceMethods::NOT_IMPLEMENTED);
}
let (has_length, has_ass_item) = (
zelf.class().has_attr(identifier!(vm, __len__)),
zelf.class().has_attr(identifier!(vm, __setitem__))
| zelf.class().has_attr(identifier!(vm, __delitem__)),
);
Cow::Borrowed(static_as_sequence_generic(has_length, has_ass_item))
}
fn hash_wrapper(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<PyHash> {
@@ -436,7 +454,7 @@ impl PyType {
match name.as_str() {
"__len__" | "__getitem__" | "__setitem__" | "__delitem__" => {
update_slot!(as_mapping, as_mapping_generic);
update_slot!(as_sequence, as_sequence_wrapper);
update_slot!(as_sequence, as_sequence_generic);
}
"__hash__" => {
update_slot!(hash, hash_wrapper);