Skip to content

Commit 7d426a3

Browse files
philnik777philnik777
committed
[libc++] Implement ranges::{reverse, rotate}_copy
Reviewed By: var-const, #libc Spies: huixie90, libcxx-commits, mgorny Differential Revision: https://reviews.llvm.org/D127211
1 parent b19d3ee commit 7d426a3

File tree

12 files changed

+486
-6
lines changed

12 files changed

+486
-6
lines changed

‎libcxx/docs/Status/RangesAlgorithms.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Write,replace_if,Nikolas Klauser,`D126283 <https://llvm.org/D126283>`_,✅
5454
Write,replace_copy,Nikolas Klauser,n/a,Not started
5555
Write,replace_copy_if,Nikolas Klauser,n/a,Not started
5656
Write,swap_ranges,Nikolas Klauser,`D116303 <https://llvm.org/D116303>`_,✅
57-
Write,reverse_copy,Nikolas Klauser,`D127211 <https://llvm.org/D127211>`_,Under review
58-
Write,rotate_copy,Nikolas Klauser,`D127211 <https://llvm.org/D127211>`_,Under review
57+
Write,reverse_copy,Nikolas Klauser,`D127211 <https://llvm.org/D127211>`_,✅
58+
Write,rotate_copy,Nikolas Klauser,`D127211 <https://llvm.org/D127211>`_,✅
5959
Write,sample,Not assigned,n/a,Not started
6060
Write,unique_copy,Not assigned,n/a,Not started
6161
Write,partition_copy,Not assigned,n/a,Not started

