Another batch of P0202 constepr algirithms. remove/remove_if/remove_copy/remove_copy_if/reverse_copy, and tests (commented out) for rotate_copy, because that depends on std::copy

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@323152 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2018-01-22 21:43:04 +00:00
parent a15161a030
commit 63be4189d8
7 changed files with 127 additions and 18 deletions

View File

@@ -12,7 +12,7 @@
// template<ForwardIterator Iter, class T>
// requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
// && HasEqualTo<Iter::value_type, T>
// Iter
// constexpr Iter // constexpr after C++17
// remove(Iter first, Iter last, const T& value);
#include <algorithm>
@@ -22,6 +22,18 @@
#include "test_macros.h"
#include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 5, 2, 5, 6};
auto it = std::remove(std::begin(ia), std::end(ia), 5);
return (std::begin(ia) + std::size(ia) - 2) == it // we removed two elements
&& std::none_of(std::begin(ia), it, [](int a) {return a == 5; })
;
}
#endif
template <class Iter>
void
test()
@@ -75,4 +87,8 @@ int main()
test1<random_access_iterator<std::unique_ptr<int>*> >();
test1<std::unique_ptr<int>*>();
#endif // TEST_STD_VER >= 11
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
}

View File

@@ -11,14 +11,29 @@
// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter, class T>
// requires HasEqualTo<InIter::value_type, T>
// OutIter
// constexpr OutIter // constexpr after C++17
// remove_copy(InIter first, InIter last, OutIter result, const T& value);
#include <algorithm>
#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 5, 2, 5, 6};
int ib[std::size(ia)] = {0};
auto it = std::remove_copy(std::begin(ia), std::end(ia), std::begin(ib), 5);
return std::distance(std::begin(ib), it) == (std::size(ia) - 2) // we removed two elements
&& std::none_of(std::begin(ib), it, [](int a) {return a == 5;})
&& std::all_of (it, std::end(ib), [](int a) {return a == 0;})
;
}
#endif
template <class InIter, class OutIter>
void
test()
@@ -67,4 +82,8 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
}

View File

@@ -12,16 +12,31 @@
// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter,
// Predicate<auto, InIter::value_type> Pred>
// requires CopyConstructible<Pred>
// OutIter
// constexpr OutIter // constexpr after C++17
// remove_copy_if(InIter first, InIter last, OutIter result, Pred pred);
#include <algorithm>
#include <functional>
#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
bool equalToTwo(int v) { return v == 2; }
TEST_CONSTEXPR bool equalToTwo(int v) { return v == 2; }
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 5, 2, 5, 6};
int ib[std::size(ia)] = {0};
auto it = std::remove_copy_if(std::begin(ia), std::end(ia), std::begin(ib), equalToTwo);
return std::distance(std::begin(ib), it) == (std::size(ia) - 1) // we removed one element
&& std::none_of(std::begin(ib), it, equalToTwo)
&& std::all_of (it, std::end(ib), [](int a) {return a == 0;})
;
}
#endif
template <class InIter, class OutIter>
void
@@ -72,4 +87,8 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
}

View File

@@ -12,7 +12,7 @@
// template<ForwardIterator Iter, Predicate<auto, Iter::value_type> Pred>
// requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
// && CopyConstructible<Pred>
// Iter
// constexpr Iter // constexpr after C++17
// remove_if(Iter first, Iter last, Pred pred);
#include <algorithm>
@@ -24,7 +24,19 @@
#include "test_iterators.h"
#include "counting_predicates.hpp"
bool equal2 ( int i ) { return i == 2; }
TEST_CONSTEXPR bool equal2 ( int i ) { return i == 2; }
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 5, 2, 5, 6};
auto it = std::remove_if(std::begin(ia), std::end(ia), equal2);
return (std::begin(ia) + std::size(ia) - 1) == it // we removed one element
&& std::none_of(std::begin(ia), it, equal2)
;
}
#endif
template <class Iter>
void
@@ -90,4 +102,8 @@ int main()
test1<random_access_iterator<std::unique_ptr<int>*> >();
test1<std::unique_ptr<int>*>();
#endif // TEST_STD_VER >= 11
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
}

View File

@@ -10,14 +10,28 @@
// <algorithm>
// template<BidirectionalIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
// OutIter
// constexpr OutIter // constexpr after C++17
// reverse_copy(InIter first, InIter last, OutIter result);
#include <algorithm>
#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 5, 2, 5, 6};
int ib[std::size(ia)] = {0};
auto it = std::reverse_copy(std::begin(ia), std::end(ia), std::begin(ib));
return std::distance(std::begin(ib), it) == std::size(ia)
&& std::equal (std::begin(ia), std::end(ia), std::rbegin(ib))
;
}
#endif
template <class InIter, class OutIter>
void
test()
@@ -78,4 +92,8 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
}

View File

@@ -10,14 +10,31 @@
// <algorithm>
// template<ForwardIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
// OutIter
// constexpr OutIter // constexpr after C++17
// rotate_copy(InIter first, InIter middle, InIter last, OutIter result);
#include <algorithm>
#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
// #if TEST_STD_VER > 17
// TEST_CONSTEXPR bool test_constexpr() {
// int ia[] = {1, 3, 5, 2, 5, 6};
// int ib[std::size(ia)] = {0};
//
// const size_t N = 2;
// const auto middle = std::begin(ia) + N;
// auto it = std::rotate_copy(std::begin(ia), middle, std::end(ia), std::begin(ib));
//
// return std::distance(std::begin(ib), it) == std::size(ia)
// && std::equal (std::begin(ia), middle, std::begin(ib) + std::size(ia) - N)
// && std::equal (middle, std::end(ia), std::begin(ib))
// ;
// }
// #endif
template <class InIter, class OutIter>
void
test()
@@ -131,4 +148,8 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
// #if TEST_STD_VER > 17
// static_assert(test_constexpr());
// #endif
}