diff options
Diffstat (limited to 'libcxx/test/std/algorithms')
4 files changed, 146 insertions, 4 deletions
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp index e867b86b831..e725e4ada65 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp @@ -11,8 +11,13 @@ // template<InputIterator Iter1, InputIterator Iter2> // requires HasEqualTo<Iter1::value_type, Iter2::value_type> -// bool +// constexpr bool // constexpr after c++17 // equal(Iter1 first1, Iter1 last1, Iter2 first2); +// +// Introduced in C++14: +// template<InputIterator Iter1, InputIterator Iter2> +// constexpr bool // constexpr after c++17 +// equal(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2); #include <algorithm> #include <cassert> @@ -20,6 +25,25 @@ #include "test_macros.h" #include "test_iterators.h" +#if TEST_STD_VER > 17 +TEST_CONSTEXPR bool test_constexpr() { + int ia[] = {1, 3, 6, 7}; + int ib[] = {1, 3}; + int ic[] = {1, 3, 5, 7}; + typedef input_iterator<int*> II; + typedef bidirectional_iterator<int*> BI; + + return !std::equal(std::begin(ia), std::end(ia), std::begin(ic)) + && !std::equal(std::begin(ia), std::end(ia), std::begin(ic), std::end(ic)) + && std::equal(std::begin(ib), std::end(ib), std::begin(ic)) + && !std::equal(std::begin(ib), std::end(ib), std::begin(ic), std::end(ic)) + + && std::equal(II(std::begin(ib)), II(std::end(ib)), II(std::begin(ic))) + && !std::equal(BI(std::begin(ib)), BI(std::end(ib)), BI(std::begin(ic)), BI(std::end(ic))) + ; + } +#endif + int main() { @@ -61,4 +85,8 @@ int main() random_access_iterator<const int*>(ia+s-1))); #endif + +#if TEST_STD_VER > 17 + static_assert(test_constexpr()); +#endif } diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp index d57e365a919..53f52e0e370 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp @@ -12,8 +12,16 @@ // template<InputIterator Iter1, InputIterator Iter2, // Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> // requires CopyConstructible<Pred> -// bool +// constexpr bool // constexpr after c++17 // equal(Iter1 first1, Iter1 last1, Iter2 first2, Pred pred); +// +// Introduced in C++14: +// template<InputIterator Iter1, InputIterator Iter2, +// Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> +// requires CopyConstructible<Pred> +// constexpr bool // constexpr after c++17 +// equal(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred); + #include <algorithm> #include <functional> @@ -22,6 +30,28 @@ #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[] = {1, 3, 6, 7}; + int ib[] = {1, 3}; + int ic[] = {1, 3, 5, 7}; + typedef input_iterator<int*> II; + typedef bidirectional_iterator<int*> BI; + + return !std::equal(std::begin(ia), std::end(ia), std::begin(ic) , eq) + && !std::equal(std::begin(ia), std::end(ia), std::begin(ic), std::end(ic), eq) + && std::equal(std::begin(ib), std::end(ib), std::begin(ic) , eq) + && !std::equal(std::begin(ib), std::end(ib), std::begin(ic), std::end(ic), eq) + + && std::equal(II(std::begin(ib)), II(std::end(ib)), II(std::begin(ic)) , eq) + && !std::equal(BI(std::begin(ib)), BI(std::end(ib)), BI(std::begin(ic)), BI(std::end(ic)), eq) + ; + } +#endif + + int comparison_count = 0; template <typename T> bool counting_equals ( const T &a, const T &b ) { @@ -81,4 +111,8 @@ int main() random_access_iterator<const int*>(ib+s), std::equal_to<int>())); #endif + +#if TEST_STD_VER > 17 + static_assert(test_constexpr()); +#endif } diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp index d4bc3fd70a8..f298bae9690 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp @@ -11,8 +11,12 @@ // template<InputIterator Iter1, InputIterator Iter2> // requires HasEqualTo<Iter1::value_type, Iter2::value_type> -// pair<Iter1, Iter2> +// constexpr pair<Iter1, Iter2> // constexpr after c++17 // mismatch(Iter1 first1, Iter1 last1, Iter2 first2); +// +// template<InputIterator Iter1, InputIterator Iter2Pred> +// constexpr pair<Iter1, Iter2> // constexpr after c++17 +// mismatch(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2); // C++14 #include <algorithm> #include <cassert> @@ -20,6 +24,40 @@ #include "test_macros.h" #include "test_iterators.h" +#if TEST_STD_VER > 17 +TEST_CONSTEXPR bool test_constexpr() { + int ia[] = {1, 3, 6, 7}; + int ib[] = {1, 3}; + int ic[] = {1, 3, 5, 7}; + typedef input_iterator<int*> II; + typedef bidirectional_iterator<int*> BI; + + auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic)); + if (p1.first != ia+2 || p1.second != ic+2) + return false; + + auto p2 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic), std::end(ic)); + if (p2.first != ia+2 || p2.second != ic+2) + return false; + + auto p3 = std::mismatch(std::begin(ib), std::end(ib), std::begin(ic)); + if (p3.first != ib+2 || p3.second != ic+2) + return false; + + auto p4 = std::mismatch(std::begin(ib), std::end(ib), std::begin(ic), std::end(ic)); + if (p4.first != ib+2 || p4.second != ic+2) + return false; + + auto p5 = std::mismatch(II(std::begin(ib)), II(std::end(ib)), II(std::begin(ic))); + if (p5.first != II(ib+2) || p5.second != II(ic+2)) + return false; + auto p6 = std::mismatch(BI(std::begin(ib)), BI(std::end(ib)), BI(std::begin(ic)), BI(std::end(ic))); + if (p6.first != BI(ib+2) || p6.second != BI(ic+2)) + return false; + + return true; + } +#endif int main() { diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp index 2a363826261..bc05f19c04f 100644 --- a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp +++ b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp @@ -12,8 +12,12 @@ // template<InputIterator Iter1, InputIterator Iter2, // Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> // requires CopyConstructible<Pred> -// pair<Iter1, Iter2> +// constexpr pair<Iter1, Iter2> // constexpr after c++17 // mismatch(Iter1 first1, Iter1 last1, Iter2 first2, Pred pred); +// +// template<InputIterator Iter1, InputIterator Iter2, Predicate Pred> +// constexpr pair<Iter1, Iter2> // constexpr after c++17 +// mismatch(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred); // C++14 #include <algorithm> #include <functional> @@ -23,6 +27,44 @@ #include "test_iterators.h" #include "counting_predicates.hpp" +#if TEST_STD_VER > 17 +TEST_CONSTEXPR bool eq(int a, int b) { return a == b; } + +TEST_CONSTEXPR bool test_constexpr() { + int ia[] = {1, 3, 6, 7}; + int ib[] = {1, 3}; + int ic[] = {1, 3, 5, 7}; + typedef input_iterator<int*> II; + typedef bidirectional_iterator<int*> BI; + + auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic), eq); + if (p1.first != ia+2 || p1.second != ic+2) + return false; + + auto p2 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic), std::end(ic), eq); + if (p2.first != ia+2 || p2.second != ic+2) + return false; + + auto p3 = std::mismatch(std::begin(ib), std::end(ib), std::begin(ic), eq); + if (p3.first != ib+2 || p3.second != ic+2) + return false; + + auto p4 = std::mismatch(std::begin(ib), std::end(ib), std::begin(ic), std::end(ic), eq); + if (p4.first != ib+2 || p4.second != ic+2) + return false; + + auto p5 = std::mismatch(II(std::begin(ib)), II(std::end(ib)), II(std::begin(ic)), eq); + if (p5.first != II(ib+2) || p5.second != II(ic+2)) + return false; + auto p6 = std::mismatch(BI(std::begin(ib)), BI(std::end(ib)), BI(std::begin(ic)), BI(std::end(ic)), eq); + if (p6.first != BI(ib+2) || p6.second != BI(ic+2)) + return false; + + return true; + } +#endif + + #if TEST_STD_VER > 11 #define HAS_FOUR_ITERATOR_VERSION #endif |