‎libcxx/include/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ set(files
112112
__algorithm/ranges_replace.h
113113
__algorithm/ranges_replace_if.h
114114
__algorithm/ranges_reverse.h
115+
__algorithm/ranges_reverse_copy.h
116+
__algorithm/ranges_rotate_copy.h
115117
__algorithm/ranges_set_difference.h
116118
__algorithm/ranges_set_intersection.h
117119
__algorithm/ranges_sort.h

‎libcxx/include/__algorithm/ranges_reverse_copy.h

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
10+
#define _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
11+
12+
#include <__algorithm/in_out_result.h>
13+
#include <__algorithm/ranges_copy.h>
14+
#include <__config>
15+
#include <__iterator/concepts.h>
16+
#include <__iterator/next.h>
17+
#include <__iterator/reverse_iterator.h>
18+
#include <__ranges/access.h>
19+
#include <__ranges/concepts.h>
20+
#include <__ranges/dangling.h>
21+
#include <__ranges/subrange.h>
22+
#include <__utility/move.h>
23+
24+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25+
# pragma GCC system_header
26+
#endif
27+
28+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
29+
30+
_LIBCPP_BEGIN_NAMESPACE_STD
31+
32+
namespace ranges {
33+
34+
template <class _InIter, class _OutIter>
35+
using reverse_copy_result = in_out_result<_InIter, _OutIter>;
36+
37+
namespace __reverse_copy {
38+
struct __fn {
39+
40+
template <bidirectional_iterator _InIter, sentinel_for<_InIter> _Sent, weakly_incrementable _OutIter>
41+
requires indirectly_copyable<_InIter, _OutIter>
42+
_LIBCPP_HIDE_FROM_ABI constexpr
43+
reverse_copy_result<_InIter, _OutIter> operator()(_InIter __first, _Sent __last, _OutIter __result) const {
44+
return (*this)(subrange(std::move(__first), std::move(__last)), std::move(__result));
45+
}
46+
47+
template <bidirectional_range _Range, weakly_incrementable _OutIter>
48+
requires indirectly_copyable<iterator_t<_Range>, _OutIter>
49+
_LIBCPP_HIDE_FROM_ABI constexpr
50+
reverse_copy_result<borrowed_iterator_t<_Range>, _OutIter> operator()(_Range&& __range, _OutIter __result) const {
51+
auto __ret = ranges::copy(std::__reverse_range(__range), std::move(__result));
52+
return {ranges::next(ranges::begin(__range), ranges::end(__range)), std::move(__ret.out)};
53+
}
54+
55+
};
56+
} // namespace __reverse_copy
57+
58+
inline namespace __cpo {
59+
inline constexpr auto reverse_copy = __reverse_copy::__fn{};
60+
} // namespace __cpo
61+
} // namespace ranges
62+
63+
_LIBCPP_END_NAMESPACE_STD
64+
65+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
66+
67+
#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H

‎libcxx/include/__algorithm/ranges_rotate_copy.h

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
10+
#define _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
11+
12+
#include <__algorithm/in_out_result.h>
13+
#include <__algorithm/ranges_copy.h>
14+
#include <__config>
15+
#include <__iterator/concepts.h>
16+
#include <__iterator/reverse_iterator.h>
17+
#include <__ranges/access.h>
18+
#include <__ranges/concepts.h>
19+
#include <__ranges/dangling.h>
20+
#include <__utility/move.h>
21+
22+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23+
# pragma GCC system_header
24+
#endif
25+
26+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
27+
28+
_LIBCPP_BEGIN_NAMESPACE_STD
29+
30+
namespace ranges {
31+
32+
template <class _InIter, class _OutIter>
33+
using rotate_copy_result = in_out_result<_InIter, _OutIter>;
34+
35+
namespace __rotate_copy {
36+
struct __fn {
37+
38+
template <bidirectional_iterator _InIter, sentinel_for<_InIter> _Sent, weakly_incrementable _OutIter>
39+
requires indirectly_copyable<_InIter, _OutIter>
40+
_LIBCPP_HIDE_FROM_ABI constexpr
41+
rotate_copy_result<_InIter, _OutIter>
42+
operator()(_InIter __first, _InIter __middle, _Sent __last, _OutIter __result) const {
43+
auto __res1 = ranges::copy(__middle, __last, std::move(__result));
44+
auto __res2 = ranges::copy(__first, __middle, std::move(__res1.out));
45+
return {std::move(__res1.in), std::move(__res2.out)};
46+
}
47+
48+
template <bidirectional_range _Range, weakly_incrementable _OutIter>
49+
requires indirectly_copyable<iterator_t<_Range>, _OutIter>
50+
_LIBCPP_HIDE_FROM_ABI constexpr
51+
rotate_copy_result<borrowed_iterator_t<_Range>, _OutIter>
52+
operator()(_Range&& __range, iterator_t<_Range> __middle, _OutIter __result) const {
53+
return (*this)(ranges::begin(__range), std::move(__middle), ranges::end(__range), std::move(__result));
54+
}
55+
56+
};
57+
} // namespace __rotate_copy
58+
59+
inline namespace __cpo {
60+
inline constexpr auto rotate_copy = __rotate_copy::__fn{};
61+
} // namespace __cpo
62+
} // namespace ranges
63+
64+
_LIBCPP_END_NAMESPACE_STD
65+
66+
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
67+
68+
#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H

‎libcxx/include/__iterator/reverse_iterator.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,20 @@
1515
#include <__compare/three_way_comparable.h>
1616
#include <__concepts/convertible_to.h>
1717
#include <__config>
18+
#include <__iterator/advance.h>
1819
#include <__iterator/concepts.h>
1920
#include <__iterator/incrementable_traits.h>
2021
#include <__iterator/iter_move.h>
2122
#include <__iterator/iter_swap.h>
2223
#include <__iterator/iterator.h>
2324
#include <__iterator/iterator_traits.h>
25+
#include <__iterator/next.h>
2426
#include <__iterator/prev.h>
2527
#include <__iterator/readable_traits.h>
2628
#include <__memory/addressof.h>
29+
#include <__ranges/access.h>
30+
#include <__ranges/concepts.h>
31+
#include <__ranges/subrange.h>
2732
#include <__utility/move.h>
2833
#include <type_traits>
2934

@@ -365,6 +370,16 @@ struct __rewrap_iter_impl<_ReverseWrapper<_OrigIter>, _UnwrappedIter> {
365370
}
366371
};
367372

373+
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
374+
template <ranges::bidirectional_range _Range>
375+
_LIBCPP_HIDE_FROM_ABI constexpr ranges::
376+
subrange<reverse_iterator<ranges::iterator_t<_Range>>, reverse_iterator<ranges::iterator_t<_Range>>>
377+
__reverse_range(_Range&& __range) {
378+
auto __first = ranges::begin(__range);
379+
return {std::make_reverse_iterator(ranges::next(__first, ranges::end(__range))), std::make_reverse_iterator(__first)};
380+
}
381+
#endif
382+
368383
_LIBCPP_END_NAMESPACE_STD
369384

370385
#endif // _LIBCPP___ITERATOR_REVERSE_ITERATOR_H

‎libcxx/include/algorithm

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ namespace ranges {
585585
requires permutable<iterator_t<R>>
586586
constexpr borrowed_subrange_t<R>
587587
ranges::remove_if(R&& r, Pred pred, Proj proj = {}); // since C++20
588-
588+
589589
template<class I, class O>
590-
using set_difference_result = in_out_result<I, O>; // since C++20
590+
using set_difference_result = in_out_result<I, O>; // since C++20
591591
592592
template<input_iterator I1, sentinel_for<I1> S1, input_iterator I2, sentinel_for<I2> S2,
593593
weakly_incrementable O, class Comp = ranges::less,
@@ -623,6 +623,32 @@ namespace ranges {
623623
set_intersection(R1&& r1, R2&& r2, O result,
624624
Comp comp = {}, Proj1 proj1 = {}, Proj2 proj2 = {}); // since C++20
625625
626+
template <class _InIter, class _OutIter>
627+
using reverse_copy_result = in_out_result<_InIter, _OutIter>; // since C++20
628+
629+
template<bidirectional_iterator I, sentinel_for<I> S, weakly_incrementable O>
630+
requires indirectly_copyable<I, O>
631+
constexpr ranges::reverse_copy_result<I, O>
632+
ranges::reverse_copy(I first, S last, O result); // since C++20
633+
634+
template<bidirectional_range R, weakly_incrementable O>
635+
requires indirectly_copyable<iterator_t<R>, O>
636+
constexpr ranges::reverse_copy_result<borrowed_iterator_t<R>, O>
637+
ranges::reverse_copy(R&& r, O result); // since C++20
638+
639+
template <class _InIter, class _OutIter>
640+
using rotate_copy_result = in_out_result<_InIter, _OutIter>; // since C++20
641+
642+
template<forward_iterator I, sentinel_for<I> S, weakly_incrementable O>
643+
requires indirectly_copyable<I, O>
644+
constexpr ranges::rotate_copy_result<I, O>
645+
ranges::rotate_copy(I first, I middle, S last, O result); // since C++20
646+
647+
template<forward_range R, weakly_incrementable O>
648+
requires indirectly_copyable<iterator_t<R>, O>
649+
constexpr ranges::rotate_copy_result<borrowed_iterator_t<R>, O>
650+
ranges::rotate_copy(R&& r, iterator_t<R> middle, O result); // since C++20
651+
626652
}
627653
628654
constexpr bool // constexpr in C++20
@@ -1396,6 +1422,8 @@ template <class BidirectionalIterator, class Compare>
13961422
#include <__algorithm/ranges_replace.h>
13971423
#include <__algorithm/ranges_replace_if.h>
13981424
#include <__algorithm/ranges_reverse.h>
1425+
#include <__algorithm/ranges_reverse_copy.h>
1426+
#include <__algorithm/ranges_rotate_copy.h>
13991427
#include <__algorithm/ranges_set_difference.h>
14001428
#include <__algorithm/ranges_set_intersection.h>
14011429
#include <__algorithm/ranges_sort.h>

‎libcxx/include/module.modulemap.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ module std [system] {
351351
module ranges_replace { private header "__algorithm/ranges_replace.h" }
352352
module ranges_replace_if { private header "__algorithm/ranges_replace_if.h" }
353353
module ranges_reverse { private header "__algorithm/ranges_reverse.h" }
354+
module ranges_reverse_copy { private header "__algorithm/ranges_reverse_copy.h" }
355+
module ranges_rotate_copy { private header "__algorithm/ranges_rotate_copy.h" }
354356
module ranges_set_difference { private header "__algorithm/ranges_set_difference.h" }
355357
module ranges_set_intersection { private header "__algorithm/ranges_set_intersection.h" }
356358
module ranges_sort { private header "__algorithm/ranges_sort.h" }

‎libcxx/test/libcxx/private_headers.verify.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ END-SCRIPT
149149
#include <__algorithm/ranges_replace.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_replace.h'}}
150150
#include <__algorithm/ranges_replace_if.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_replace_if.h'}}
151151
#include <__algorithm/ranges_reverse.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_reverse.h'}}
152+
#include <__algorithm/ranges_reverse_copy.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_reverse_copy.h'}}
153+
#include <__algorithm/ranges_rotate_copy.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_rotate_copy.h'}}
152154
#include <__algorithm/ranges_set_difference.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_set_difference.h'}}
153155
#include <__algorithm/ranges_set_intersection.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_set_intersection.h'}}
154156
#include <__algorithm/ranges_sort.h> // expected-error@*:* {{use of private header from outside its module: '__algorithm/ranges_sort.h'}}

‎libcxx/test/libcxx/transitive_includes/expected.charconv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ cstddef
66
cstdint
77
cstdlib
88
cstring
9+
initializer_list
910
iosfwd
1011
limits
1112
type_traits

0 commit comments

Comments
 (0)