Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 23:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

First pass adapting all property_cpp_function<> implementations. Still needs debugging and more testing:

Browse Source 
```
========================================================= short test summary info ==========================================================
SKIPPED [2] test_class_sh_property.py:19: BAKEIN_BREAK: Failed: DID NOT RAISE <class 'ValueError'>
SKIPPED [1] test_class_sh_property.py:87: BAKEIN_BREAK: m_uqcp_readwrite does not build
SKIPPED [1] test_class_sh_property.py:140: BAKEIN_BREAK: m_uqmp_readwrite does not build
SKIPPED [1] test_class_sh_property.py:140: BAKEIN_BREAK: m_uqcp_readwrite does not build
SKIPPED [1] test_class_sh_basic.py:156: unconditional skip
SKIPPED [1] test_class_sh_property.py:87: BAKEIN_BREAK: m_uqmp_readwrite does not build
SKIPPED [1] test_stl.py:149: no <experimental/optional>
SKIPPED [1] test_smart_ptr.py:301: BAKEIN_EXPECTED: Failed: DID NOT RAISE <class 'RuntimeError'>
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_value_rw-expected1-True] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_value_rw-expected1-False] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_value_ro-expected0-True] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_raw_ptr_ro-expected4-True] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_raw_ptr_ro-expected4-False] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_raw_ptr_rw-expected5-True] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_value_ro-expected0-False] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
FAILED test_class_sh_property_non_owning.py::test_core_fld_common[core_fld_raw_ptr_rw-expected5-False] - RuntimeError: Non-owning holder (loaded_as_shared_ptr).
================================================ 8 failed, 1056 passed, 9 skipped in 3.96s =================================================
```
This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-07-10 15:20:31 -07:00
parent f852cf5714
commit 1bcf572780
1 changed files with 78 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
include/pybind11/pybind11.h
View File

@ -1599,6 +1599,7 @@ using must_be_member_function_pointer
// Note that property_cpp_function is intentionally in the main pybind11 namespace, // Note that property_cpp_function is intentionally in the main pybind11 namespace,
// because user-defined specializations could be useful. // because user-defined specializations could be useful.
// BAKEIN_WIP: Rewrite comment.
// Classic (non-smart_holder) implementations for .def_readonly and .def_readwrite // Classic (non-smart_holder) implementations for .def_readonly and .def_readwrite
// getter and setter functions. // getter and setter functions.
// WARNING: This classic implementation can lead to dangling pointers for raw pointer members. // WARNING: This classic implementation can lead to dangling pointers for raw pointer members.
@ -1622,7 +1623,7 @@ struct property_cpp_function {
} }
}; };
#ifdef BAKEIN_WIP // BAKEIN_WIP: Rewrite comment.
// smart_holder specializations for raw pointer members. // smart_holder specializations for raw pointer members.
// WARNING: Like the classic implementation, this implementation can lead to dangling pointers. // WARNING: Like the classic implementation, this implementation can lead to dangling pointers.
// See test_ptr() in tests/test_class_sh_property.py // See test_ptr() in tests/test_class_sh_property.py
@ -1633,21 +1634,26 @@ template <typename T, typename D>
struct property_cpp_function< struct property_cpp_function<
T, T,
D, D,
detail::enable_if_t<detail::all_of<detail::type_uses_smart_holder_type_caster<T>, detail::enable_if_t<
detail::type_uses_smart_holder_type_caster<D>, detail::all_of<std::is_base_of<detail::type_caster_base<T>, detail::type_caster<T>>,
std::is_pointer<D>>::value>> { std::is_base_of<detail::type_caster_base<D>, detail::type_caster<D>>,
std::is_pointer<D>>::value>> {
using drp = typename std::remove_pointer<D>::type; using drp = typename std::remove_pointer<D>::type;
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function readonly(PM pm, const handle &hdl) { static cpp_function readonly(PM pm, const handle &hdl) {
return cpp_function( detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
[pm](handle c_hdl) -> std::shared_ptr<drp> { if (tinfo->default_holder) {
std::shared_ptr<T> c_sp = detail::type_caster<T>::shared_ptr_from_python(c_hdl); return cpp_function(
D ptr = (*c_sp).*pm; [pm](handle c_hdl) -> std::shared_ptr<drp> {
return std::shared_ptr<drp>(c_sp, ptr); auto c_sp = cast<std::shared_ptr<T>>(c_hdl);
}, D ptr = (*c_sp).*pm;
is_method(hdl)); return std::shared_ptr<drp>(c_sp, ptr);
},
is_method(hdl));
}
return cpp_function([pm](const T &c) -> const D & { return c.*pm; }, is_method(hdl));
} }
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
@ -1657,11 +1663,16 @@ struct property_cpp_function<
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function write(PM pm, const handle &hdl) { static cpp_function write(PM pm, const handle &hdl) {
return cpp_function([pm](T &c, D value) { c.*pm = std::forward<D>(value); }, detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
is_method(hdl)); if (tinfo->default_holder) {
return cpp_function([pm](T &c, D value) { c.*pm = std::forward<D>(value); },
is_method(hdl));
}
return cpp_function([pm](T &c, const D &value) { c.*pm = value; }, is_method(hdl));
} }
}; };
// BAKEIN_WIP: Rewrite comment.
// smart_holder specializations for members held by-value. // smart_holder specializations for members held by-value.
// The read functions return a shared_ptr to the member, emulating the PyCLIF approach: // The read functions return a shared_ptr to the member, emulating the PyCLIF approach:
// https://github.com/google/clif/blob/c371a6d4b28d25d53a16e6d2a6d97305fb1be25a/clif/python/instance.h#L233 // https://github.com/google/clif/blob/c371a6d4b28d25d53a16e6d2a6d97305fb1be25a/clif/python/instance.h#L233
@ -1670,38 +1681,53 @@ template <typename T, typename D>
struct property_cpp_function< struct property_cpp_function<
T, T,
D, D,
detail::enable_if_t<detail::all_of<detail::type_uses_smart_holder_type_caster<T>, detail::enable_if_t<
detail::type_uses_smart_holder_type_caster<D>, detail::all_of<std::is_base_of<detail::type_caster_base<T>, detail::type_caster<T>>,
detail::none_of<std::is_pointer<D>, std::is_base_of<detail::type_caster_base<D>, detail::type_caster<D>>,
detail::is_std_unique_ptr<D>, detail::none_of<std::is_pointer<D>,
detail::is_std_shared_ptr<D>>>::value>> { detail::is_instantiation<std::unique_ptr, D>,
detail::is_instantiation<std::shared_ptr, D>>>::value>> {
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function readonly(PM pm, const handle &hdl) { static cpp_function readonly(PM pm, const handle &hdl) {
return cpp_function( detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
[pm](handle c_hdl) -> std::shared_ptr<typename std::add_const<D>::type> { if (tinfo->default_holder) {
std::shared_ptr<T> c_sp = detail::type_caster<T>::shared_ptr_from_python(c_hdl); return cpp_function(
return std::shared_ptr<typename std::add_const<D>::type>(c_sp, &(c_sp.get()->*pm)); [pm](handle c_hdl) -> std::shared_ptr<typename std::add_const<D>::type> {
}, auto c_sp = cast<std::shared_ptr<T>>(c_hdl);
is_method(hdl)); return std::shared_ptr<typename std::add_const<D>::type>(c_sp,
&(c_sp.get()->*pm));
},
is_method(hdl));
}
return cpp_function([pm](const T &c) -> const D & { return c.*pm; }, is_method(hdl));
} }
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function read(PM pm, const handle &hdl) { static cpp_function read(PM pm, const handle &hdl) {
return cpp_function( detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
[pm](handle c_hdl) -> std::shared_ptr<D> { if (tinfo->default_holder) {
std::shared_ptr<T> c_sp = detail::type_caster<T>::shared_ptr_from_python(c_hdl); return cpp_function(
return std::shared_ptr<D>(c_sp, &(c_sp.get()->*pm)); [pm](handle c_hdl) -> std::shared_ptr<D> {
}, auto c_sp = cast<std::shared_ptr<T>>(c_hdl);
is_method(hdl)); return std::shared_ptr<D>(c_sp, &(c_sp.get()->*pm));
},
is_method(hdl));
}
return cpp_function([pm](const T &c) -> const D & { return c.*pm; }, is_method(hdl));
} }
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function write(PM pm, const handle &hdl) { static cpp_function write(PM pm, const handle &hdl) {
detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
if (tinfo->default_holder) {
return cpp_function([pm](T &c, const D &value) { c.*pm = value; }, is_method(hdl));
}
return cpp_function([pm](T &c, const D &value) { c.*pm = value; }, is_method(hdl)); return cpp_function([pm](T &c, const D &value) { c.*pm = value; }, is_method(hdl));
} }
}; };
// BAKEIN_WIP: Rewrite comment.
// smart_holder specializations for std::unique_ptr members. // smart_holder specializations for std::unique_ptr members.
// read disowns the member unique_ptr. // read disowns the member unique_ptr.
// write disowns the passed Python object. // write disowns the passed Python object.
@ -1712,34 +1738,43 @@ template <typename T, typename D>
struct property_cpp_function< struct property_cpp_function<
T, T,
D, D,
detail::enable_if_t<detail::all_of< detail::enable_if_t<
detail::type_uses_smart_holder_type_caster<T>, detail::all_of<std::is_base_of<detail::type_caster_base<T>, detail::type_caster<T>>,
detail::is_std_unique_ptr<D>, detail::is_instantiation<std::unique_ptr, D>,
detail::type_uses_smart_holder_type_caster<typename D::element_type>>::value>> { std::is_base_of<detail::type_caster_base<typename D::element_type>,
detail::type_caster<typename D::element_type>>>::value>> {
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function readonly(PM, const handle &) { static cpp_function readonly(PM, const handle &) {
static_assert(!detail::is_std_unique_ptr<D>::value, static_assert(!detail::is_instantiation<std::unique_ptr, D>::value,
"def_readonly cannot be used for std::unique_ptr members."); "def_readonly cannot be used for std::unique_ptr members.");
return cpp_function{}; // Unreachable. return cpp_function{}; // Unreachable.
} }
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function read(PM pm, const handle &hdl) { static cpp_function read(PM pm, const handle &hdl) {
return cpp_function( detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
[pm](handle c_hdl) -> D { if (tinfo->default_holder) {
std::shared_ptr<T> c_sp = detail::type_caster<T>::shared_ptr_from_python(c_hdl); return cpp_function(
return D{std::move(c_sp.get()->*pm)}; [pm](handle c_hdl) -> D {
}, auto c_sp = cast<std::shared_ptr<T>>(c_hdl);
is_method(hdl)); return D{std::move(c_sp.get()->*pm)};
},
is_method(hdl));
}
return cpp_function([pm](const T &c) -> const D & { return c.*pm; }, is_method(hdl));
} }
template <typename PM, must_be_member_function_pointer<PM> = 0> template <typename PM, must_be_member_function_pointer<PM> = 0>
static cpp_function write(PM pm, const handle &hdl) { static cpp_function write(PM pm, const handle &hdl) {
return cpp_function([pm](T &c, D &&value) { c.*pm = std::move(value); }, is_method(hdl)); detail::type_info *tinfo = detail::get_type_info(typeid(T), /*throw_if_missing=*/true);
if (tinfo->default_holder) {
return cpp_function([pm](T &c, D &&value) { c.*pm = std::move(value); },
is_method(hdl));
}
return cpp_function([pm](T &c, const D &value) { c.*pm = value; }, is_method(hdl));
} }
}; };
#endif
template <typename type_, typename... options> template <typename type_, typename... options>
class class_ : public detail::generic_type { class class_ : public detail::generic_type {