diff options
author | Konstantin Varlamov <varconst@apple.com> | 2022-07-26 15:51:37 -0700 |
---|---|---|
committer | Konstantin Varlamov <varconst@apple.com> | 2022-07-26 15:51:49 -0700 |
commit | 964aeb713e7be96c2fb9ee06eb6bf47d72de26ca (patch) | |
tree | 4241f604c6982f4d314743ad10bb043b6859a5ad /libcxx/include | |
parent | ead7302bbb148df2f53d028e1a446f5437bac916 (diff) |
[libc++][ranges] Make sure all range algorithms support differing projection types:
- for all algorithms taking more than one range, add a `robust` test to
check the case where the ranges have different value types and the
given projections are different, with each projection applying to
a different value type;
- fix `ranges::include` to apply the correct projection to each range.
Differential Revision: https://reviews.llvm.org/D130515
Diffstat (limited to 'libcxx/include')
-rw-r--r-- | libcxx/include/__algorithm/includes.h | 19 | ||||
-rw-r--r-- | libcxx/include/__algorithm/ranges_includes.h | 8 |
2 files changed, 20 insertions, 7 deletions
diff --git a/libcxx/include/__algorithm/includes.h b/libcxx/include/__algorithm/includes.h index 102d3db39a2d..c64194a2c826 100644 --- a/libcxx/include/__algorithm/includes.h +++ b/libcxx/include/__algorithm/includes.h @@ -12,7 +12,10 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__config> +#include <__functional/identity.h> +#include <__functional/invoke.h> #include <__iterator/iterator_traits.h> +#include <__type_traits/is_callable.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -21,13 +24,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template <class _Iter1, class _Sent1, class _Iter2, class _Sent2, class _Comp> +template <class _Iter1, class _Sent1, class _Iter2, class _Sent2, class _Comp, class _Proj1, class _Proj2> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool -__includes(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2, _Comp&& __comp) { +__includes(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2, + _Comp&& __comp, _Proj1&& __proj1, _Proj2&& __proj2) { for (; __first2 != __last2; ++__first1) { - if (__first1 == __last1 || __comp(*__first2, *__first1)) + if (__first1 == __last1 || std::__invoke( + __comp, std::__invoke(__proj2, *__first2), std::__invoke(__proj1, *__first1))) return false; - if (!__comp(*__first1, *__first2)) + if (!std::__invoke(__comp, std::__invoke(__proj1, *__first1), std::__invoke(__proj2, *__first2))) ++__first2; } return true; @@ -40,9 +45,13 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp) { + static_assert(__is_callable<_Compare, decltype(*__first1), decltype(*__first2)>::value, + "Comparator has to be callable"); + typedef typename __comp_ref_type<_Compare>::type _Comp_ref; return std::__includes( - std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2), static_cast<_Comp_ref>(__comp)); + std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2), + static_cast<_Comp_ref>(__comp), __identity(), __identity()); } template <class _InputIterator1, class _InputIterator2> diff --git a/libcxx/include/__algorithm/ranges_includes.h b/libcxx/include/__algorithm/ranges_includes.h index ba054e6fd89d..2c7581af68af 100644 --- a/libcxx/include/__algorithm/ranges_includes.h +++ b/libcxx/include/__algorithm/ranges_includes.h @@ -56,7 +56,9 @@ struct __fn { std::move(__last1), std::move(__first2), std::move(__last2), - ranges::__make_projected_comp(__comp, __proj1, __proj2)); + std::move(__comp), + std::move(__proj1), + std::move(__proj2)); } template < @@ -73,7 +75,9 @@ struct __fn { ranges::end(__range1), ranges::begin(__range2), ranges::end(__range2), - ranges::__make_projected_comp(__comp, __proj1, __proj2)); + std::move(__comp), + std::move(__proj1), + std::move(__proj2)); } }; |