LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More constexpr algorithms from P0202. search/search_n

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@322566 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2018-01-16 15:48:27 +00:00
parent 661dff0e60
commit d6082200f6
7 changed files with 101 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/algorithm
View File

@@ -148,21 +148,21 @@ template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
BinaryPredicate pred); // **C++14** BinaryPredicate pred); // **C++14**
template <class ForwardIterator1, class ForwardIterator2> template <class ForwardIterator1, class ForwardIterator2>
ForwardIterator1 constexpr ForwardIterator1 // constexpr in C++20
search(ForwardIterator1 first1, ForwardIterator1 last1, search(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2); ForwardIterator2 first2, ForwardIterator2 last2);
template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate> template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
ForwardIterator1 constexpr ForwardIterator1 // constexpr in C++20
search(ForwardIterator1 first1, ForwardIterator1 last1, search(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred); ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
template <class ForwardIterator, class Size, class T> template <class ForwardIterator, class Size, class T>
ForwardIterator constexpr ForwardIterator // constexpr in C++20
search_n(ForwardIterator first, ForwardIterator last, Size count, const T& value); search_n(ForwardIterator first, ForwardIterator last, Size count, const T& value);
template <class ForwardIterator, class Size, class T, class BinaryPredicate> template <class ForwardIterator, class Size, class T, class BinaryPredicate>
ForwardIterator constexpr ForwardIterator // constexpr in C++20
search_n(ForwardIterator first, ForwardIterator last, search_n(ForwardIterator first, ForwardIterator last,
Size count, const T& value, BinaryPredicate pred); Size count, const T& value, BinaryPredicate pred);
@@ -1544,7 +1544,7 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
// __search is in <functional> // __search is in <functional>
template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate> template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator1 _ForwardIterator1
search(_ForwardIterator1 __first1, _ForwardIterator1 __last1, search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred) _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
@@ -1557,7 +1557,7 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
} }
template <class _ForwardIterator1, class _ForwardIterator2> template <class _ForwardIterator1, class _ForwardIterator2>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator1 _ForwardIterator1
search(_ForwardIterator1 __first1, _ForwardIterator1 __last1, search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2) _ForwardIterator2 __first2, _ForwardIterator2 __last2)
@@ -1570,7 +1570,7 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
#if _LIBCPP_STD_VER > 14 #if _LIBCPP_STD_VER > 14
template <class _ForwardIterator, class _Searcher> template <class _ForwardIterator, class _Searcher>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher &__s) _ForwardIterator search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher &__s)
{ return __s(__f, __l).first; } { return __s(__f, __l).first; }
#endif #endif
@@ -1578,7 +1578,7 @@ _ForwardIterator search(_ForwardIterator __f, _ForwardIterator __l, const _Searc
// search_n // search_n
template <class _BinaryPredicate, class _ForwardIterator, class _Size, class _Tp> template <class _BinaryPredicate, class _ForwardIterator, class _Size, class _Tp>
_ForwardIterator _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
__search_n(_ForwardIterator __first, _ForwardIterator __last, __search_n(_ForwardIterator __first, _ForwardIterator __last,
_Size __count, const _Tp& __value_, _BinaryPredicate __pred, forward_iterator_tag) _Size __count, const _Tp& __value_, _BinaryPredicate __pred, forward_iterator_tag)
{ {
@@ -1615,7 +1615,7 @@ __search_n(_ForwardIterator __first, _ForwardIterator __last,
} }
template <class _BinaryPredicate, class _RandomAccessIterator, class _Size, class _Tp> template <class _BinaryPredicate, class _RandomAccessIterator, class _Size, class _Tp>
_RandomAccessIterator _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
__search_n(_RandomAccessIterator __first, _RandomAccessIterator __last, __search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,
_Size __count, const _Tp& __value_, _BinaryPredicate __pred, random_access_iterator_tag) _Size __count, const _Tp& __value_, _BinaryPredicate __pred, random_access_iterator_tag)
{ {
@@ -1655,7 +1655,7 @@ __search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,
} }
template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate> template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator _ForwardIterator
search_n(_ForwardIterator __first, _ForwardIterator __last, search_n(_ForwardIterator __first, _ForwardIterator __last,
_Size __count, const _Tp& __value_, _BinaryPredicate __pred) _Size __count, const _Tp& __value_, _BinaryPredicate __pred)
@@ -1666,7 +1666,7 @@ search_n(_ForwardIterator __first, _ForwardIterator __last,
} }
template <class _ForwardIterator, class _Size, class _Tp> template <class _ForwardIterator, class _Size, class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator _ForwardIterator
search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_) search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_)
{ {

2
include/functional
View File

@@ -2412,7 +2412,7 @@ __not_fn_imp<decay_t<_RawFunc>> not_fn(_RawFunc&& __fn) {
// struct hash<T*> in <memory> // struct hash<T*> in <memory>
template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2> template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
pair<_ForwardIterator1, _ForwardIterator1> pair<_ForwardIterator1, _ForwardIterator1> _LIBCPP_CONSTEXPR_AFTER_CXX11
__search(_ForwardIterator1 __first1, _ForwardIterator1 __last1, __search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred,
forward_iterator_tag, forward_iterator_tag) forward_iterator_tag, forward_iterator_tag)

20
include/type_traits
View File

@@ -4812,39 +4812,39 @@ struct __sfinae_underlying_type
template <class _Tp> template <class _Tp>
struct __sfinae_underlying_type<_Tp, false> {}; struct __sfinae_underlying_type<_Tp, false> {};
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
int __convert_to_integral(int __val) { return __val; } int __convert_to_integral(int __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
unsigned __convert_to_integral(unsigned __val) { return __val; } unsigned __convert_to_integral(unsigned __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
long __convert_to_integral(long __val) { return __val; } long __convert_to_integral(long __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
unsigned long __convert_to_integral(unsigned long __val) { return __val; } unsigned long __convert_to_integral(unsigned long __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
long long __convert_to_integral(long long __val) { return __val; } long long __convert_to_integral(long long __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
unsigned long long __convert_to_integral(unsigned long long __val) {return __val; } unsigned long long __convert_to_integral(unsigned long long __val) {return __val; }
template<typename _Fp> template<typename _Fp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
typename enable_if<is_floating_point<_Fp>::value, long long>::type typename enable_if<is_floating_point<_Fp>::value, long long>::type
__convert_to_integral(_Fp __val) { return __val; } __convert_to_integral(_Fp __val) { return __val; }
#ifndef _LIBCPP_HAS_NO_INT128 #ifndef _LIBCPP_HAS_NO_INT128
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
__int128_t __convert_to_integral(__int128_t __val) { return __val; } __int128_t __convert_to_integral(__int128_t __val) { return __val; }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
__uint128_t __convert_to_integral(__uint128_t __val) { return __val; } __uint128_t __convert_to_integral(__uint128_t __val) { return __val; }
#endif #endif
template <class _Tp> template <class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
typename __sfinae_underlying_type<_Tp>::__promoted_type typename __sfinae_underlying_type<_Tp>::__promoted_type
__convert_to_integral(_Tp __val) { return __val; } __convert_to_integral(_Tp __val) { return __val; }

27
test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
View File

@@ -11,7 +11,7 @@
// template<ForwardIterator Iter1, ForwardIterator Iter2> // template<ForwardIterator Iter1, ForwardIterator Iter2>
// requires HasEqualTo<Iter1::value_type, Iter2::value_type> // requires HasEqualTo<Iter1::value_type, Iter2::value_type>
// Iter1 // constexpr Iter1 // constexpr after C++17
// search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2); // search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
// //
// template<class ForwardIterator, class Searcher> // template<class ForwardIterator, class Searcher>
@@ -21,8 +21,30 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
struct MySearcherC {
template <typename Iterator>
std::pair<Iterator, Iterator>
TEST_CONSTEXPR operator() (Iterator b, Iterator e) const
{
return std::make_pair(b, e);
}
};
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 3};
int ib[] = {0, 1, 5, 3};
int ic[] = {0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4};
return (std::search(std::begin(ic), std::end(ic), std::begin(ia), std::end(ia)) == ic+3)
&& (std::search(std::begin(ic), std::end(ic), std::begin(ib), std::end(ib)) == std::end(ic))
&& (std::search(std::begin(ic), std::end(ic), MySearcherC()) == std::begin(ic))
;
}
#endif
int searcher_called = 0; int searcher_called = 0;
struct MySearcher { struct MySearcher {
@@ -97,4 +119,7 @@ int main()
} }
#endif #endif
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

17
test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
View File

@@ -10,16 +10,27 @@
// <algorithm> // <algorithm>
// template<class ForwardIterator, class Size, class T> // template<class ForwardIterator, class Size, class T>
// ForwardIterator // constexpr ForwardIterator // constexpr after C++17
// search_n(ForwardIterator first, ForwardIterator last, Size count, // search_n(ForwardIterator first, ForwardIterator last, Size count,
// const T& value); // const T& value);
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "user_defined_integral.hpp" #include "user_defined_integral.hpp"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 0, 1, 1, 2, 2};
return (std::search_n(std::begin(ia), std::end(ia), 1, 0) == ia)
&& (std::search_n(std::begin(ia), std::end(ia), 2, 1) == ia+2)
&& (std::search_n(std::begin(ia), std::end(ia), 1, 3) == std::end(ia))
;
}
#endif
template <class Iter> template <class Iter>
void void
test() test()
@@ -74,4 +85,8 @@ int main()
test<forward_iterator<const int*> >(); test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >(); test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >(); test<random_access_iterator<const int*> >();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

19
test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
View File

@@ -10,16 +10,29 @@
// <algorithm> // <algorithm>
// template<class ForwardIterator, class Size, class T, class BinaryPredicate> // template<class ForwardIterator, class Size, class T, class BinaryPredicate>
// ForwardIterator // constexpr ForwardIterator // constexpr after C++17
// search_n(ForwardIterator first, ForwardIterator last, Size count, // search_n(ForwardIterator first, ForwardIterator last, Size count,
// const T& value, BinaryPredicate pred); // const T& value, BinaryPredicate pred);
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#include "user_defined_integral.hpp" #include "user_defined_integral.hpp"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool eq(int a, int b) { return a == b; }
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 0, 1, 1, 2, 2};
return (std::search_n(std::begin(ia), std::end(ia), 1, 0, eq) == ia)
&& (std::search_n(std::begin(ia), std::end(ia), 2, 1, eq) == ia+2)
&& (std::search_n(std::begin(ia), std::end(ia), 1, 3, eq) == std::end(ia))
;
}
#endif
struct count_equal struct count_equal
{ {
static unsigned count; static unsigned count;
@@ -151,4 +164,8 @@ int main()
test<forward_iterator<const int*> >(); test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >(); test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >(); test<random_access_iterator<const int*> >();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

20
test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
View File

@@ -11,14 +11,28 @@
// template<ForwardIterator Iter1, ForwardIterator Iter2> // template<ForwardIterator Iter1, ForwardIterator Iter2>
// requires HasEqualTo<Iter1::value_type, Iter2::value_type> // requires HasEqualTo<Iter1::value_type, Iter2::value_type>
// Iter1 // constexpr Iter1 // constexpr after C++17
// search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2); // search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool eq(int a, int b) { return a == b; }
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 3};
int ib[] = {0, 1, 5, 3};
int ic[] = {0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4};
return (std::search(std::begin(ic), std::end(ic), std::begin(ia), std::end(ia), eq) == ic+3)
&& (std::search(std::begin(ic), std::end(ic), std::begin(ib), std::end(ib), eq) == std::end(ic))
;
}
#endif
struct count_equal struct count_equal
{ {
static unsigned count; static unsigned count;
@@ -108,4 +122,8 @@ int main()
test<random_access_iterator<const int*>, forward_iterator<const int*> >(); test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >(); test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >(); test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }