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

Testing: check c(begin|end) members of some C++23 ranges #3920

Merged
merged 8 commits into from
Aug 11, 2023
Merged

Testing: check c(begin|end) members of some C++23 ranges #3920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39b6044
Test `views::as_const`
JMazurkiewicz Aug 2, 2023
e9ac436
Test `views::zip`
JMazurkiewicz Aug 2, 2023
3a61c48
Test `views::stride`
JMazurkiewicz Aug 2, 2023
bafe3e9
Fixes
JMazurkiewicz Aug 2, 2023
f912567
Fix `views::stride` test
JMazurkiewicz Aug 2, 2023
cb3bc19
Merge branch 'main' into ranges/const
StephanTLavavej Aug 2, 2023
faf39fd
Code review feedback.
StephanTLavavej Aug 2, 2023
7af1e8b
Work around GH 1030 by imitating P2321R2_views_zip_transform.
StephanTLavavej Aug 10, 2023
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
86 changes: 85 additions & 1 deletion tests/std/tests/P1899R3_views_stride/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ template <ranges::input_range Rng, class Expected>
constexpr bool test_one(Rng&& rng, Expected&& expected) {
using ranges::forward_range, ranges::bidirectional_range, ranges::random_access_range, ranges::common_range,
ranges::sized_range;
using ranges::stride_view, ranges::begin, ranges::end, ranges::iterator_t, ranges::sentinel_t, ranges::prev;
using ranges::stride_view, ranges::begin, ranges::end, ranges::cbegin, ranges::cend, ranges::iterator_t,
ranges::sentinel_t, ranges::const_iterator_t, ranges::const_sentinel_t, ranges::prev;

constexpr bool is_view = ranges::view<remove_cvref_t<Rng>>;

Expand Down Expand Up @@ -227,6 +228,89 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
}
}

// Validate view_interface::cbegin
STATIC_ASSERT(CanMemberCBegin<R>);
{
const same_as<const_iterator_t<R>> auto i = r.cbegin();
if (!is_empty) {
assert(*i == *cbegin(expected));
}

if constexpr (copy_constructible<V>) {
auto r2 = r;
const same_as<const_iterator_t<R>> auto i2 = r2.cbegin();
if (!is_empty) {
assert(*i2 == *i);
}
}
}

// Validate view_interface::cbegin (const)
STATIC_ASSERT(CanMemberCBegin<const R> == ranges::range<const V>);
if constexpr (CanMemberCBegin<const R>) {
const same_as<const_iterator_t<const R>> auto ci = as_const(r).cbegin();
if (!is_empty) {
assert(*ci == *cbegin(expected));
}

if constexpr (copy_constructible<V>) {
const auto cr2 = r;
const same_as<const_iterator_t<const R>> auto ci2 = cr2.cbegin();
if (!is_empty) {
assert(*ci2 == *ci);
}
}
}

// Validate view_interface::cend
STATIC_ASSERT(CanMemberCEnd<R>);
{
const same_as<const_sentinel_t<R>> auto s = r.cend();
assert((r.cbegin() == s) == is_empty);
STATIC_ASSERT(common_range<R> == (common_range<V> && (sized_range<V> || !bidirectional_range<V>) ));
if constexpr (common_range<R> && bidirectional_range<V>) {
if (!is_empty) {
assert(*prev(s) == *prev(cend(expected)));
}

if constexpr (copy_constructible<V>) {
auto r2 = r;
if (!is_empty) {
assert(*prev(r2.cend()) == *prev(cend(expected)));
}
}
}

if constexpr (!common_range<R>) {
STATIC_ASSERT(same_as<const_sentinel_t<R>, default_sentinel_t>);
}
}

// Validate view_interface::cend (const)
STATIC_ASSERT(CanMemberCEnd<const R> == ranges::range<const V>);
if constexpr (CanMemberCEnd<const R>) {
const same_as<const_sentinel_t<const R>> auto cs = as_const(r).cend();
assert((as_const(r).cbegin() == cs) == is_empty);
STATIC_ASSERT(common_range<const R>
== (common_range<const V> && (sized_range<const V> || !bidirectional_range<const V>) ));
if constexpr (common_range<const R> && bidirectional_range<const V>) {
if (!is_empty) {
assert(*prev(cs) == *prev(cend(expected)));
}

if constexpr (copy_constructible<V>) {
const auto r2 = r;
if (!is_empty) {
assert(*prev(r2.cend()) == *prev(cend(expected)));
}
}
}

if constexpr (!common_range<const R>) {
STATIC_ASSERT(same_as<const_sentinel_t<const R>, default_sentinel_t>);
}
}

// Validate view_interface::data
STATIC_ASSERT(!CanData<R>);
STATIC_ASSERT(!CanData<const R>);
Expand Down
81 changes: 78 additions & 3 deletions tests/std/tests/P2278R4_views_as_const/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ constexpr bool CanReconstructRefView<ranges::ref_view<T>> = ranges::constant_ran

template <ranges::input_range Rng, class Expected>
constexpr bool test_one(Rng&& rng, Expected&& expected) {
using ranges::ref_view, ranges::as_const_view, ranges::begin, ranges::end, ranges::iterator_t, ranges::sentinel_t,
ranges::prev, ranges::forward_range, ranges::bidirectional_range, ranges::random_access_range,
ranges::contiguous_range, ranges::common_range, ranges::sized_range, ranges::constant_range;
using ranges::ref_view, ranges::as_const_view, ranges::begin, ranges::end, ranges::cbegin, ranges::cend,
ranges::iterator_t, ranges::sentinel_t, ranges::const_iterator_t, ranges::const_sentinel_t, ranges::prev,
ranges::forward_range, ranges::bidirectional_range, ranges::random_access_range, ranges::contiguous_range,
ranges::common_range, ranges::sized_range, ranges::constant_range;

using V = views::all_t<Rng>;
using R = as_const_view<V>;
Expand Down Expand Up @@ -414,6 +415,80 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
}
}

