Skip to content

P
pybind11
Commit 4177ed43 by Wenzel Jakob
Options

renamed decay -> intrinsic_type (fixes #59)

parent 82ffd408
Showing with 22 additions and 22 deletions
include/pybind11/cast.h
...@@ -326,8 +326,8 @@ public: ...@@ -326,8 +326,8 @@ public:
} }
static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent) { static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent) {
object o1(type_caster<typename decay<T1>::type>::cast(src.first, policy, parent), false); object o1(type_caster<typename intrinsic_type<T1>::type>::cast(src.first, policy, parent), false);
object o2(type_caster<typename decay<T2>::type>::cast(src.second, policy, parent), false); object o2(type_caster<typename intrinsic_type<T2>::type>::cast(src.second, policy, parent), false);
if (!o1 || !o2) if (!o1 || !o2)
return nullptr; return nullptr;
PyObject *tuple = PyTuple_New(2); PyObject *tuple = PyTuple_New(2);
...@@ -340,16 +340,16 @@ public: ...@@ -340,16 +340,16 @@ public:
static PYBIND11_DESCR name() { static PYBIND11_DESCR name() {
return type_descr( return type_descr(
_("(") + type_caster<typename decay<T1>::type>::name() + _("(") + type_caster<typename intrinsic_type<T1>::type>::name() +
_(", ") + type_caster<typename decay<T2>::type>::name() + _(")")); _(", ") + type_caster<typename intrinsic_type<T2>::type>::name() + _(")"));
} }
operator type() { operator type() {
return type(first, second); return type(first, second);
} }
protected: protected:
type_caster<typename decay<T1>::type> first; type_caster<typename intrinsic_type<T1>::type> first;
type_caster<typename decay<T2>::type> second; type_caster<typename intrinsic_type<T2>::type> second;
}; };
template <typename... Tuple> class type_caster<std::tuple<Tuple...>> { template <typename... Tuple> class type_caster<std::tuple<Tuple...>> {
...@@ -368,7 +368,7 @@ public: ...@@ -368,7 +368,7 @@ public:
static PYBIND11_DESCR name() { static PYBIND11_DESCR name() {
return type_descr( return type_descr(
_("(") + _("(") +
detail::concat(type_caster<typename decay<Tuple>::type>::name()...) + detail::concat(type_caster<typename intrinsic_type<Tuple>::type>::name()...) +
_(")")); _(")"));
} }
...@@ -412,7 +412,7 @@ protected: ...@@ -412,7 +412,7 @@ protected:
/* Implementation: Convert a C++ tuple into a Python tuple */ /* Implementation: Convert a C++ tuple into a Python tuple */
template <size_t ... Indices> static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent, index_sequence<Indices...>) { template <size_t ... Indices> static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent, index_sequence<Indices...>) {
std::array<object, size> results {{ std::array<object, size> results {{
object(type_caster<typename decay<Tuple>::type>::cast(std::get<Indices>(src), policy, parent), false)... object(type_caster<typename intrinsic_type<Tuple>::type>::cast(std::get<Indices>(src), policy, parent), false)...
}}; }};
for (const auto & result : results) for (const auto & result : results)
if (!result) if (!result)
...@@ -427,7 +427,7 @@ protected: ...@@ -427,7 +427,7 @@ protected:
} }
protected: protected:
std::tuple<type_caster<typename decay<Tuple>::type>...> value; std::tuple<type_caster<typename intrinsic_type<Tuple>::type>...> value;
}; };
/// Type caster for holder types like std::shared_ptr, etc. /// Type caster for holder types like std::shared_ptr, etc.
...@@ -488,7 +488,7 @@ public: ...@@ -488,7 +488,7 @@ public:
NAMESPACE_END(detail) NAMESPACE_END(detail)
template <typename T> inline T cast(PyObject *object) { template <typename T> inline T cast(PyObject *object) {
detail::type_caster<typename detail::decay<T>::type> conv; detail::type_caster<typename detail::intrinsic_type<T>::type> conv;
if (!conv.load(object, true)) if (!conv.load(object, true))
throw cast_error("Unable to cast Python object to C++ type"); throw cast_error("Unable to cast Python object to C++ type");
return conv; return conv;
...@@ -497,7 +497,7 @@ template <typename T> inline T cast(PyObject *object) { ...@@ -497,7 +497,7 @@ template <typename T> inline T cast(PyObject *object) {
template <typename T> inline object cast(const T &value, return_value_policy policy = return_value_policy::automatic, PyObject *parent = nullptr) { template <typename T> inline object cast(const T &value, return_value_policy policy = return_value_policy::automatic, PyObject *parent = nullptr) {
if (policy == return_value_policy::automatic) if (policy == return_value_policy::automatic)
policy = std::is_pointer<T>::value ? return_value_policy::take_ownership : return_value_policy::copy; policy = std::is_pointer<T>::value ? return_value_policy::take_ownership : return_value_policy::copy;
return object(detail::type_caster<typename detail::decay<T>::type>::cast(value, policy, parent), false); return object(detail::type_caster<typename detail::intrinsic_type<T>::type>::cast(value, policy, parent), false);
} }
template <typename T> inline T handle::cast() const { return pybind11::cast<T>(m_ptr); } template <typename T> inline T handle::cast() const { return pybind11::cast<T>(m_ptr); }
...@@ -506,7 +506,7 @@ template <> inline void handle::cast() const { return; } ...@@ -506,7 +506,7 @@ template <> inline void handle::cast() const { return; }
template <typename... Args> inline object handle::call(Args&&... args_) const { template <typename... Args> inline object handle::call(Args&&... args_) const {
const size_t size = sizeof...(Args); const size_t size = sizeof...(Args);
std::array<object, size> args{ std::array<object, size> args{
{ object(detail::type_caster<typename detail::decay<Args>::type>::cast( { object(detail::type_caster<typename detail::intrinsic_type<Args>::type>::cast(
std::forward<Args>(args_), return_value_policy::reference, nullptr), false)... } std::forward<Args>(args_), return_value_policy::reference, nullptr), false)... }
}; };
for (const auto & result : args) for (const auto & result : args)
......
include/pybind11/common.h
...@@ -221,13 +221,13 @@ template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A. ...@@ -221,13 +221,13 @@ template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A.
template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A...) const> { typedef R type(A...); }; template <typename C, typename R, typename... A> struct remove_class<R (C::*)(A...) const> { typedef R type(A...); };
/// Helper template to strip away type modifiers /// Helper template to strip away type modifiers
template <typename T> struct decay { typedef T type; }; template <typename T> struct intrinsic_type { typedef T type; };
template <typename T> struct decay<const T> { typedef typename decay<T>::type type; }; template <typename T> struct intrinsic_type<const T> { typedef typename intrinsic_type<T>::type type; };
template <typename T> struct decay<T*> { typedef typename decay<T>::type type; }; template <typename T> struct intrinsic_type<T*> { typedef typename intrinsic_type<T>::type type; };
template <typename T> struct decay<T&> { typedef typename decay<T>::type type; }; template <typename T> struct intrinsic_type<T&> { typedef typename intrinsic_type<T>::type type; };
template <typename T> struct decay<T&&> { typedef typename decay<T>::type type; }; template <typename T> struct intrinsic_type<T&&> { typedef typename intrinsic_type<T>::type type; };
template <typename T, size_t N> struct decay<const T[N]> { typedef typename decay<T>::type type; }; template <typename T, size_t N> struct intrinsic_type<const T[N]> { typedef typename intrinsic_type<T>::type type; };
template <typename T, size_t N> struct decay<T[N]> { typedef typename decay<T>::type type; }; template <typename T, size_t N> struct intrinsic_type<T[N]> { typedef typename intrinsic_type<T>::type type; };
/// Helper type to replace 'void' in some expressions /// Helper type to replace 'void' in some expressions
struct void_type { }; struct void_type { };
......
include/pybind11/functional.h
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
PYBIND11_TYPE_CASTER(type, _("function<") + PYBIND11_TYPE_CASTER(type, _("function<") +
type_caster<std::tuple<Args...>>::name() + _(" -> ") + type_caster<std::tuple<Args...>>::name() + _(" -> ") +
type_caster<typename decay<Return>::type>::name() + type_caster<typename intrinsic_type<Return>::type>::name() +
_(">")); _(">"));
}; };
......
include/pybind11/pybind11.h
...@@ -94,7 +94,7 @@ private: ...@@ -94,7 +94,7 @@ private:
/// Picks a suitable return value converter from cast.h /// Picks a suitable return value converter from cast.h
template <typename T> using return_value_caster = template <typename T> using return_value_caster =
detail::type_caster<typename std::conditional< detail::type_caster<typename std::conditional<
std::is_void<T>::value, detail::void_type, typename detail::decay<T>::type>::type>; std::is_void<T>::value, detail::void_type, typename detail::intrinsic_type<T>::type>::type>;
/// Picks a suitable argument value converter from cast.h /// Picks a suitable argument value converter from cast.h
template <typename... T> using arg_value_caster = template <typename... T> using arg_value_caster =
...@@ -127,7 +127,7 @@ private: ...@@ -127,7 +127,7 @@ private:
if (entry->class_ && entry->args.empty()) if (entry->class_ && entry->args.empty())
entry->args.emplace_back("self", nullptr, nullptr); entry->args.emplace_back("self", nullptr, nullptr);
PyObject *obj = detail::type_caster<typename detail::decay<T>::type>::cast( PyObject *obj = detail::type_caster<typename detail::intrinsic_type<T>::type>::cast(
a.value, return_value_policy::automatic, nullptr); a.value, return_value_policy::automatic, nullptr);
if (obj == nullptr) if (obj == nullptr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment