Skip to content

Add getset_descriptor #1738

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
coolreader18 merged 10 commits into from
Feb 6, 2020
Merged

Add getset_descriptor #1738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f5cd17
Add getset_descriptor
youknowone Feb 2, 2020
c3d5f6c
IntoPyGetterFunc, IntoPySetterFunc
youknowone Feb 2, 2020
ca55778
`&self` support for getter/setter
youknowone Feb 3, 2020
d1f9cb4
PySetResult and IntoPySetResult
youknowone Feb 3, 2020
226a2a6
VM polymorphism for getter and setter
youknowone Feb 3, 2020
23381b9
compatiibility for CPytthon descr_check
youknowone Feb 4, 2020
0aee78d
pyproperty generates PyGetSet instead of PyProperty
youknowone Feb 3, 2020
facabfe
Remove PropertyBuilder and add new_getset
youknowone Feb 5, 2020
58744df
Revert 08e66b5002f3a3a30db72b350b18c61d367ef1fc
youknowone Feb 1, 2020
c0b235e
cleanup property and get descriptor codes
youknowone Feb 2, 2020
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
Prev Previous commit
Next Next commit
Revert 08e66b5 
which is not required anymore
  • Loading branch information
@youknowone
youknowone committed Feb 5, 2020
commit 58744df1d594fd06a8211b9c3c1014514b1ed230
65 changes: 1 addition & 64 deletions vm/src/obj/objnone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use super::objproperty::PyPropertyRef;
use super::objstr::PyStringRef;
use super::objtype::PyClassRef;
use crate::pyobject::{
IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
TypeProtocol,
IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
};
use crate::vm::VirtualMachine;

Expand Down Expand Up @@ -52,66 +49,6 @@ impl PyNone {
Ok(false)
}

#[pymethod(name = "__getattribute__")]
fn get_attribute(zelf: PyRef<Self>, name: PyStringRef, vm: &VirtualMachine) -> PyResult {
vm_trace!("None.__getattribute__({:?}, {:?})", self, name);
let cls = zelf.class();

// Properties use a comparision with None to determine if they are either invoked by am
// instance binding or a class binding. But if the object itself is None then this detection
// won't work. Instead we call a special function on property that bypasses this check, as
// we are invoking it as a instance binding.
//
// In CPython they instead call the slot tp_descr_get with NULL to indicates it's an
// instance binding.
// https://github.com/python/cpython/blob/master/Objects/typeobject.c#L3281
fn call_descriptor(
descriptor: PyObjectRef,
get_func: PyObjectRef,
obj: PyObjectRef,
cls: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult {
if let Ok(property) = PyPropertyRef::try_from_object(vm, descriptor.clone()) {
property.instance_binding_get(obj, vm)
} else {
vm.invoke(&get_func, vec![descriptor, obj, cls])
}
}

if let Some(attr) = cls.get_attr(name.as_str()) {
let attr_class = attr.class();
if attr_class.has_attr("__set__") {
if let Some(get_func) = attr_class.get_attr("__get__") {
return call_descriptor(
attr,
get_func,
zelf.into_object(),
cls.into_object(),
vm,
);
}
}
}

// None has no attributes and cannot have attributes set on it.
// if let Some(obj_attr) = zelf.as_object().get_attr(name.as_str()) {
// Ok(obj_attr)
// } else
if let Some(attr) = cls.get_attr(name.as_str()) {
let attr_class = attr.class();
if let Some(get_func) = attr_class.get_attr("__get__") {
call_descriptor(attr, get_func, zelf.into_object(), cls.into_object(), vm)
} else {
Ok(attr)
}
} else if let Some(getter) = cls.get_attr("__getattr__") {
vm.invoke(&getter, vec![zelf.into_object(), name.into_object()])
} else {
Err(vm.new_attribute_error(format!("{} has no attribute '{}'", zelf.as_object(), name)))
}
}

#[pymethod(name = "__eq__")]
fn eq(&self, rhs: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
if vm.is_none(&rhs) {
Expand Down
9 changes: 0 additions & 9 deletions vm/src/obj/objproperty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@ impl PyProperty {

// Descriptor methods

// specialised version that doesn't check for None
pub(crate) fn instance_binding_get(&self, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if let Some(ref getter) = self.getter.as_ref() {
vm.invoke(getter, obj)
} else {
Err(vm.new_attribute_error("unreadable attribute".to_owned()))
}
}

#[pymethod(name = "__set__")]
fn set(&self, obj: PyObjectRef, value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if let Some(ref setter) = self.setter.as_ref() {
Expand Down