This is an archive of the discontinued LLVM Phabricator instance.

Differential D150735

[libc++] Improve ranges::starts_with
ClosedPublic

Authored by ZijunZhao on May 16 2023, 3:51 PM.

Details

Reviewers
philnik
ldionne
Group Reviewers
Restricted Project
Summary

Fix some nits in https://reviews.llvm.org/D150146

Diff Detail

Event Timeline

ZijunZhao created this revision.May 16 2023, 3:51 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 16 2023, 3:51 PM
ZijunZhao requested review of this revision.May 16 2023, 3:51 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 16 2023, 3:51 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ZijunZhao added reviewers: philnik, ldionne.May 16 2023, 3:52 PM
philnik accepted this revision.May 16 2023, 3:53 PM

LGTM with green CI.

This revision is now accepted and ready to land.May 16 2023, 3:53 PM
Harbormaster completed remote builds in B232452: Diff 522822.May 16 2023, 7:18 PM
ldionne accepted this revision.May 17 2023, 6:34 AM
ZijunZhao closed this revision.May 17 2023, 11:23 AM

Submit: https://github.com/llvm/llvm-project/commit/f9f1f9c2a533d5caa3ddf813ebbd16fe3a13fce7

Revision Contents

PathSize
libcxx/
test/
std/
algorithms/
alg.nonmodifying/
alg.starts_with/
44 lines

Diff 522822

libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
static_assert(!HasStartsWithR<ForwardRangeNotSentinelSemiregular>); static_assert(!HasStartsWithR<ForwardRangeNotSentinelSemiregular>);
static_assert(!HasStartsWithR<ForwardRangeNotSentinelEqualityComparableWith>); static_assert(!HasStartsWithR<ForwardRangeNotSentinelEqualityComparableWith>);
static_assert(!HasStartsWithR<UncheckedRange<int*>, UncheckedRange<int**>>); // not indirectly comparable static_assert(!HasStartsWithR<UncheckedRange<int*>, UncheckedRange<int**>>); // not indirectly comparable
static_assert(HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotDerivedFrom>); static_assert(HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotDerivedFrom>);
static_assert(HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotIncrementable>); static_assert(HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotIncrementable>);
static_assert(!HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotSentinelSemiregular>); static_assert(!HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotSentinelSemiregular>);
static_assert(!HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotSentinelEqualityComparableWith>); static_assert(!HasStartsWithR<UncheckedRange<int*>, ForwardRangeNotSentinelEqualityComparableWith>);
// clang-format off
template <class Iter1, class Sent1 = Iter1, class Iter2, class Sent2 = Iter2> template <class Iter1, class Sent1 = Iter1, class Iter2, class Sent2 = Iter2>
constexpr void test_iterators() { constexpr void test_iterators() {
// simple tests { // simple tests
{
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2}; int p[] = {1, 2};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 2))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 2)));
assert(ret); assert(ret);
} }
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2}; int p[] = {1, 2};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 2))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 2)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(ret); assert(ret);
} }
} }
// prefix doesn't match { // prefix doesn't match
{
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {4, 5, 6}; int p[] = {4, 5, 6};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 3))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 3)));
assert(!ret); assert(!ret);
} }
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {4, 5, 6}; int p[] = {4, 5, 6};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 3))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 3)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(!ret); assert(!ret);
} }
} }
// range and prefix are identical { // range and prefix are identical
{
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2, 3, 4, 5, 6}; int p[] = {1, 2, 3, 4, 5, 6};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 6))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 6)));
assert(ret); assert(ret);
} }
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2, 3, 4, 5, 6}; int p[] = {1, 2, 3, 4, 5, 6};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 6))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 6)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(ret); assert(ret);
} }
} }
// prefix is longer than range { // prefix is longer than range
{
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2, 3, 4, 5, 6, 7, 8}; int p[] = {1, 2, 3, 4, 5, 6, 7, 8};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 8))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 8)));
assert(!ret); assert(!ret);
} }
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {1, 2, 3, 4, 5, 6, 7, 8}; int p[] = {1, 2, 3, 4, 5, 6, 7, 8};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 8))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 8)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(!ret); assert(!ret);
} }
} }
// prefix has zero length { // prefix has zero length
{
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {}; int p[] = {};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p)));
assert(ret); assert(ret);
} }
{ {
int a[] = {1, 2, 3, 4, 5, 6}; int a[] = {1, 2, 3, 4, 5, 6};
int p[] = {}; int p[] = {};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(ret); assert(ret);
} }
} }
// range has zero length { // range has zero length
{
{ {
int a[] = {}; int a[] = {};
int p[] = {1, 2, 3, 4, 5, 6, 7, 8}; int p[] = {1, 2, 3, 4, 5, 6, 7, 8};
std::same_as<bool> decltype(auto) ret = std::same_as<bool> decltype(auto) ret =
std::ranges::starts_with(Iter1(a), Sent1(Iter1(a)), Iter2(p), Sent2(Iter2(p + 8))); std::ranges::starts_with(Iter1(a), Sent1(Iter1(a)), Iter2(p), Sent2(Iter2(p + 8)));
assert(!ret); assert(!ret);
} }
{ {
int a[] = {}; int a[] = {};
int p[] = {1, 2, 3, 4, 5, 6, 7, 8}; int p[] = {1, 2, 3, 4, 5, 6, 7, 8};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 8))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 8)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix);
assert(!ret); assert(!ret);
} }
} }
// check that the predicate is used { // check that the predicate is used
{
{ {
int a[] = {11, 8, 3, 4, 0, 6}; int a[] = {11, 8, 3, 4, 0, 6};
int p[] = {1, 12}; int p[] = {1, 12};
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with( std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(
Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 2)), [](int l, int r) { return l > r; }); Iter1(a), Sent1(Iter1(a + 6)), Iter2(p), Sent2(Iter2(p + 2)), [](int l, int r) { return l > r; });
assert(!ret); assert(!ret);
} }
{ {
int a[] = {11, 8, 3, 4, 0, 6}; int a[] = {11, 8, 3, 4, 0, 6};
int p[] = {1, 12}; int p[] = {1, 12};
auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6))); auto whole = std::ranges::subrange(Iter1(a), Sent1(Iter1(a + 6)));
auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 2))); auto prefix = std::ranges::subrange(Iter2(p), Sent2(Iter2(p + 2)));
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix, [](int l, int r) { return l > r; }); std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(whole, prefix, [](int l, int r) { return l > r; });
assert(!ret); assert(!ret);
} }
} }
// check that the projections are used { // check that the projections are used
{
{ {
int a[] = {1, 3, 5, 1, 5, 6}; int a[] = {1, 3, 5, 1, 5, 6};
int p[] = {2, 3, 4}; int p[] = {2, 3, 4};
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with( std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(
Iter1(a), Iter1(a),
Sent1(Iter1(a + 6)), Sent1(Iter1(a + 6)),
Iter2(p), Iter2(p),
Sent2(Iter2(p + 3)), Sent2(Iter2(p + 3)),
Show All 10 Linesconstexpr void test_iterators() {
std::same_as<bool> decltype(auto) ret = std::ranges::starts_with( std::same_as<bool> decltype(auto) ret = std::ranges::starts_with(
whole, prefix, {}, [](int i) { return i + 3; }, [](int i) { return i * 2; }); whole, prefix, {}, [](int i) { return i + 3; }, [](int i) { return i * 2; });
assert(ret); assert(ret);
} }
} }
} }
constexpr bool test() { constexpr bool test() {
types::for_each(types::forward_iterator_list<int*>{}, []<class I2>() { types::for_each(types::cpp20_input_iterator_list<int*>{}, []<class Iter2>() {
types::for_each(types::forward_iterator_list<int*>{}, []<class I1>() { types::for_each(types::cpp20_input_iterator_list<int*>{}, []<class Iter1>() {
test_iterators<I1, I1, I2, I2>(); if constexpr (std::forward_iterator<Iter1> && std::forward_iterator<Iter2>)
test_iterators<I1, sized_sentinel<I1>, I2, I2>(); test_iterators<Iter1, Iter1, Iter2, Iter2>();
test_iterators<I1, I1, I2, sized_sentinel<I2>>(); if constexpr (std::forward_iterator<Iter2>)
test_iterators<I1, sized_sentinel<I1>, I2, sized_sentinel<I2>>(); test_iterators<Iter1, sized_sentinel<Iter1>, Iter2, Iter2>();
if constexpr (std::forward_iterator<Iter1>)
test_iterators<Iter1, Iter1, Iter2, sized_sentinel<Iter2>>();
test_iterators<Iter1, sized_sentinel<Iter1>, Iter2, sized_sentinel<Iter2>>();
}); });
}); });
// check that std::invoke is used { // check that std::invoke is used
{
struct S { struct S {
int i; int i;
constexpr S identity() { return *this; } constexpr S identity() { return *this; }
constexpr bool compare(const S& s) { return i == s.i; } constexpr bool compare(const S& s) { return i == s.i; }
}; };
{ {
Show All 11 Linesconstexpr bool test() {
} }
return true; return true;
} }
int main(int, char**) { int main(int, char**) {
test(); test();
static_assert(test()); static_assert(test());
return 0; return 0;
} }