More constexpr algorithms from P0202. search/search_n

llvm-svn: 322566

4 files changed, 79 insertions, 4 deletions

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
index 463d87bb41d..d483800c209 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
@@ -11,7 +11,7 @@
 
 // template<ForwardIterator Iter1, ForwardIterator Iter2>
 //   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
-//   Iter1
+//   constexpr Iter1     // constexpr after C++17
 //   search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 //
 //   template<class ForwardIterator, class Searcher>
@@ -21,8 +21,30 @@
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.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;
 
 struct MySearcher {
@@ -97,4 +119,7 @@ int main()
 }
 #endif
 
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
index 4874bcad833..528ec5696e8 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
@@ -10,16 +10,27 @@
 // <algorithm>
 
 // template<class ForwardIterator, class Size, class T>
-//   ForwardIterator
+//   constexpr ForwardIterator     // constexpr after C++17
 //   search_n(ForwardIterator first, ForwardIterator last, Size count,
 //            const T& value);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 #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>
 void
 test()
@@ -74,4 +85,8 @@ int main()
     test<forward_iterator<const int*> >();
     test<bidirectional_iterator<const int*> >();
     test<random_access_iterator<const int*> >();
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
index ff459b34893..d5780c7e7dd 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
@@ -10,16 +10,29 @@
 // <algorithm>
 
 // template<class ForwardIterator, class Size, class T, class BinaryPredicate>
-//   ForwardIterator
+//   constexpr ForwardIterator     // constexpr after C++17
 //   search_n(ForwardIterator first, ForwardIterator last, Size count,
 //            const T& value, BinaryPredicate pred);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 #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
 {
     static unsigned count;
@@ -151,4 +164,8 @@ int main()
     test<forward_iterator<const int*> >();
     test<bidirectional_iterator<const int*> >();
     test<random_access_iterator<const int*> >();
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
index 192da03d67b..21a17116fc8 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
@@ -11,14 +11,28 @@
 
 // template<ForwardIterator Iter1, ForwardIterator Iter2>
 //   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
-//   Iter1
+//   constexpr Iter1     // constexpr after C++17
 //   search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.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
 {
     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*>, bidirectional_iterator<const int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }