Skip to content

[libc++] views::split and views::lazy_split shouldn't be range adaptor closures #75266

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

Merged
StephanTLavavej merged 2 commits into from
Dec 13, 2023
Merged

[libc++] views::split and views::lazy_split shouldn't be range adaptor closures #75266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ecbea4
Fix range.split/adaptor.pass.cpp; only views::split('x') can be piped.
StephanTLavavej Dec 8, 2023
97c2cce
Fix product code, add regression test.
StephanTLavavej Dec 13, 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
2 changes: 1 addition & 1 deletion libcxx/include/__ranges/lazy_split_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ lazy_split_view(_Range&&, range_value_t<_Range>)

namespace views {
namespace __lazy_split_view {
struct __fn : __range_adaptor_closure<__fn> {
struct __fn {
template <class _Range, class _Pattern>
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI
constexpr auto operator()(_Range&& __range, _Pattern&& __pattern) const
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__ranges/split_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ struct split_view<_View, _Pattern>::__sentinel {

namespace views {
namespace __split_view {
struct __fn : __range_adaptor_closure<__fn> {
struct __fn {
// clang-format off
template <class _Range, class _Pattern>
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
Expand Down
14 changes: 10 additions & 4 deletions libcxx/test/std/ranges/range.adaptors/range.lazy.split/adaptor.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@ static_assert(!std::is_invocable_v<decltype(std::views::lazy_split), SomeView, N
static_assert(!std::is_invocable_v<decltype(std::views::lazy_split), NotAView, SomeView>);
static_assert( std::is_invocable_v<decltype(std::views::lazy_split), SomeView, SomeView>);

static_assert( CanBePiped<SomeView&, decltype(std::views::lazy_split)>);
static_assert( CanBePiped<char(&)[10], decltype(std::views::lazy_split)>);
static_assert(!CanBePiped<char(&&)[10], decltype(std::views::lazy_split)>);
static_assert(!CanBePiped<NotAView, decltype(std::views::lazy_split)>);
// Regression test for #75002, views::lazy_split shouldn't be a range adaptor closure
static_assert(!CanBePiped<SomeView&, decltype(std::views::lazy_split)>);
static_assert(!CanBePiped<char (&)[10], decltype(std::views::lazy_split)>);
static_assert(!CanBePiped<char (&&)[10], decltype(std::views::lazy_split)>);
static_assert(!CanBePiped<NotAView, decltype(std::views::lazy_split)>);

static_assert(CanBePiped<SomeView&, decltype(std::views::lazy_split('x'))>);
static_assert(CanBePiped<char (&)[10], decltype(std::views::lazy_split('x'))>);
static_assert(!CanBePiped<char (&&)[10], decltype(std::views::lazy_split('x'))>);
static_assert(!CanBePiped<NotAView, decltype(std::views::lazy_split('x'))>);

static_assert(std::same_as<decltype(std::views::lazy_split), decltype(std::ranges::views::lazy_split)>);

Expand Down
14 changes: 10 additions & 4 deletions libcxx/test/std/ranges/range.adaptors/range.split/adaptor.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@ static_assert(!std::is_invocable_v<decltype(std::views::split), SomeView, NotAVi
static_assert(!std::is_invocable_v<decltype(std::views::split), NotAView, SomeView>);
static_assert( std::is_invocable_v<decltype(std::views::split), SomeView, SomeView>);

static_assert( CanBePiped<SomeView&, decltype(std::views::split)>);
static_assert( CanBePiped<char(&)[10], decltype(std::views::split)>);
static_assert(!CanBePiped<char(&&)[10], decltype(std::views::split)>);
static_assert(!CanBePiped<NotAView, decltype(std::views::split)>);
// Regression test for #75002, views::split shouldn't be a range adaptor closure
static_assert(!CanBePiped<SomeView&, decltype(std::views::split)>);
static_assert(!CanBePiped<char (&)[10], decltype(std::views::split)>);
static_assert(!CanBePiped<char (&&)[10], decltype(std::views::split)>);
static_assert(!CanBePiped<NotAView, decltype(std::views::split)>);

static_assert(CanBePiped<SomeView&, decltype(std::views::split('x'))>);
static_assert(CanBePiped<char (&)[10], decltype(std::views::split('x'))>);
static_assert(!CanBePiped<char (&&)[10], decltype(std::views::split('x'))>);
static_assert(!CanBePiped<NotAView, decltype(std::views::split('x'))>);

static_assert(std::same_as<decltype(std::views::split), decltype(std::ranges::views::split)>);

Expand Down