mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 05:05:11 +00:00
21282e645a
* Add make_value_iterator (#3271) * Add make_value_iterator This is the counterpart to make_key_iterator, and will allow implementing a `value` method in `bind_map` (although doing so is left for a subsequent PR). I made a few design changes to reduce copy-and-paste boilerplate. Previously detail::iterator_state had a boolean template parameter to indicate whether it was being used for make_iterator or make_key_iterator. I replaced the boolean with a class that determines how to dereference the iterator. This allows for a generic implementation of `__next__`. I also added the ValueType and Extra... parameters to the iterator_state template args, because I think it was a bug that they were missing: if make_iterator is called twice with different values of these, only the first set has effect (because the state class is only registered once). There is still a potential issue in that the *values* of the extra arguments are latched on the first call, but since most policies are empty classes this should be even less common. * Add some remove_cv_t to appease clang-tidy * Make iterator_access and friends take reference For some reason I'd accidentally made it take a const value, which caused some issues with third-party packages. * Another attempt to remove remove_cv_t from iterators Some of the return types were const (non-reference) types because of the pecularities of decltype: `decltype((*it).first)` is the *declared* type of the member of the pair, rather than the type of the expression. So if the reference type of the iterator is `pair<const int, int> &`, then the decltype is `const int`. Wrapping an extra set of parentheses to form `decltype(((*it).first))` would instead give `const int &`. This means that the existing make_key_iterator actually returns by value from `__next__`, rather than by reference. Since for mapping types, keys are always const, this probably hasn't been noticed, but it will affect make_value_iterator if the Python code tries to mutate the returned objects. I've changed things to use double parentheses so that make_iterator, make_key_iterator and make_value_iterator should now all return the reference type of the iterator. I'll still need to add a test for that; for now I'm just checking whether I can keep Clang-Tidy happy. * Add back some NOLINTNEXTLINE to appease Clang-Tidy This is favoured over using remove_cv_t because in some cases a const value return type is deliberate (particularly for Eigen). * Add a unit test for iterator referencing Ensure that make_iterator, make_key_iterator and make_value_iterator return references to the container elements, rather than copies. The test for make_key_iterator fails to compile on master, which gives me confidence that this branch has fixed it. * Make the iterator_access etc operator() const I'm actually a little surprised it compiled at all given that the operator() is called on a temporary, but I don't claim to fully understand all the different value types in C++11. * Attempt to work around compiler bugs https://godbolt.org/ shows an example where ICC gets the wrong result for a decltype used as the default for a template argument, and CI also showed problems with PGI. This is a shot in the dark to see if it fixes things. * Make a test constructor explicit (Clang-Tidy) * Fix unit test on GCC 4.8.5 It seems to require the arguments to the std::pair constructor to be implicitly convertible to the types in the pair, rather than just requiring is_constructible. * Remove DOXYGEN_SHOULD_SKIP_THIS guards Now that a complex decltype expression has been replaced by a simpler nested type, I'm hoping Doxygen will be able to build it without issues. * Add comment to explain iterator_state template params * fix: regression in #3271 Co-authored-by: Bruce Merry <1963944+bmerry@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| extra_python_package | ||
| extra_setuptools | ||
| test_cmake_build | ||
| test_embed | ||
| CMakeLists.txt | ||
| conftest.py | ||
| constructor_stats.h | ||
| cross_module_gil_utils.cpp | ||
| env.py | ||
| local_bindings.h | ||
| object.h | ||
| pybind11_cross_module_tests.cpp | ||
| pybind11_tests.cpp | ||
| pybind11_tests.h | ||
| pytest.ini | ||
| requirements.txt | ||
| test_async.cpp | ||
| test_async.py | ||
| test_buffers.cpp | ||
| test_buffers.py | ||
| test_builtin_casters.cpp | ||
| test_builtin_casters.py | ||
| test_call_policies.cpp | ||
| test_call_policies.py | ||
| test_callbacks.cpp | ||
| test_callbacks.py | ||
| test_chrono.cpp | ||
| test_chrono.py | ||
| test_class.cpp | ||
| test_class.py | ||
| test_constants_and_functions.cpp | ||
| test_constants_and_functions.py | ||
| test_copy_move.cpp | ||
| test_copy_move.py | ||
| test_custom_type_casters.cpp | ||
| test_custom_type_casters.py | ||
| test_docstring_options.cpp | ||
| test_docstring_options.py | ||
| test_eigen.cpp | ||
| test_eigen.py | ||
| test_enum.cpp | ||
| test_enum.py | ||
| test_eval_call.py | ||
| test_eval.cpp | ||
| test_eval.py | ||
| test_exceptions.cpp | ||
| test_exceptions.h | ||
| test_exceptions.py | ||
| test_factory_constructors.cpp | ||
| test_factory_constructors.py | ||
| test_gil_scoped.cpp | ||
| test_gil_scoped.py | ||
| test_iostream.cpp | ||
| test_iostream.py | ||
| test_kwargs_and_defaults.cpp | ||
| test_kwargs_and_defaults.py | ||
| test_local_bindings.cpp | ||
| test_local_bindings.py | ||
| test_methods_and_attributes.cpp | ||
| test_methods_and_attributes.py | ||
| test_modules.cpp | ||
| test_modules.py | ||
| test_multiple_inheritance.cpp | ||
| test_multiple_inheritance.py | ||
| test_numpy_array.cpp | ||
| test_numpy_array.py | ||
| test_numpy_dtypes.cpp | ||
| test_numpy_dtypes.py | ||
| test_numpy_vectorize.cpp | ||
| test_numpy_vectorize.py | ||
| test_opaque_types.cpp | ||
| test_opaque_types.py | ||
| test_operator_overloading.cpp | ||
| test_operator_overloading.py | ||
| test_pickling.cpp | ||
| test_pickling.py | ||
| test_pytypes.cpp | ||
| test_pytypes.py | ||
| test_sequences_and_iterators.cpp | ||
| test_sequences_and_iterators.py | ||
| test_smart_ptr.cpp | ||
| test_smart_ptr.py | ||
| test_stl_binders.cpp | ||
| test_stl_binders.py | ||
| test_stl.cpp | ||
| test_stl.py | ||
| test_tagbased_polymorphic.cpp | ||
| test_tagbased_polymorphic.py | ||
| test_thread.cpp | ||
| test_thread.py | ||
| test_union.cpp | ||
| test_union.py | ||
| test_virtual_functions.cpp | ||
| test_virtual_functions.py | ||
| valgrind-numpy-scipy.supp | ||
| valgrind-python.supp | ||