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

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
&self support for getter/setter
  • Loading branch information
@youknowone
youknowone committed Feb 5, 2020
commit ca557788c8d9330079cfadd05798feeeb5fe57f0
35 changes: 32 additions & 3 deletions vm/src/obj/objgetset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

*/
use super::objtype::PyClassRef;
use crate::function::OptionalArg;
use crate::function::{OptionalArg, OwnedParam, RefParam};
use crate::pyobject::{
IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
};
Expand All @@ -16,7 +16,7 @@ pub trait IntoPyGetterFunc<T, R> {
fn into_getter(self) -> PyGetterFunc;
}

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

impl<F, S, R> IntoPyGetterFunc<RefParam<S>, R> for F
where
F: Fn(&S, &VirtualMachine) -> R + 'static,
S: PyValue,
R: IntoPyObject,
{
fn into_getter(self) -> PyGetterFunc {
Box::new(move |vm, obj| {
let zelf = PyRef::<S>::try_from_object(vm, obj)?;
(self)(&zelf, vm).into_pyobject(vm)
})
}
}

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

impl<F, T, V> IntoPySetterFunc<T, V> for F
impl<F, T, V> IntoPySetterFunc<OwnedParam<T>, V> for F
where
F: Fn(T, V, &VirtualMachine) -> PyResult<()> + 'static,
T: TryFromObject,
Expand All @@ -49,6 +63,21 @@ where
}
}

impl<F, S, V> IntoPySetterFunc<RefParam<S>, V> for F
where
F: Fn(&S, V, &VirtualMachine) -> PyResult<()> + 'static,
S: PyValue,
V: TryFromObject,
{
fn into_setter(self) -> PySetterFunc {
Box::new(move |vm, obj, value| {
let zelf = PyRef::<S>::try_from_object(vm, obj)?;
let value = V::try_from_object(vm, value)?;
(self)(&zelf, value, vm)
})
}
}

#[pyclass]
pub struct PyGetSet {
name: String,
Expand Down