// Validate view_interface::cbegin
STATIC_ASSERT(CanMemberCBegin<R>);
{
const same_as<const_iterator_t<R>> auto i = r.cbegin();
if (!is_empty) {
assert(*i == *cbegin(expected));
}

if constexpr (copy_constructible<V>) {
auto r2 = r;
const same_as<const_iterator_t<R>> auto i2 = r2.cbegin();
if (!is_empty) {
assert(*i2 == *i);
}
}
}

// Validate view_interface::cbegin (const)
STATIC_ASSERT(CanMemberCBegin<const R> == ranges::range<const V>);
if constexpr (CanMemberCBegin<const R>) {
const same_as<const_iterator_t<const R>> auto ci = as_const(r).cbegin();
if (!is_empty) {
assert(*ci == *cbegin(expected));
}

if constexpr (copy_constructible<V>) {
const auto cr2 = r;
const same_as<const_iterator_t<const R>> auto ci2 = cr2.cbegin();
if (!is_empty) {
assert(*ci2 == *ci);
}
}
}

// Validate view_interface::cend
STATIC_ASSERT(CanMemberCEnd<R>);
{
const same_as<const_sentinel_t<R>> auto s = r.cend();
assert((r.cbegin() == s) == is_empty);
STATIC_ASSERT(common_range<R> == common_range<V>);
if constexpr (common_range<R> && bidirectional_range<V>) {
if (!is_empty) {
assert(*prev(s) == *prev(cend(expected)));
}

if constexpr (copy_constructible<V>) {
auto r2 = r;
if (!is_empty) {
assert(*prev(r2.cend()) == *prev(cend(expected)));
}
}
}
}

// Validate view_interface::cend (const)
STATIC_ASSERT(CanMemberCEnd<const R> == ranges::range<const V>);
if constexpr (CanMemberCEnd<const R>) {
const same_as<const_sentinel_t<const R>> auto cs = as_const(r).cend();
assert((as_const(r).cbegin() == cs) == is_empty);
STATIC_ASSERT(common_range<const R> == common_range<const V>);
if constexpr (common_range<const R> && bidirectional_range<const V>) {
if (!is_empty) {
assert(*prev(cs) == *prev(cend(expected)));
}

if constexpr (copy_constructible<V>) {
const auto r2 = r;
if (!is_empty) {
assert(*prev(r2.cend()) == *prev(cend(expected)));
}
}
}
}

// Validate view_interface::data
STATIC_ASSERT(CanMemberData<R> == contiguous_range<R>);
STATIC_ASSERT(CanData<R&> == contiguous_range<R>);
Expand Down
31 changes: 31 additions & 0 deletions tests/std/tests/P2321R2_views_zip/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,35 @@ constexpr bool test_one(TestContainerType& test_container, RangeTypes&&... rngs)
assert(end == as_const(zipped_range).end());
}

// Validate view_interface::cbegin()
STATIC_ASSERT(CanMemberCBegin<ZipType>);
{
const same_as<ranges::const_iterator_t<ZipType>> auto itr = zipped_range.cbegin();
assert(do_tuples_reference_same_objects(*itr, tuple_element_arr[0]));
}

STATIC_ASSERT(CanMemberCBegin<const ZipType> == (ranges::range<const AllView<RangeTypes>> && ...));
if constexpr (CanMemberCBegin<const ZipType>) {
assert(do_tuples_reference_same_objects(*(as_const(zipped_range).cbegin()), const_tuple_element_arr[0]));
}

// Validate view_interface::cend()
STATIC_ASSERT(CanMemberCEnd<ZipType>);
if constexpr (equality_comparable<ranges::const_iterator_t<ZipType>>) {
auto end = zipped_range.cbegin();
ranges::advance(end, TestContainerType::smallest_array_size);

assert(end == zipped_range.cend());
}

STATIC_ASSERT(CanMemberCEnd<const ZipType> == (ranges::range<const AllView<RangeTypes>> && ...));
if constexpr (CanMemberCEnd<const ZipType> && equality_comparable<ranges::const_iterator_t<const ZipType>>) {
auto end = as_const(zipped_range).cbegin();
ranges::advance(end, TestContainerType::smallest_array_size);

assert(end == as_const(zipped_range).cend());
}

const auto validate_iterators_lambda = []<class LocalZipType, class ArrayType, class... LocalRangeTypes>(
LocalZipType& relevant_range,
const ArrayType& relevant_tuple_element_arr) {
Expand Down Expand Up @@ -740,13 +769,15 @@ constexpr bool instantiation_test_for_category() {

using test::Sized, test::Common, test::CanDifference;

#ifndef _PREFAST_ // TRANSITION, GH-1030
InstantiatorType<Category, Sized::no, Common::no, CanDifference::no>::call();
InstantiatorType<Category, Sized::no, Common::no, CanDifference::yes>::call();
InstantiatorType<Category, Sized::no, Common::yes, CanDifference::no>::call();
InstantiatorType<Category, Sized::no, Common::yes, CanDifference::yes>::call();
InstantiatorType<Category, Sized::yes, Common::no, CanDifference::no>::call();
InstantiatorType<Category, Sized::yes, Common::no, CanDifference::yes>::call();
InstantiatorType<Category, Sized::yes, Common::yes, CanDifference::no>::call();
#endif // TRANSITION, GH-1030
InstantiatorType<Category, Sized::yes, Common::yes, CanDifference::yes>::call();

return true;
Expand Down