Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement LWG-3710: The end of chunk_view for input ranges can be const #2878

Merged
merged 7 commits into from
Jul 28, 2022
Merged

Implement LWG-3710: The end of chunk_view for input ranges can be const #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a72974
fix LWG-3710
gogim1 Jul 19, 2022
981c02e
fix static_assert failed
gogim1 Jul 19, 2022
3df7fa4
fix code format
gogim1 Jul 19, 2022
c9beaaf
fix code format
gogim1 Jul 19, 2022
2b86225
force clang-formats hand by adding a comment
gogim1 Jul 20, 2022
32c7938
Handle `!CanMemberBegin<const R> && CanMemberEnd<const R>`
CaseyCarter Jul 21, 2022
9c29e97
Code review feedback: drop std, enable clang-format.
StephanTLavavej Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5458,7 +5458,7 @@ namespace ranges {
return _Outer_iterator{this};
}

_NODISCARD constexpr default_sentinel_t end() noexcept {
_NODISCARD constexpr default_sentinel_t end() const noexcept {
return default_sentinel;
}

Expand Down
35 changes: 20 additions & 15 deletions tests/std/tests/P2442R1_views_chunk/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ constexpr auto equal_ranges = [](auto&& left, auto&& right) { return ranges::equ

template <ranges::input_range Rng, class Expected>
constexpr bool test_one(Rng&& rng, Expected&& expected) {
using ranges::bidirectional_range, ranges::common_range, ranges::forward_range, ranges::random_access_range,
ranges::sized_range;
using ranges::bidirectional_range, ranges::common_range, ranges::forward_range, ranges::input_range,
ranges::random_access_range, ranges::sized_range;
using ranges::chunk_view, ranges::begin, ranges::end, ranges::equal, ranges::iterator_t, ranges::sentinel_t,
ranges::prev;
constexpr bool is_view = ranges::view<remove_cvref_t<Rng>>;
Expand Down Expand Up @@ -197,23 +197,28 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
}
}

STATIC_ASSERT(CanMemberEnd<const R> == forward_range<const V>);
STATIC_ASSERT(CanMemberEnd<const R> == input_range<const V>);
if constexpr (CanMemberEnd<const R>) {
const same_as<sentinel_t<const R>> auto cs = as_const(r).end();
assert((r.begin() == cs) == is_empty);
STATIC_ASSERT(
common_range<R> == (common_range<const V> && (sized_range<const V> || !bidirectional_range<const V>) ));
if constexpr (common_range<const R> && bidirectional_range<V>) {
if (!is_empty) {
assert(equal(*prev(cs), *prev(end(expected))));
}

if constexpr (copy_constructible<V>) {
const auto r2 = r;
if constexpr (CanMemberBegin<const R>) {
const same_as<sentinel_t<const R>> auto cs = as_const(r).end();
assert((r.begin() == cs) == is_empty);
STATIC_ASSERT(common_range<const R> //
== (forward_range<const V> && common_range<const V> //
&& (sized_range<const V> || !bidirectional_range<const V>) ));
if constexpr (common_range<const R> && bidirectional_range<V>) {
if (!is_empty) {
assert(equal(*prev(r2.end()), *prev(end(expected))));
assert(equal(*prev(cs), *prev(end(expected))));
}

if constexpr (copy_constructible<V>) {
const auto r2 = r;
if (!is_empty) {
assert(equal(*prev(r2.end()), *prev(end(expected))));
}
}
}
} else {
STATIC_ASSERT(same_as<decltype(as_const(r).end()), default_sentinel_t>);
}
}

Expand Down