Skip to content

(WIP) Revert None property workaround #1736

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

Closed
youknowone wants to merge 11 commits into from
Closed

(WIP) Revert None property workaround #1736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 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
a5c7a69
PySetResult and IntoPySetResult
youknowone Feb 3, 2020
71a3283
More PySetResult
youknowone Feb 5, 2020
f696c85
VM polymorphism for getter and setter
youknowone Feb 3, 2020
18426ba
compatiibility for CPytthon descr_check
youknowone Feb 4, 2020
5d6c82d
pyproperty generates PyGetSet instead of PyProperty
youknowone Feb 3, 2020
87faff8
Remove PropertyBuilder and add new_getset
youknowone Feb 5, 2020
372f3d4
Revert 08e66b5002f3a3a30db72b350b18c61d367ef1fc
youknowone Feb 1, 2020
f5c5bd3
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
VM polymorphism for getter and setter
  • Loading branch information
@youknowone
youknowone committed Feb 5, 2020
commit f696c85dd117b8b1b08e45cd4f74ffefc1c7ea1f
68 changes: 55 additions & 13 deletions vm/src/obj/objgetset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use crate::vm::VirtualMachine;
pub type PyGetterFunc = Box<dyn Fn(&VirtualMachine, PyObjectRef) -> PyResult>;
pub type PySetterFunc = Box<dyn Fn(&VirtualMachine, PyObjectRef, PyObjectRef) -> PySetResult>;

pub trait IntoPyGetterFunc<T, R> {
pub trait IntoPyGetterFunc<T> {
fn into_getter(self) -> PyGetterFunc;
}

impl<F, T, R> IntoPyGetterFunc<OwnedParam<T>, R> for F
impl<F, T, R> IntoPyGetterFunc<(OwnedParam<T>, R, VirtualMachine)> for F
where
F: Fn(T, &VirtualMachine) -> R + 'static,
T: TryFromObject,
Expand All @@ -31,7 +31,7 @@ where
}
}

impl<F, S, R> IntoPyGetterFunc<RefParam<S>, R> for F
impl<F, S, R> IntoPyGetterFunc<(RefParam<S>, R, VirtualMachine)> for F
where
F: Fn(&S, &VirtualMachine) -> R + 'static,
S: PyValue,
Expand All @@ -45,14 +45,33 @@ where
}
}

pub trait IntoPySetterFunc<T, V, R>
impl<F, T, R> IntoPyGetterFunc<(OwnedParam<T>, R)> for F
where
R: IntoPySetResult,
F: Fn(T) -> R + 'static,
T: TryFromObject,
R: IntoPyObject,
{
fn into_getter(self) -> PyGetterFunc {
IntoPyGetterFunc::into_getter(move |obj, _vm: &VirtualMachine| (self)(obj))
}
}

impl<F, S, R> IntoPyGetterFunc<(RefParam<S>, R)> for F
where
F: Fn(&S) -> R + 'static,
S: PyValue,
R: IntoPyObject,
{
fn into_getter(self) -> PyGetterFunc {
IntoPyGetterFunc::into_getter(move |zelf: &S, _vm: &VirtualMachine| (self)(zelf))
}
}

pub trait IntoPySetterFunc<T> {
fn into_setter(self) -> PySetterFunc;
}

impl<F, T, V, R> IntoPySetterFunc<OwnedParam<T>, V, R> for F
impl<F, T, V, R> IntoPySetterFunc<(OwnedParam<T>, V, R, VirtualMachine)> for F
where
F: Fn(T, V, &VirtualMachine) -> R + 'static,
T: TryFromObject,
Expand All @@ -68,7 +87,7 @@ where
}
}

impl<F, S, V, R> IntoPySetterFunc<RefParam<S>, V, R> for F
impl<F, S, V, R> IntoPySetterFunc<(RefParam<S>, V, R, VirtualMachine)> for F
where
F: Fn(&S, V, &VirtualMachine) -> R + 'static,
S: PyValue,
Expand All @@ -84,6 +103,30 @@ where
}
}

impl<F, T, V, R> IntoPySetterFunc<(OwnedParam<T>, V, R)> for F
where
F: Fn(T, V) -> R + 'static,
T: TryFromObject,
V: TryFromObject,
R: IntoPySetResult,
{
fn into_setter(self) -> PySetterFunc {
IntoPySetterFunc::into_setter(move |obj, v, _vm: &VirtualMachine| (self)(obj, v))
}
}

impl<F, S, V, R> IntoPySetterFunc<(RefParam<S>, V, R)> for F
where
F: Fn(&S, V) -> R + 'static,
S: PyValue,
V: TryFromObject,
R: IntoPySetResult,
{
fn into_setter(self) -> PySetterFunc {
IntoPySetterFunc::into_setter(move |zelf: &S, v, _vm: &VirtualMachine| (self)(zelf, v))
}
}

#[pyclass]
pub struct PyGetSet {
name: String,
Expand Down Expand Up @@ -140,9 +183,9 @@ impl PyBuiltinDescriptor for PyGetSet {
}

impl PyGetSet {
pub fn with_get<G, T, R>(name: String, getter: G) -> Self
pub fn with_get<G, X>(name: String, getter: G) -> Self
where
G: IntoPyGetterFunc<T, R>,
G: IntoPyGetterFunc<X>,
{
Self {
name,
Expand All @@ -151,11 +194,10 @@ impl PyGetSet {
}
}

pub fn with_get_set<G, S, GT, GR, ST, SV, SR>(name: String, getter: G, setter: S) -> Self
pub fn with_get_set<G, S, X, Y>(name: String, getter: G, setter: S) -> Self
where
G: IntoPyGetterFunc<GT, GR>,
S: IntoPySetterFunc<ST, SV, SR>,
SR: IntoPySetResult,
G: IntoPyGetterFunc<X>,
S: IntoPySetterFunc<Y>,
{
Self {
name,
Expand Down
2 changes: 1 addition & 1 deletion vm/src/obj/objproperty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ impl<'a> PropertyBuilder<'a> {
}
}

pub fn add_getter<I, V, VM, F: IntoPyNativeFunc<I, V, VM>>(self, func: F) -> Self {
pub fn add_getter<I, R, VM, F: IntoPyNativeFunc<I, R, VM>>(self, func: F) -> Self {
let func = self.ctx.new_method(func);
Self {
ctx: self.ctx,
Expand Down