2016-03-10 12:24:10 +00:00
|
|
|
/*
|
2016-08-12 11:50:00 +00:00
|
|
|
tests/test_issues.cpp -- collection of testcases for miscellaneous issues
|
2016-03-10 12:24:10 +00:00
|
|
|
|
2016-04-17 18:21:41 +00:00
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
2016-03-10 12:24:10 +00:00
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
2016-08-12 11:50:00 +00:00
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include "constructor_stats.h"
|
2016-04-20 15:00:57 +00:00
|
|
|
#include <pybind11/stl.h>
|
2016-08-09 21:57:59 +00:00
|
|
|
#include <pybind11/operators.h>
|
2016-11-07 14:59:01 +00:00
|
|
|
#include <pybind11/complex.h>
|
2016-04-30 21:02:39 +00:00
|
|
|
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
#define TRACKERS(CLASS) CLASS() { print_default_created(this); } ~CLASS() { print_destroyed(this); }
|
|
|
|
struct NestABase { int value = -2; TRACKERS(NestABase) };
|
|
|
|
struct NestA : NestABase { int value = 3; NestA& operator+=(int i) { value += i; return *this; } TRACKERS(NestA) };
|
|
|
|
struct NestB { NestA a; int value = 4; NestB& operator-=(int i) { value -= i; return *this; } TRACKERS(NestB) };
|
|
|
|
struct NestC { NestB b; int value = 5; NestC& operator*=(int i) { value *= i; return *this; } TRACKERS(NestC) };
|
|
|
|
|
2016-09-10 06:28:37 +00:00
|
|
|
/// #393
|
|
|
|
class OpTest1 {};
|
|
|
|
class OpTest2 {};
|
|
|
|
|
|
|
|
OpTest1 operator+(const OpTest1 &, const OpTest1 &) {
|
|
|
|
py::print("Add OpTest1 with OpTest1");
|
|
|
|
return OpTest1();
|
|
|
|
}
|
|
|
|
OpTest2 operator+(const OpTest2 &, const OpTest2 &) {
|
|
|
|
py::print("Add OpTest2 with OpTest2");
|
|
|
|
return OpTest2();
|
|
|
|
}
|
|
|
|
OpTest2 operator+(const OpTest2 &, const OpTest1 &) {
|
|
|
|
py::print("Add OpTest2 with OpTest1");
|
|
|
|
return OpTest2();
|
|
|
|
}
|
|
|
|
|
2016-10-25 01:58:22 +00:00
|
|
|
// #461
|
|
|
|
class Dupe1 {
|
|
|
|
public:
|
|
|
|
Dupe1(int v) : v_{v} {}
|
|
|
|
int get_value() const { return v_; }
|
|
|
|
private:
|
|
|
|
int v_;
|
|
|
|
};
|
|
|
|
class Dupe2 {};
|
|
|
|
class Dupe3 {};
|
|
|
|
class DupeException : public std::runtime_error {};
|
|
|
|
|
Don't construct unique_ptr around unowned pointers (#478)
If we need to initialize a holder around an unowned instance, and the
holder type is non-copyable (i.e. a unique_ptr), we currently construct
the holder type around the value pointer, but then never actually
destruct the holder: the holder destructor is called only for the
instance that actually has `inst->owned = true` set.
This seems no pointer, however, in creating such a holder around an
unowned instance: we never actually intend to use anything that the
unique_ptr gives us: and, in fact, do not want the unique_ptr (because
if it ever actually got destroyed, it would cause destruction of the
wrapped pointer, despite the fact that that wrapped pointer isn't
owned).
This commit changes the logic to only create a unique_ptr holder if we
actually own the instance, and to destruct via the constructed holder
whenever we have a constructed holder--which will now only be the case
for owned-unique-holder or shared-holder types.
Other changes include:
* Added test for non-movable holder constructor/destructor counts
The three alive assertions now pass, before #478 they fail with counts
of 2/2/1 respectively, because of the unique_ptr that we don't want and
don't destroy (because we don't *want* its destructor to run).
* Return cstats reference; fix ConstructStats doc
Small cleanup to the #478 test code, and fix to the ConstructStats
documentation (the static method definition should use `reference` not
`reference_internal`).
* Rename inst->constructed to inst->holder_constructed
This makes it clearer exactly what it's referring to.
2016-11-06 18:12:48 +00:00
|
|
|
// #478
|
|
|
|
template <typename T> class custom_unique_ptr {
|
|
|
|
public:
|
|
|
|
custom_unique_ptr() { print_default_created(this); }
|
|
|
|
custom_unique_ptr(T *ptr) : _ptr{ptr} { print_created(this, ptr); }
|
|
|
|
custom_unique_ptr(custom_unique_ptr<T> &&move) : _ptr{move._ptr} { move._ptr = nullptr; print_move_created(this); }
|
|
|
|
custom_unique_ptr &operator=(custom_unique_ptr<T> &&move) { print_move_assigned(this); if (_ptr) destruct_ptr(); _ptr = move._ptr; move._ptr = nullptr; return *this; }
|
|
|
|
custom_unique_ptr(const custom_unique_ptr<T> &) = delete;
|
|
|
|
void operator=(const custom_unique_ptr<T> ©) = delete;
|
|
|
|
~custom_unique_ptr() { print_destroyed(this); if (_ptr) destruct_ptr(); }
|
|
|
|
private:
|
|
|
|
T *_ptr = nullptr;
|
|
|
|
void destruct_ptr() { delete _ptr; }
|
|
|
|
};
|
|
|
|
PYBIND11_DECLARE_HOLDER_TYPE(T, custom_unique_ptr<T>);
|
|
|
|
|
2016-11-25 12:06:18 +00:00
|
|
|
/// Issue #528: templated constructor
|
|
|
|
struct TplConstrClass {
|
|
|
|
template <typename T> TplConstrClass(const T &arg) : str{arg} {}
|
|
|
|
std::string str;
|
|
|
|
bool operator==(const TplConstrClass &t) const { return t.str == str; }
|
|
|
|
};
|
|
|
|
namespace std {
|
|
|
|
template <> struct hash<TplConstrClass> { size_t operator()(const TplConstrClass &t) const { return std::hash<std::string>()(t.str); } };
|
|
|
|
}
|
Don't construct unique_ptr around unowned pointers (#478)
If we need to initialize a holder around an unowned instance, and the
holder type is non-copyable (i.e. a unique_ptr), we currently construct
the holder type around the value pointer, but then never actually
destruct the holder: the holder destructor is called only for the
instance that actually has `inst->owned = true` set.
This seems no pointer, however, in creating such a holder around an
unowned instance: we never actually intend to use anything that the
unique_ptr gives us: and, in fact, do not want the unique_ptr (because
if it ever actually got destroyed, it would cause destruction of the
wrapped pointer, despite the fact that that wrapped pointer isn't
owned).
This commit changes the logic to only create a unique_ptr holder if we
actually own the instance, and to destruct via the constructed holder
whenever we have a constructed holder--which will now only be the case
for owned-unique-holder or shared-holder types.
Other changes include:
* Added test for non-movable holder constructor/destructor counts
The three alive assertions now pass, before #478 they fail with counts
of 2/2/1 respectively, because of the unique_ptr that we don't want and
don't destroy (because we don't *want* its destructor to run).
* Return cstats reference; fix ConstructStats doc
Small cleanup to the #478 test code, and fix to the ConstructStats
documentation (the static method definition should use `reference` not
`reference_internal`).
* Rename inst->constructed to inst->holder_constructed
This makes it clearer exactly what it's referring to.
2016-11-06 18:12:48 +00:00
|
|
|
|
2016-03-10 12:24:10 +00:00
|
|
|
void init_issues(py::module &m) {
|
|
|
|
py::module m2 = m.def_submodule("issues");
|
|
|
|
|
|
|
|
// #137: const char* isn't handled properly
|
2016-08-12 20:28:31 +00:00
|
|
|
m2.def("print_cchar", [](const char *s) { return std::string(s); });
|
2016-03-26 22:04:10 +00:00
|
|
|
|
|
|
|
// #150: char bindings broken
|
2016-08-12 20:28:31 +00:00
|
|
|
m2.def("print_char", [](char c) { return std::string(1, c); });
|
2016-04-11 16:13:08 +00:00
|
|
|
|
|
|
|
// #159: virtual function dispatch has problems with similar-named functions
|
2016-08-12 20:28:31 +00:00
|
|
|
struct Base { virtual std::string dispatch() const {
|
2016-04-30 21:02:39 +00:00
|
|
|
/* for some reason MSVC2015 can't compile this if the function is pure virtual */
|
2016-08-12 20:28:31 +00:00
|
|
|
return {};
|
2016-04-30 21:02:39 +00:00
|
|
|
}; };
|
2016-04-30 20:44:00 +00:00
|
|
|
|
|
|
|
struct DispatchIssue : Base {
|
2016-08-12 20:28:31 +00:00
|
|
|
virtual std::string dispatch() const {
|
|
|
|
PYBIND11_OVERLOAD_PURE(std::string, Base, dispatch, /* no arguments */);
|
2016-04-30 20:44:00 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
Allow arbitrary class_ template option ordering
The current pybind11::class_<Type, Holder, Trampoline> fixed template
ordering results in a requirement to repeat the Holder with its default
value (std::unique_ptr<Type>) argument, which is a little bit annoying:
it needs to be specified not because we want to override the default,
but rather because we need to specify the third argument.
This commit removes this limitation by making the class_ template take
the type name plus a parameter pack of options. It then extracts the
first valid holder type and the first subclass type for holder_type and
trampoline type_alias, respectively. (If unfound, both fall back to
their current defaults, `std::unique_ptr<type>` and `type`,
respectively). If any unmatched template arguments are provided, a
static assertion fails.
What this means is that you can specify or omit the arguments in any
order:
py::class_<A, PyA> c1(m, "A");
py::class_<B, PyB, std::shared_ptr<B>> c2(m, "B");
py::class_<C, std::shared_ptr<C>, PyB> c3(m, "C");
It also allows future class attributes (such as base types in the next
commit) to be passed as class template types rather than needing to use
a py::base<> wrapper.
2016-09-06 16:17:06 +00:00
|
|
|
py::class_<Base, DispatchIssue>(m2, "DispatchIssue")
|
2016-04-20 15:00:57 +00:00
|
|
|
.def(py::init<>())
|
2016-04-11 16:13:08 +00:00
|
|
|
.def("dispatch", &Base::dispatch);
|
|
|
|
|
2016-08-12 20:28:31 +00:00
|
|
|
m2.def("dispatch_issue_go", [](const Base * b) { return b->dispatch(); });
|
2016-04-30 20:44:00 +00:00
|
|
|
|
|
|
|
struct Placeholder { int i; Placeholder(int i) : i(i) { } };
|
2016-04-20 15:00:57 +00:00
|
|
|
|
|
|
|
py::class_<Placeholder>(m2, "Placeholder")
|
2016-04-21 10:21:14 +00:00
|
|
|
.def(py::init<int>())
|
2016-04-20 15:00:57 +00:00
|
|
|
.def("__repr__", [](const Placeholder &p) { return "Placeholder[" + std::to_string(p.i) + "]"; });
|
|
|
|
|
2016-04-27 12:33:52 +00:00
|
|
|
// #181: iterator passthrough did not compile
|
|
|
|
m2.def("iterator_passthrough", [](py::iterator s) -> py::iterator {
|
|
|
|
return py::make_iterator(std::begin(s), std::end(s));
|
|
|
|
});
|
2016-04-30 21:02:39 +00:00
|
|
|
|
|
|
|
// #187: issue involving std::shared_ptr<> return value policy & garbage collection
|
|
|
|
struct ElementBase { virtual void foo() { } /* Force creation of virtual table */ };
|
|
|
|
struct ElementA : ElementBase {
|
|
|
|
ElementA(int v) : v(v) { }
|
|
|
|
int value() { return v; }
|
|
|
|
int v;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ElementList {
|
|
|
|
void add(std::shared_ptr<ElementBase> e) { l.push_back(e); }
|
|
|
|
std::vector<std::shared_ptr<ElementBase>> l;
|
|
|
|
};
|
|
|
|
|
|
|
|
py::class_<ElementBase, std::shared_ptr<ElementBase>> (m2, "ElementBase");
|
|
|
|
|
2016-09-06 16:27:00 +00:00
|
|
|
py::class_<ElementA, ElementBase, std::shared_ptr<ElementA>>(m2, "ElementA")
|
2016-04-30 21:02:39 +00:00
|
|
|
.def(py::init<int>())
|
|
|
|
.def("value", &ElementA::value);
|
|
|
|
|
|
|
|
py::class_<ElementList, std::shared_ptr<ElementList>>(m2, "ElementList")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def("add", &ElementList::add)
|
2016-09-04 14:00:49 +00:00
|
|
|
.def("get", [](ElementList &el) {
|
2016-04-30 21:02:39 +00:00
|
|
|
py::list list;
|
|
|
|
for (auto &e : el.l)
|
|
|
|
list.append(py::cast(e));
|
|
|
|
return list;
|
|
|
|
});
|
2016-05-01 12:42:20 +00:00
|
|
|
|
|
|
|
// (no id): should not be able to pass 'None' to a reference argument
|
2016-08-19 11:45:36 +00:00
|
|
|
m2.def("get_element", [](ElementA &el) { return el.value(); });
|
2016-05-17 13:35:29 +00:00
|
|
|
|
|
|
|
// (no id): don't cast doubles to ints
|
|
|
|
m2.def("expect_float", [](float f) { return f; });
|
|
|
|
m2.def("expect_int", [](int i) { return i; });
|
2016-05-26 11:19:27 +00:00
|
|
|
|
2016-05-31 07:53:28 +00:00
|
|
|
try {
|
|
|
|
py::class_<Placeholder>(m2, "Placeholder");
|
|
|
|
throw std::logic_error("Expected an exception!");
|
2016-06-01 21:03:10 +00:00
|
|
|
} catch (std::runtime_error &) {
|
2016-05-31 07:53:28 +00:00
|
|
|
/* All good */
|
|
|
|
}
|
2016-07-17 21:43:00 +00:00
|
|
|
|
|
|
|
// Issue #283: __str__ called on uninitialized instance when constructor arguments invalid
|
|
|
|
class StrIssue {
|
|
|
|
public:
|
|
|
|
StrIssue(int i) : val{i} {}
|
|
|
|
StrIssue() : StrIssue(-1) {}
|
|
|
|
int value() const { return val; }
|
|
|
|
private:
|
|
|
|
int val;
|
|
|
|
};
|
|
|
|
py::class_<StrIssue> si(m2, "StrIssue");
|
|
|
|
si .def(py::init<int>())
|
|
|
|
.def(py::init<>())
|
2016-08-19 11:45:36 +00:00
|
|
|
.def("__str__", [](const StrIssue &si) { return "StrIssue[" + std::to_string(si.value()) + "]"; })
|
2016-07-17 21:43:00 +00:00
|
|
|
;
|
|
|
|
|
2016-08-09 21:57:59 +00:00
|
|
|
// Issue #328: first member in a class can't be used in operators
|
2016-08-10 16:08:04 +00:00
|
|
|
py::class_<NestABase>(m2, "NestABase").def(py::init<>()).def_readwrite("value", &NestABase::value);
|
|
|
|
py::class_<NestA>(m2, "NestA").def(py::init<>()).def(py::self += int())
|
|
|
|
.def("as_base", [](NestA &a) -> NestABase& { return (NestABase&) a; }, py::return_value_policy::reference_internal);
|
2016-08-09 21:57:59 +00:00
|
|
|
py::class_<NestB>(m2, "NestB").def(py::init<>()).def(py::self -= int()).def_readwrite("a", &NestB::a);
|
|
|
|
py::class_<NestC>(m2, "NestC").def(py::init<>()).def(py::self *= int()).def_readwrite("b", &NestC::b);
|
2016-08-12 20:28:31 +00:00
|
|
|
m2.def("get_NestA", [](const NestA &a) { return a.value; });
|
|
|
|
m2.def("get_NestB", [](const NestB &b) { return b.value; });
|
|
|
|
m2.def("get_NestC", [](const NestC &c) { return c.value; });
|
2016-09-06 15:47:17 +00:00
|
|
|
|
|
|
|
// Issue 389: r_v_p::move should fall-through to copy on non-movable objects
|
|
|
|
class MoveIssue1 {
|
|
|
|
public:
|
|
|
|
MoveIssue1(int v) : v{v} {}
|
2016-09-06 22:50:10 +00:00
|
|
|
MoveIssue1(const MoveIssue1 &c) { v = c.v; }
|
2016-09-06 15:47:17 +00:00
|
|
|
MoveIssue1(MoveIssue1 &&) = delete;
|
|
|
|
int v;
|
|
|
|
};
|
|
|
|
class MoveIssue2 {
|
|
|
|
public:
|
|
|
|
MoveIssue2(int v) : v{v} {}
|
|
|
|
MoveIssue2(MoveIssue2 &&) = default;
|
|
|
|
int v;
|
|
|
|
};
|
|
|
|
py::class_<MoveIssue1>(m2, "MoveIssue1").def(py::init<int>()).def_readwrite("value", &MoveIssue1::v);
|
|
|
|
py::class_<MoveIssue2>(m2, "MoveIssue2").def(py::init<int>()).def_readwrite("value", &MoveIssue2::v);
|
|
|
|
m2.def("get_moveissue1", [](int i) -> MoveIssue1 * { return new MoveIssue1(i); }, py::return_value_policy::move);
|
|
|
|
m2.def("get_moveissue2", [](int i) { return MoveIssue2(i); }, py::return_value_policy::move);
|
2016-09-07 17:32:49 +00:00
|
|
|
|
2016-09-08 15:03:08 +00:00
|
|
|
// Issues 392/397: overridding reference-returning functions
|
2016-09-07 17:32:49 +00:00
|
|
|
class OverrideTest {
|
|
|
|
public:
|
2016-09-08 15:03:08 +00:00
|
|
|
struct A { std::string value = "hi"; };
|
|
|
|
std::string v;
|
2016-09-07 17:32:49 +00:00
|
|
|
A a;
|
2016-09-08 15:03:08 +00:00
|
|
|
explicit OverrideTest(const std::string &v) : v{v} {}
|
|
|
|
virtual std::string str_value() { return v; }
|
|
|
|
virtual std::string &str_ref() { return v; }
|
2016-09-07 17:32:49 +00:00
|
|
|
virtual A A_value() { return a; }
|
|
|
|
virtual A &A_ref() { return a; }
|
|
|
|
};
|
|
|
|
class PyOverrideTest : public OverrideTest {
|
|
|
|
public:
|
|
|
|
using OverrideTest::OverrideTest;
|
2016-09-08 15:03:08 +00:00
|
|
|
std::string str_value() override { PYBIND11_OVERLOAD(std::string, OverrideTest, str_value); }
|
2016-09-07 17:38:32 +00:00
|
|
|
// Not allowed (uncommenting should hit a static_assert failure): we can't get a reference
|
|
|
|
// to a python numeric value, since we only copy values in the numeric type caster:
|
2016-09-08 15:03:08 +00:00
|
|
|
// std::string &str_ref() override { PYBIND11_OVERLOAD(std::string &, OverrideTest, str_ref); }
|
|
|
|
// But we can work around it like this:
|
|
|
|
private:
|
|
|
|
std::string _tmp;
|
|
|
|
std::string str_ref_helper() { PYBIND11_OVERLOAD(std::string, OverrideTest, str_ref); }
|
|
|
|
public:
|
|
|
|
std::string &str_ref() override { return _tmp = str_ref_helper(); }
|
|
|
|
|
2016-09-07 17:32:49 +00:00
|
|
|
A A_value() override { PYBIND11_OVERLOAD(A, OverrideTest, A_value); }
|
|
|
|
A &A_ref() override { PYBIND11_OVERLOAD(A &, OverrideTest, A_ref); }
|
|
|
|
};
|
|
|
|
py::class_<OverrideTest::A>(m2, "OverrideTest_A")
|
|
|
|
.def_readwrite("value", &OverrideTest::A::value);
|
|
|
|
py::class_<OverrideTest, PyOverrideTest>(m2, "OverrideTest")
|
2016-09-08 15:03:08 +00:00
|
|
|
.def(py::init<const std::string &>())
|
|
|
|
.def("str_value", &OverrideTest::str_value)
|
|
|
|
// .def("str_ref", &OverrideTest::str_ref)
|
2016-09-07 17:32:49 +00:00
|
|
|
.def("A_value", &OverrideTest::A_value)
|
|
|
|
.def("A_ref", &OverrideTest::A_ref);
|
2016-09-07 17:38:32 +00:00
|
|
|
|
2016-09-10 06:28:37 +00:00
|
|
|
/// Issue 393: need to return NotSupported to ensure correct arithmetic operator behavior
|
|
|
|
py::class_<OpTest1>(m2, "OpTest1")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self + py::self);
|
|
|
|
|
|
|
|
py::class_<OpTest2>(m2, "OpTest2")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self + py::self)
|
|
|
|
.def("__add__", [](const OpTest2& c2, const OpTest1& c1) { return c2 + c1; })
|
|
|
|
.def("__radd__", [](const OpTest2& c2, const OpTest1& c1) { return c2 + c1; });
|
2016-09-10 07:00:50 +00:00
|
|
|
|
|
|
|
// Issue 388: Can't make iterators via make_iterator() with different r/v policies
|
|
|
|
static std::vector<int> list = { 1, 2, 3 };
|
|
|
|
m2.def("make_iterator_1", []() { return py::make_iterator<py::return_value_policy::copy>(list); });
|
|
|
|
m2.def("make_iterator_2", []() { return py::make_iterator<py::return_value_policy::automatic>(list); });
|
2016-10-25 01:58:22 +00:00
|
|
|
|
|
|
|
static std::vector<std::string> nothrows;
|
|
|
|
// Issue 461: registering two things with the same name:
|
|
|
|
py::class_<Dupe1>(m2, "Dupe1")
|
|
|
|
.def("get_value", &Dupe1::get_value)
|
|
|
|
;
|
|
|
|
m2.def("dupe1_factory", [](int v) { return new Dupe1(v); });
|
|
|
|
|
|
|
|
py::class_<Dupe2>(m2, "Dupe2");
|
|
|
|
py::exception<DupeException>(m2, "DupeException");
|
|
|
|
|
|
|
|
try {
|
|
|
|
m2.def("Dupe1", [](int v) { return new Dupe1(v); });
|
|
|
|
nothrows.emplace_back("Dupe1");
|
|
|
|
}
|
|
|
|
catch (std::runtime_error &) {}
|
|
|
|
try {
|
|
|
|
py::class_<Dupe3>(m2, "dupe1_factory");
|
|
|
|
nothrows.emplace_back("dupe1_factory");
|
|
|
|
}
|
|
|
|
catch (std::runtime_error &) {}
|
|
|
|
try {
|
|
|
|
py::exception<Dupe3>(m2, "Dupe2");
|
|
|
|
nothrows.emplace_back("Dupe2");
|
|
|
|
}
|
|
|
|
catch (std::runtime_error &) {}
|
|
|
|
try {
|
|
|
|
m2.def("DupeException", []() { return 30; });
|
|
|
|
nothrows.emplace_back("DupeException1");
|
|
|
|
}
|
|
|
|
catch (std::runtime_error &) {}
|
|
|
|
try {
|
|
|
|
py::class_<DupeException>(m2, "DupeException");
|
|
|
|
nothrows.emplace_back("DupeException2");
|
|
|
|
}
|
|
|
|
catch (std::runtime_error &) {}
|
|
|
|
m2.def("dupe_exception_failures", []() {
|
|
|
|
py::list l;
|
|
|
|
for (auto &e : nothrows) l.append(py::cast(e));
|
|
|
|
return l;
|
|
|
|
});
|
2016-11-03 10:53:35 +00:00
|
|
|
|
|
|
|
/// Issue #471: shared pointer instance not dellocated
|
|
|
|
class SharedChild : public std::enable_shared_from_this<SharedChild> {
|
|
|
|
public:
|
|
|
|
SharedChild() { print_created(this); }
|
|
|
|
~SharedChild() { print_destroyed(this); }
|
|
|
|
};
|
|
|
|
|
|
|
|
class SharedParent {
|
|
|
|
public:
|
|
|
|
SharedParent() : child(std::make_shared<SharedChild>()) { }
|
|
|
|
const SharedChild &get_child() const { return *child; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
std::shared_ptr<SharedChild> child;
|
|
|
|
};
|
|
|
|
|
|
|
|
py::class_<SharedChild, std::shared_ptr<SharedChild>>(m, "SharedChild");
|
|
|
|
py::class_<SharedParent, std::shared_ptr<SharedParent>>(m, "SharedParent")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def("get_child", &SharedParent::get_child, py::return_value_policy::reference);
|
Don't construct unique_ptr around unowned pointers (#478)
If we need to initialize a holder around an unowned instance, and the
holder type is non-copyable (i.e. a unique_ptr), we currently construct
the holder type around the value pointer, but then never actually
destruct the holder: the holder destructor is called only for the
instance that actually has `inst->owned = true` set.
This seems no pointer, however, in creating such a holder around an
unowned instance: we never actually intend to use anything that the
unique_ptr gives us: and, in fact, do not want the unique_ptr (because
if it ever actually got destroyed, it would cause destruction of the
wrapped pointer, despite the fact that that wrapped pointer isn't
owned).
This commit changes the logic to only create a unique_ptr holder if we
actually own the instance, and to destruct via the constructed holder
whenever we have a constructed holder--which will now only be the case
for owned-unique-holder or shared-holder types.
Other changes include:
* Added test for non-movable holder constructor/destructor counts
The three alive assertions now pass, before #478 they fail with counts
of 2/2/1 respectively, because of the unique_ptr that we don't want and
don't destroy (because we don't *want* its destructor to run).
* Return cstats reference; fix ConstructStats doc
Small cleanup to the #478 test code, and fix to the ConstructStats
documentation (the static method definition should use `reference` not
`reference_internal`).
* Rename inst->constructed to inst->holder_constructed
This makes it clearer exactly what it's referring to.
2016-11-06 18:12:48 +00:00
|
|
|
|
|
|
|
/// Issue/PR #478: unique ptrs constructed and freed without destruction
|
|
|
|
class SpecialHolderObj {
|
|
|
|
public:
|
|
|
|
int val = 0;
|
|
|
|
SpecialHolderObj *ch = nullptr;
|
|
|
|
SpecialHolderObj(int v, bool make_child = true) : val{v}, ch{make_child ? new SpecialHolderObj(val+1, false) : nullptr}
|
|
|
|
{ print_created(this, val); }
|
|
|
|
~SpecialHolderObj() { delete ch; print_destroyed(this); }
|
|
|
|
SpecialHolderObj *child() { return ch; }
|
|
|
|
};
|
|
|
|
|
|
|
|
py::class_<SpecialHolderObj, custom_unique_ptr<SpecialHolderObj>>(m, "SpecialHolderObj")
|
|
|
|
.def(py::init<int>())
|
|
|
|
.def("child", &SpecialHolderObj::child, pybind11::return_value_policy::reference_internal)
|
|
|
|
.def_readwrite("val", &SpecialHolderObj::val)
|
|
|
|
.def_static("holder_cstats", &ConstructorStats::get<custom_unique_ptr<SpecialHolderObj>>,
|
2016-11-07 14:59:01 +00:00
|
|
|
py::return_value_policy::reference);
|
2016-09-03 18:54:22 +00:00
|
|
|
|
2016-11-07 14:59:01 +00:00
|
|
|
/// Issue #484: number conversion generates unhandled exceptions
|
|
|
|
m2.def("test_complex", [](float x) { py::print("{}"_s.format(x)); });
|
|
|
|
m2.def("test_complex", [](std::complex<float> x) { py::print("({}, {})"_s.format(x.real(), x.imag())); });
|
2016-11-20 04:26:02 +00:00
|
|
|
|
|
|
|
/// Issue #511: problem with inheritance + overwritten def_static
|
|
|
|
struct MyBase {
|
|
|
|
static std::unique_ptr<MyBase> make() {
|
|
|
|
return std::unique_ptr<MyBase>(new MyBase());
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct MyDerived : MyBase {
|
|
|
|
static std::unique_ptr<MyDerived> make() {
|
|
|
|
return std::unique_ptr<MyDerived>(new MyDerived());
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
py::class_<MyBase>(m2, "MyBase")
|
|
|
|
.def_static("make", &MyBase::make);
|
|
|
|
|
|
|
|
py::class_<MyDerived, MyBase>(m2, "MyDerived")
|
|
|
|
.def_static("make", &MyDerived::make)
|
|
|
|
.def_static("make2", &MyDerived::make);
|
2016-11-25 12:06:18 +00:00
|
|
|
|
2016-12-12 22:42:52 +00:00
|
|
|
py::dict d;
|
|
|
|
std::string bar = "bar";
|
|
|
|
d["str"] = bar;
|
|
|
|
d["num"] = 3.7;
|
|
|
|
|
2016-11-25 12:06:18 +00:00
|
|
|
/// Issue #528: templated constructor
|
|
|
|
m2.def("tpl_constr_vector", [](std::vector<TplConstrClass> &) {});
|
|
|
|
m2.def("tpl_constr_map", [](std::unordered_map<TplConstrClass, TplConstrClass> &) {});
|
|
|
|
m2.def("tpl_constr_set", [](std::unordered_set<TplConstrClass> &) {});
|
|
|
|
#if defined(PYBIND11_HAS_OPTIONAL)
|
|
|
|
m2.def("tpl_constr_optional", [](std::optional<TplConstrClass> &) {});
|
|
|
|
#elif defined(PYBIND11_HAS_EXP_OPTIONAL)
|
|
|
|
m2.def("tpl_constr_optional", [](std::experimental::optional<TplConstrClass> &) {});
|
|
|
|
#endif
|
2016-11-07 14:59:01 +00:00
|
|
|
}
|
2016-10-25 01:58:22 +00:00
|
|
|
|
2017-02-08 07:45:51 +00:00
|
|
|
// MSVC workaround: trying to use a lambda here crashes MSVC
|
2016-09-03 18:54:22 +00:00
|
|
|
test_initializer issues(&init_issues);
|