Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 14:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

PYBIND11_OVERLOAD_NAME and PYBIND11_OVERLOAD_PURE_NAME (fixes #205)

Browse Source
This commit is contained in:
Wenzel Jakob 2016-05-24 23:42:05 +02:00
parent b437867338
commit 1e3be73a52
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/advanced.rst
View File

@ -268,8 +268,14 @@ helper class that is defined as follows:
The macro :func:`PYBIND11_OVERLOAD_PURE` should be used for pure virtual The macro :func:`PYBIND11_OVERLOAD_PURE` should be used for pure virtual
functions, and :func:`PYBIND11_OVERLOAD` should be used for functions which have functions, and :func:`PYBIND11_OVERLOAD` should be used for functions which have
a default implementation. The binding code also needs a few minor adaptations a default implementation.
(highlighted):
There are also two alternate macros :func:`PYBIND11_OVERLOAD_PURE_NAME` and
:func:`PYBIND11_OVERLOAD_NAME` which take a string-valued name argument
after the *Name of the function* slot. This is useful when the C++ and Python
versions of the function have different names, e.g. ``operator()`` vs ``__call__``.
The binding code also needs a few minor adaptations (highlighted):
.. code-block:: cpp .. code-block:: cpp
:emphasize-lines: 4,6,7 :emphasize-lines: 4,6,7

2
example/example12.ref
View File

@ -1,7 +1,7 @@
Constructing Example12.. Constructing Example12..
Original implementation of Example12::run(state=10, value=20) Original implementation of Example12::run(state=10, value=20)
30 30
Caught expected exception: Tried to call pure virtual function "pure_virtual" Caught expected exception: Tried to call pure virtual function "Example12::pure_virtual"
Constructing Example12.. Constructing Example12..
ExtendedExample12::run(20), calling parent.. ExtendedExample12::run(20), calling parent..
Original implementation of Example12::run(state=11, value=21) Original implementation of Example12::run(state=11, value=21)

2
example/issues.ref
View File

@ -1,6 +1,6 @@
const char * const char *
c c
Failed as expected: Tried to call pure virtual function "dispatch" Failed as expected: Tried to call pure virtual function "Base::dispatch"
Yay.. Yay..
[Placeholder[1], Placeholder[2], Placeholder[3], Placeholder[4]] [Placeholder[1], Placeholder[2], Placeholder[3], Placeholder[4]]
[3, 5, 7, 9, 11, 13, 15] [3, 5, 7, 9, 11, 13, 15]

22
include/pybind11/pybind11.h
View File

@ -1184,19 +1184,25 @@ inline function get_overload(const void *this_ptr, const char *name) {
return overload; return overload;
} }
#define PYBIND11_OVERLOAD_INT(ret_type, class_name, name, ...) { \ #define PYBIND11_OVERLOAD_INT(ret_type, name, ...) { \
pybind11::gil_scoped_acquire gil; \ pybind11::gil_scoped_acquire gil; \
pybind11::function overload = pybind11::get_overload(this, #name); \ pybind11::function overload = pybind11::get_overload(this, name); \
if (overload) \ if (overload) \
return overload(__VA_ARGS__).template cast<ret_type>(); } return overload(__VA_ARGS__).template cast<ret_type>(); }
#define PYBIND11_OVERLOAD(ret_type, class_name, name, ...) \ #define PYBIND11_OVERLOAD_NAME(ret_type, cname, name, fn, ...) \
PYBIND11_OVERLOAD_INT(ret_type, class_name, name, __VA_ARGS__) \ PYBIND11_OVERLOAD_INT(ret_type, name, __VA_ARGS__) \
return class_name::name(__VA_ARGS__) return cname::fn(__VA_ARGS__)
#define PYBIND11_OVERLOAD_PURE(ret_type, class_name, name, ...) \ #define PYBIND11_OVERLOAD_PURE_NAME(ret_type, cname, name, fn, ...) \
PYBIND11_OVERLOAD_INT(ret_type, class_name, name, __VA_ARGS__) \ PYBIND11_OVERLOAD_INT(ret_type, name, __VA_ARGS__) \
pybind11::pybind11_fail("Tried to call pure virtual function \"" #name "\""); pybind11::pybind11_fail("Tried to call pure virtual function \"" #cname "::" name "\"");
#define PYBIND11_OVERLOAD(ret_type, cname, fn, ...) \
PYBIND11_OVERLOAD_NAME(ret_type, cname, #fn, fn, __VA_ARGS__)
#define PYBIND11_OVERLOAD_PURE(ret_type, cname, fn, ...) \
PYBIND11_OVERLOAD_PURE_NAME(ret_type, cname, #fn, fn, __VA_ARGS__)
NAMESPACE_END(pybind11) NAMESPACE_END(pybind11)