2015-07-05 18:05:44 +00:00
|
|
|
/*
|
2016-08-12 11:50:00 +00:00
|
|
|
tests/test_operator_overloading.cpp -- operator overloading
|
2015-07-05 18:05:44 +00:00
|
|
|
|
2016-04-17 18:21:41 +00:00
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
2015-07-05 18:05:44 +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"
|
2015-10-15 16:13:33 +00:00
|
|
|
#include <pybind11/operators.h>
|
2017-08-30 12:22:00 +00:00
|
|
|
#include <functional>
|
2015-07-05 18:05:44 +00:00
|
|
|
|
|
|
|
class Vector2 {
|
|
|
|
public:
|
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
|
|
|
Vector2(float x, float y) : x(x), y(y) { print_created(this, toString()); }
|
|
|
|
Vector2(const Vector2 &v) : x(v.x), y(v.y) { print_copy_created(this); }
|
2021-06-22 16:11:54 +00:00
|
|
|
Vector2(Vector2 &&v) noexcept : x(v.x), y(v.y) {
|
|
|
|
print_move_created(this);
|
|
|
|
v.x = v.y = 0;
|
|
|
|
}
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
Vector2 &operator=(const Vector2 &v) { x = v.x; y = v.y; print_copy_assigned(this); return *this; }
|
2021-06-22 16:11:54 +00:00
|
|
|
Vector2 &operator=(Vector2 &&v) noexcept {
|
|
|
|
x = v.x;
|
|
|
|
y = v.y;
|
|
|
|
v.x = v.y = 0;
|
|
|
|
print_move_assigned(this);
|
|
|
|
return *this;
|
|
|
|
}
|
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
|
|
|
~Vector2() { print_destroyed(this); }
|
2015-07-05 18:05:44 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
std::string toString() const { return "[" + std::to_string(x) + ", " + std::to_string(y) + "]"; }
|
2015-07-05 18:05:44 +00:00
|
|
|
|
2019-06-22 10:07:41 +00:00
|
|
|
Vector2 operator-() const { return Vector2(-x, -y); }
|
2015-07-05 18:05:44 +00:00
|
|
|
Vector2 operator+(const Vector2 &v) const { return Vector2(x + v.x, y + v.y); }
|
|
|
|
Vector2 operator-(const Vector2 &v) const { return Vector2(x - v.x, y - v.y); }
|
|
|
|
Vector2 operator-(float value) const { return Vector2(x - value, y - value); }
|
|
|
|
Vector2 operator+(float value) const { return Vector2(x + value, y + value); }
|
|
|
|
Vector2 operator*(float value) const { return Vector2(x * value, y * value); }
|
|
|
|
Vector2 operator/(float value) const { return Vector2(x / value, y / value); }
|
2017-05-21 00:19:26 +00:00
|
|
|
Vector2 operator*(const Vector2 &v) const { return Vector2(x * v.x, y * v.y); }
|
|
|
|
Vector2 operator/(const Vector2 &v) const { return Vector2(x / v.x, y / v.y); }
|
2015-07-05 18:05:44 +00:00
|
|
|
Vector2& operator+=(const Vector2 &v) { x += v.x; y += v.y; return *this; }
|
|
|
|
Vector2& operator-=(const Vector2 &v) { x -= v.x; y -= v.y; return *this; }
|
|
|
|
Vector2& operator*=(float v) { x *= v; y *= v; return *this; }
|
|
|
|
Vector2& operator/=(float v) { x /= v; y /= v; return *this; }
|
2017-05-21 00:19:26 +00:00
|
|
|
Vector2& operator*=(const Vector2 &v) { x *= v.x; y *= v.y; return *this; }
|
|
|
|
Vector2& operator/=(const Vector2 &v) { x /= v.x; y /= v.y; return *this; }
|
2015-09-11 15:09:47 +00:00
|
|
|
|
|
|
|
friend Vector2 operator+(float f, const Vector2 &v) { return Vector2(f + v.x, f + v.y); }
|
|
|
|
friend Vector2 operator-(float f, const Vector2 &v) { return Vector2(f - v.x, f - v.y); }
|
|
|
|
friend Vector2 operator*(float f, const Vector2 &v) { return Vector2(f * v.x, f * v.y); }
|
|
|
|
friend Vector2 operator/(float f, const Vector2 &v) { return Vector2(f / v.x, f / v.y); }
|
2020-05-22 04:43:01 +00:00
|
|
|
|
|
|
|
bool operator==(const Vector2 &v) const {
|
|
|
|
return x == v.x && y == v.y;
|
|
|
|
}
|
|
|
|
bool operator!=(const Vector2 &v) const {
|
|
|
|
return x != v.x || y != v.y;
|
|
|
|
}
|
2015-07-05 18:05:44 +00:00
|
|
|
private:
|
|
|
|
float x, y;
|
|
|
|
};
|
|
|
|
|
2017-06-07 14:52:50 +00:00
|
|
|
class C1 { };
|
|
|
|
class C2 { };
|
|
|
|
|
|
|
|
int operator+(const C1 &, const C1 &) { return 11; }
|
|
|
|
int operator+(const C2 &, const C2 &) { return 22; }
|
|
|
|
int operator+(const C2 &, const C1 &) { return 21; }
|
|
|
|
int operator+(const C1 &, const C2 &) { return 12; }
|
|
|
|
|
2020-05-22 04:43:01 +00:00
|
|
|
// Note: Specializing explicit within `namespace std { ... }` is done due to a
|
|
|
|
// bug in GCC<7. If you are supporting compilers later than this, consider
|
|
|
|
// specializing `using template<> struct std::hash<...>` in the global
|
|
|
|
// namespace instead, per this recommendation:
|
|
|
|
// https://en.cppreference.com/w/cpp/language/extending_std#Adding_template_specializations
|
2017-08-30 12:22:00 +00:00
|
|
|
namespace std {
|
|
|
|
template<>
|
|
|
|
struct hash<Vector2> {
|
|
|
|
// Not a good hash function, but easy to test
|
|
|
|
size_t operator()(const Vector2 &) { return 4; }
|
|
|
|
};
|
2020-09-11 01:16:40 +00:00
|
|
|
} // namespace std
|
2017-08-30 12:22:00 +00:00
|
|
|
|
2020-05-22 04:43:01 +00:00
|
|
|
// Not a good abs function, but easy to test.
|
|
|
|
std::string abs(const Vector2&) {
|
|
|
|
return "abs(Vector2)";
|
|
|
|
}
|
|
|
|
|
2021-04-14 18:01:27 +00:00
|
|
|
// MSVC & Intel warns about unknown pragmas, and warnings are errors.
|
|
|
|
#if !defined(_MSC_VER) && !defined(__INTEL_COMPILER)
|
2019-04-06 17:09:39 +00:00
|
|
|
#pragma GCC diagnostic push
|
|
|
|
// clang 7.0.0 and Apple LLVM 10.0.1 introduce `-Wself-assign-overloaded` to
|
|
|
|
// `-Wall`, which is used here for overloading (e.g. `py::self += py::self `).
|
|
|
|
// Here, we suppress the warning using `#pragma diagnostic`.
|
|
|
|
// Taken from: https://github.com/RobotLocomotion/drake/commit/aaf84b46
|
|
|
|
// TODO(eric): This could be resolved using a function / functor (e.g. `py::self()`).
|
2020-09-10 17:58:26 +00:00
|
|
|
#if defined(__APPLE__) && defined(__clang__)
|
2020-09-19 18:23:47 +00:00
|
|
|
#if (__clang_major__ >= 10)
|
2019-04-06 17:09:39 +00:00
|
|
|
#pragma GCC diagnostic ignored "-Wself-assign-overloaded"
|
|
|
|
#endif
|
2020-09-10 17:58:26 +00:00
|
|
|
#elif defined(__clang__)
|
2019-04-06 17:09:39 +00:00
|
|
|
#if (__clang_major__ >= 7)
|
|
|
|
#pragma GCC diagnostic ignored "-Wself-assign-overloaded"
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
TEST_SUBMODULE(operators, m) {
|
2017-06-07 14:52:50 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_operator_overloading
|
2015-07-05 18:05:44 +00:00
|
|
|
py::class_<Vector2>(m, "Vector2")
|
|
|
|
.def(py::init<float, float>())
|
|
|
|
.def(py::self + py::self)
|
|
|
|
.def(py::self + float())
|
|
|
|
.def(py::self - py::self)
|
|
|
|
.def(py::self - float())
|
|
|
|
.def(py::self * float())
|
|
|
|
.def(py::self / float())
|
2017-05-21 00:19:26 +00:00
|
|
|
.def(py::self * py::self)
|
|
|
|
.def(py::self / py::self)
|
2015-07-05 18:05:44 +00:00
|
|
|
.def(py::self += py::self)
|
|
|
|
.def(py::self -= py::self)
|
|
|
|
.def(py::self *= float())
|
|
|
|
.def(py::self /= float())
|
2017-05-21 00:19:26 +00:00
|
|
|
.def(py::self *= py::self)
|
|
|
|
.def(py::self /= py::self)
|
2015-09-11 15:09:47 +00:00
|
|
|
.def(float() + py::self)
|
|
|
|
.def(float() - py::self)
|
|
|
|
.def(float() * py::self)
|
|
|
|
.def(float() / py::self)
|
2019-06-22 10:07:41 +00:00
|
|
|
.def(-py::self)
|
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
|
|
|
.def("__str__", &Vector2::toString)
|
2020-05-22 04:43:01 +00:00
|
|
|
.def("__repr__", &Vector2::toString)
|
|
|
|
.def(py::self == py::self)
|
|
|
|
.def(py::self != py::self)
|
|
|
|
.def(py::hash(py::self))
|
|
|
|
// N.B. See warning about usage of `py::detail::abs(py::self)` in
|
|
|
|
// `operators.h`.
|
|
|
|
.def("__abs__", [](const Vector2& v) { return abs(v); })
|
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
|
|
|
;
|
2015-07-05 18:05:44 +00:00
|
|
|
|
|
|
|
m.attr("Vector") = m.attr("Vector2");
|
2017-06-07 14:52:50 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_operators_notimplemented
|
2017-06-07 14:52:50 +00:00
|
|
|
// #393: need to return NotSupported to ensure correct arithmetic operator behavior
|
|
|
|
py::class_<C1>(m, "C1")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self + py::self);
|
|
|
|
|
|
|
|
py::class_<C2>(m, "C2")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self + py::self)
|
|
|
|
.def("__add__", [](const C2& c2, const C1& c1) { return c2 + c1; })
|
|
|
|
.def("__radd__", [](const C2& c2, const C1& c1) { return c1 + c2; });
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
// test_nested
|
2017-06-07 14:52:50 +00:00
|
|
|
// #328: first member in a class can't be used in operators
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
struct NestABase { int value = -2; };
|
2017-06-07 14:52:50 +00:00
|
|
|
py::class_<NestABase>(m, "NestABase")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def_readwrite("value", &NestABase::value);
|
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
struct NestA : NestABase {
|
|
|
|
int value = 3;
|
|
|
|
NestA& operator+=(int i) { value += i; return *this; }
|
|
|
|
};
|
2017-06-07 14:52:50 +00:00
|
|
|
py::class_<NestA>(m, "NestA")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self += int())
|
|
|
|
.def("as_base", [](NestA &a) -> NestABase& {
|
|
|
|
return (NestABase&) a;
|
|
|
|
}, py::return_value_policy::reference_internal);
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
m.def("get_NestA", [](const NestA &a) { return a.value; });
|
2017-06-07 14:52:50 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
struct NestB {
|
|
|
|
NestA a;
|
|
|
|
int value = 4;
|
|
|
|
NestB& operator-=(int i) { value -= i; return *this; }
|
|
|
|
};
|
2017-06-07 14:52:50 +00:00
|
|
|
py::class_<NestB>(m, "NestB")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self -= int())
|
|
|
|
.def_readwrite("a", &NestB::a);
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
m.def("get_NestB", [](const NestB &b) { return b.value; });
|
2017-06-07 14:52:50 +00:00
|
|
|
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
struct NestC {
|
|
|
|
NestB b;
|
|
|
|
int value = 5;
|
|
|
|
NestC& operator*=(int i) { value *= i; return *this; }
|
|
|
|
};
|
2017-06-07 14:52:50 +00:00
|
|
|
py::class_<NestC>(m, "NestC")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::self *= int())
|
|
|
|
.def_readwrite("b", &NestC::b);
|
|
|
|
m.def("get_NestC", [](const NestC &c) { return c.value; });
|
2020-07-26 23:44:25 +00:00
|
|
|
|
|
|
|
|
|
|
|
// test_overriding_eq_reset_hash
|
|
|
|
// #2191 Overriding __eq__ should set __hash__ to None
|
|
|
|
struct Comparable {
|
|
|
|
int value;
|
|
|
|
bool operator==(const Comparable& rhs) const {return value == rhs.value;}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Hashable : Comparable {
|
|
|
|
explicit Hashable(int value): Comparable{value}{};
|
|
|
|
size_t hash() const { return static_cast<size_t>(value); }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Hashable2 : Hashable {
|
|
|
|
using Hashable::Hashable;
|
|
|
|
};
|
|
|
|
|
|
|
|
py::class_<Comparable>(m, "Comparable")
|
|
|
|
.def(py::init<int>())
|
|
|
|
.def(py::self == py::self);
|
|
|
|
|
|
|
|
py::class_<Hashable>(m, "Hashable")
|
|
|
|
.def(py::init<int>())
|
|
|
|
.def(py::self == py::self)
|
|
|
|
.def("__hash__", &Hashable::hash);
|
|
|
|
|
|
|
|
// define __hash__ before __eq__
|
|
|
|
py::class_<Hashable2>(m, "Hashable2")
|
|
|
|
.def("__hash__", &Hashable::hash)
|
|
|
|
.def(py::init<int>())
|
|
|
|
.def(py::self == py::self);
|
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and
comment styles started in #898. For the most part, the test coverage
here is unchanged, with a few minor exceptions as noted below.
- test_constants_and_functions: this adds more overload tests with
overloads with different number of arguments for more comprehensive
overload_cast testing. The test style conversion broke the overload
tests under MSVC 2015, prompting the additional tests while looking
for a workaround.
- test_eigen: this dropped the unused functions `get_cm_corners` and
`get_cm_corners_const`--these same tests were duplicates of the same
things provided (and used) via ReturnTester methods.
- test_opaque_types: this test had a hidden dependence on ExampleMandA
which is now fixed by using the global UserType which suffices for the
relevant test.
- test_methods_and_attributes: this required some additions to UserType
to make it usable as a replacement for the test's previous SimpleType:
UserType gained a value mutator, and the `value` property is not
mutable (it was previously readonly). Some overload tests were also
added to better test overload_cast (as described above).
- test_numpy_array: removed the untemplated mutate_data/mutate_data_t:
the templated versions with an empty parameter pack expand to the same
thing.
- test_stl: this was already mostly in the new style; this just tweaks
things a bit, localizing a class, and adding some missing
`// test_whatever` comments.
- test_virtual_functions: like `test_stl`, this was mostly in the new
test style already, but needed some `// test_whatever` comments.
This commit also moves the inherited virtual example code to the end
of the file, after the main set of tests (since it is less important
than the other tests, and rather length); it also got renamed to
`test_inherited_virtuals` (from `test_inheriting_repeat`) because it
tests both inherited virtual approaches, not just the repeat approach.
2017-07-25 20:47:36 +00:00
|
|
|
}
|
2019-04-06 17:09:39 +00:00
|
|
|
|
2021-04-14 18:01:27 +00:00
|
|
|
#if !defined(_MSC_VER) && !defined(__INTEL_COMPILER)
|
2019-04-06 17:09:39 +00:00
|
|
|
#pragma GCC diagnostic pop
|
|
|
|
#endif
|