[gcc(refs/users/ppalka/heads/libstdcxx-constrained-algos)] Add ranges::remove_copy and ranges::remove_copy_if
Patrick Palka
ppalka@gcc.gnu.org
Tue Jan 21 16:53:00 GMT 2020
https://gcc.gnu.org/g:180c8e3ee7a98b00e5d4dd5f352f8c27f9dfc5dd
commit 180c8e3ee7a98b00e5d4dd5f352f8c27f9dfc5dd
Author: Patrick Palka <ppalka@gcc.gnu.org>
Date: Tue Jan 21 10:45:50 2020 -0500
Add ranges::remove_copy and ranges::remove_copy_if
Diff:
---
libstdc++-v3/include/bits/ranges_algo.h | 70 +++++++++++++
.../25_algorithms/remove_copy/constrained.cc | 107 ++++++++++++++++++++
.../25_algorithms/remove_copy_if/constrained.cc | 111 +++++++++++++++++++++
3 files changed, 288 insertions(+)
diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h
index 4212353..6290846 100644
--- a/libstdc++-v3/include/bits/ranges_algo.h
+++ b/libstdc++-v3/include/bits/ranges_algo.h
@@ -1337,6 +1337,76 @@ namespace ranges
__value, std::move(__proj));
}
+ template<class _Iter, class _Out>
+ using remove_copy_if_result = copy_result<_Iter, _Out>;
+
+ template<input_iterator _Iter, sentinel_for<_Iter> _Sent,
+ weakly_incrementable _Out, class _Proj = identity,
+ indirect_unary_predicate<projected<_Iter, _Proj>> _Pred>
+ requires indirectly_copyable<_Iter, _Out>
+ constexpr remove_copy_if_result<_Iter, _Out>
+ remove_copy_if(_Iter __first, _Sent __last, _Out __result,
+ _Pred __pred, _Proj __proj = {})
+ {
+ for (; __first != __last; ++__first)
+ if (!std::__invoke(__pred, std::__invoke(__proj, *__first)))
+ {
+ *__result = *__first;
+ ++__result;
+ }
+ return {__last, __result};
+ }
+
+ template<input_range _Range, weakly_incrementable _Out,
+ class _Proj = identity,
+ indirect_unary_predicate<projected<iterator_t<_Range>, _Proj>> _Pred>
+ requires indirectly_copyable<iterator_t<_Range>, _Out>
+ constexpr remove_copy_if_result<safe_iterator_t<_Range>, _Out>
+ remove_copy_if(_Range&& __r, _Out __result,
+ _Pred __pred, _Proj __proj = {})
+ {
+ return ranges::remove_copy_if(ranges::begin(__r), ranges::end(__r),
+ __result,
+ std::move(__pred), std::move(__proj));
+ }
+
+ template<class _Iter, class _Out>
+ using remove_copy_result = copy_result<_Iter, _Out>;
+
+ template<input_iterator _Iter, sentinel_for<_Iter> _Sent,
+ weakly_incrementable _Out, class _Tp, class _Proj = identity>
+ requires indirectly_copyable<_Iter, _Out>
+ && indirect_binary_predicate<ranges::equal_to,
+ projected<_Iter, _Proj>,
+ const _Tp*>
+ constexpr remove_copy_result<_Iter, _Out>
+ remove_copy(_Iter __first, _Sent __last, _Out __result,
+ const _Tp& __value, _Proj __proj = {})
+ {
+ for (; __first != __last; ++__first)
+ if (!(std::__invoke(__proj, *__first) == __value))
+ {
+ *__result = *__first;
+ ++__result;
+ }
+ return {__last, __result};
+ }
+
+ template<input_range _Range, weakly_incrementable _Out,
+ class _Tp, class _Proj = identity>
+ requires indirectly_copyable<iterator_t<_Range>, _Out>
+ && indirect_binary_predicate<ranges::equal_to,
+ projected<iterator_t<_Range>, _Proj>,
+ const _Tp*>
+ constexpr remove_copy_result<safe_iterator_t<_Range>, _Out>
+ remove_copy(_Range&& __r, _Out __result,
+ const _Tp& __value, _Proj __proj = {})
+ {
+ return ranges::remove_copy(ranges::begin(__r), ranges::end(__r),
+ __result, __value, std::move(__proj));
+
+ }
+
} // namespace ranges
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
diff --git a/libstdc++-v3/testsuite/25_algorithms/remove_copy/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/remove_copy/constrained.cc
new file mode 100644
index 0000000..2303293
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/remove_copy/constrained.cc
@@ -0,0 +1,107 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do run { target c++2a } }
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+
+using __gnu_test::test_container;
+using __gnu_test::test_range;
+using __gnu_test::input_iterator_wrapper;
+using __gnu_test::forward_iterator_wrapper;
+
+namespace ranges = std::ranges;
+
+struct X
+{
+ int i;
+
+ friend constexpr bool
+ operator==(const X& a, const X& b)
+ {
+ return a.i == b.i;
+ }
+};
+
+void
+test01()
+{
+ {
+ const X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[4];
+ X z[4] = { {2}, {2}, {6}, {10} };
+ auto [in,out] = ranges::remove_copy(x, x+5, y, 8, &X::i);
+ VERIFY( in == x+5 && out == y+4 );
+ VERIFY( ranges::equal(y, z) );
+ }
+
+ {
+ const X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[5];
+ X z[5] = { {2}, {2}, {6}, {8}, {10} };
+ auto [in,out] = ranges::remove_copy(x, x+5, y, 11, &X::i);
+ VERIFY( in == x+5 && out == y+5 );
+ VERIFY( ranges::equal(x, x+5, y, y+5) && ranges::equal(y, z) );
+ }
+
+ {
+ X x[6] = { {2}, {2}, {6}, {8}, {10}, {2} };
+ X y[3];
+ X z[3] = { {6}, {8}, {10} };
+ test_container<X, forward_iterator_wrapper> cx(x), cy(y), cz(z);
+ auto [in, out] = ranges::remove_copy(cx, cy.begin(), 2, &X::i);
+ VERIFY( in == cx.end() && out == cy.end() );
+ VERIFY( ranges::equal(cy, cz) );
+ }
+
+ {
+ X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[4];
+ X z[4] = { {6}, {8}, {10}, {11} };
+ test_range<X, forward_iterator_wrapper> cx(x), cy(y), cz(z);
+ auto [in, out] = ranges::remove_copy(cx, cy.begin(), 2, &X::i);
+ VERIFY( in == cx.end() && out == cy.end() );
+ VERIFY( ranges::equal(cy, cz) );
+ }
+}
+
+struct Y { int i; int j; };
+
+constexpr bool
+test02()
+{
+ bool ok = true;
+ Y x[3] = { {3,2}, {2,4}, {3,6} };
+ Y y[1];
+ Y z[1] = { {2,4} };
+ auto [in, out] = ranges::remove_copy(x, y, 3, &Y::i);
+ ok &= in == x+3;
+ ok &= out == y+1;
+ ok &= ranges::equal(y, z, {}, &Y::i, &Y::i);
+ ok &= ranges::equal(y, z, {}, &Y::j, &Y::j);
+ return ok;
+}
+
+int
+main()
+{
+ test01();
+ static_assert(test02());
+}
diff --git a/libstdc++-v3/testsuite/25_algorithms/remove_copy_if/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/remove_copy_if/constrained.cc
new file mode 100644
index 0000000..b38cf1c
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/remove_copy_if/constrained.cc
@@ -0,0 +1,111 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do run { target c++2a } }
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+
+using __gnu_test::test_container;
+using __gnu_test::test_range;
+using __gnu_test::input_iterator_wrapper;
+using __gnu_test::forward_iterator_wrapper;
+
+namespace ranges = std::ranges;
+
+struct X
+{
+ int i;
+
+ friend constexpr bool
+ operator==(const X& a, const X& b)
+ {
+ return a.i == b.i;
+ }
+};
+
+void
+test01()
+{
+ auto is_negative_p = [] (int a) { return a < 0; };
+ auto is_two_p = [] (int a) { return a == 2; };
+
+ {
+ const X x[6] = { {2}, {2}, {6}, {8}, {2}, {11} };
+ X y[2];
+ X z[2] = { {6}, {8} };
+ auto [in, out] = ranges::remove_copy_if(x, x+5, y, is_two_p, &X::i);
+ VERIFY( in == x+5 && out == y+2 );
+ VERIFY( ranges::equal(y, z) );
+ }
+
+ {
+ const X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[5];
+ X z[5] = { {2}, {2}, {6}, {8}, {10} };
+ auto [in, out] = ranges::remove_copy_if(x, x+5, y, is_negative_p, &X::i);
+ VERIFY( in == x+5 && out == y+5 );
+ VERIFY( ranges::equal(x, x+5, y, y+5) && ranges::equal(y, z) );
+ }
+
+ {
+ X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[4];
+ X z[4] = { {6}, {8}, {10}, {11} };
+ test_container<X, forward_iterator_wrapper> cx(x), cy(y), cz(z);
+ auto [in, out] = ranges::remove_copy_if(cx, cy.begin(), is_two_p, &X::i);
+ VERIFY( in == cx.end() && out == cy.end() );
+ VERIFY( ranges::equal(cy, cz) );
+ }
+
+ {
+ X x[6] = { {2}, {2}, {6}, {8}, {10}, {11} };
+ X y[4];
+ X z[4] = { {6}, {8}, {10}, {11} };
+ test_range<X, forward_iterator_wrapper> cx(x), cy(y), cz(z);
+ auto [in, out] = ranges::remove_copy_if(cx, cy.begin(), is_two_p, &X::i);
+ VERIFY( in == cx.end() && out == cy.end() );
+ VERIFY( ranges::equal(cy, cz) );
+ }
+}
+
+struct Y { int i; int j; };
+
+constexpr bool
+test02()
+{
+ bool ok = true;
+ Y x[3] = { {3,2}, {2,4}, {3,6} };
+ Y y[1];
+ Y z[1] = { {2,4} };
+ auto [in, out]
+ = ranges::remove_copy_if(x, y, [] (int a) { return a%2 == 1; }, &Y::i);
+ ok &= in == x+3;
+ ok &= out == y+1;
+ ok &= ranges::equal(y, z, {}, &Y::i, &Y::i);
+ ok &= ranges::equal(y, z, {}, &Y::j, &Y::j);
+ return ok;
+}
+
+int
+main()
+{
+ test01();
+ static_assert(test02());
+}
More information about the Libstdc++-cvs
mailing list