Commit 4512b7d8 by Patrick Palka

libstdc++: Add a test that takes the split_view of a non-forward range

This adds a tests that verifies taking the split_view of a non-forward range
works correctly.  Doing so revealed a typo in one of _OuterIter's constructors.

It also revealed that the default constructor of
__gnu_test::test_range::iterator misbehaves, because by delegating to
Iter<T>(nullptr, nullptr) we perform a null-pointer deref at runtime in
input_iterator_wrapper's constructor due to the ITERATOR_VERIFY check therein.
Instead of delegating to this constructor it seems we can just inherit the
protected default constructor, which does not contain this ITERATOR_VERIFY
check.

libstdc++-v3/ChangeLog:

	* include/std/ranges (split_view::_OuterIter::_OuterIter): Typo fix,
	'address' -> 'std::__addressof'.
	* testsuite/std/ranges/adaptors/split.cc: Test taking the split_view of
	a non-forward input_range.
	* testsuite/util/testsuite_iterators.h (output_iterator_wrapper): Make
	default constructor protected instead of deleted, like with
	input_iterator_wrapper.
	(test_range::iterator): Add comment explaining that this type is used
	only when the underlying wrapper is input_iterator_wrapper or
	output_iterator_wrapper.  Remove delegating defaulted constructor so
	that the inherited default constructor is used instead.
parent 1c43ee69
2020-03-11 Patrick Palka <ppalka@redhat.com> 2020-03-11 Patrick Palka <ppalka@redhat.com>
* include/std/ranges (split_view::_OuterIter::_OuterIter): Typo fix,
'address' -> 'std::__addressof'.
* testsuite/std/ranges/adaptors/split.cc: Test taking the split_view of
a non-forward input_range.
* testsuite/util/testsuite_iterators.h (output_iterator_wrapper): Make
default constructor protected instead of deleted, like with
input_iterator_wrapper.
(test_range::iterator): Add comment explaining that this type is used
only when the underlying wrapper is input_iterator_wrapper or
output_iterator_wrapper. Remove delegating defaulted constructor so
that the inherited default constructor is used instead.
LWG 3286 ranges::size is not required to be valid after a call to LWG 3286 ranges::size is not required to be valid after a call to
ranges::begin on an input range ranges::begin on an input range
* include/std/ranges (subrange::subrange): Split single-argument * include/std/ranges (subrange::subrange): Split single-argument
......
...@@ -2785,7 +2785,7 @@ namespace views ...@@ -2785,7 +2785,7 @@ namespace views
constexpr explicit constexpr explicit
_OuterIter(_Parent& __parent) requires (!forward_range<_Base>) _OuterIter(_Parent& __parent) requires (!forward_range<_Base>)
: _M_parent(address(__parent)) : _M_parent(std::__addressof(__parent))
{ } { }
constexpr constexpr
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
using __gnu_test::test_range; using __gnu_test::test_range;
using __gnu_test::forward_iterator_wrapper; using __gnu_test::forward_iterator_wrapper;
using __gnu_test::input_iterator_wrapper;
namespace ranges = std::ranges; namespace ranges = std::ranges;
namespace views = std::ranges::views; namespace views = std::ranges::views;
...@@ -133,6 +134,24 @@ test07() ...@@ -133,6 +134,24 @@ test07()
static_assert( noexcept(iter_swap(b, b2)) ); static_assert( noexcept(iter_swap(b, b2)) );
} }
void
test08()
{
char x[] = "the quick brown fox";
test_range<char, input_iterator_wrapper> rx(x, x+sizeof(x)-1);
auto v = rx | views::split(' ');
auto i = v.begin();
VERIFY( ranges::equal(*i, "the"sv) );
++i;
VERIFY( ranges::equal(*i, "quick"sv) );
++i;
VERIFY( ranges::equal(*i, "brown"sv) );
++i;
VERIFY( ranges::equal(*i, "fox"sv) );
++i;
VERIFY( i == v.end() );
}
int int
main() main()
{ {
...@@ -143,4 +162,5 @@ main() ...@@ -143,4 +162,5 @@ main()
test05(); test05();
test06(); test06();
test07(); test07();
test08();
} }
...@@ -124,6 +124,11 @@ namespace __gnu_test ...@@ -124,6 +124,11 @@ namespace __gnu_test
struct output_iterator_wrapper struct output_iterator_wrapper
: public std::iterator<std::output_iterator_tag, T, std::ptrdiff_t, T*, T&> : public std::iterator<std::output_iterator_tag, T, std::ptrdiff_t, T*, T&>
{ {
protected:
output_iterator_wrapper() : ptr(0), SharedInfo(0)
{ }
public:
typedef OutputContainer<T> ContainerType; typedef OutputContainer<T> ContainerType;
T* ptr; T* ptr;
ContainerType* SharedInfo; ContainerType* SharedInfo;
...@@ -135,8 +140,6 @@ namespace __gnu_test ...@@ -135,8 +140,6 @@ namespace __gnu_test
} }
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
output_iterator_wrapper() = delete;
output_iterator_wrapper(const output_iterator_wrapper&) = default; output_iterator_wrapper(const output_iterator_wrapper&) = default;
output_iterator_wrapper& output_iterator_wrapper&
...@@ -706,13 +709,14 @@ namespace __gnu_test ...@@ -706,13 +709,14 @@ namespace __gnu_test
template<typename T, template<typename> class Iter> template<typename T, template<typename> class Iter>
class test_range class test_range
{ {
// Adds default constructor to Iter<T> if needed // Exposes the protected default constructor of Iter<T> if needed. This
// is needed only when Iter is input_iterator_wrapper or
// output_iterator_wrapper, because legacy forward iterators and beyond
// are already default constructible.
struct iterator : Iter<T> struct iterator : Iter<T>
{ {
using Iter<T>::Iter; using Iter<T>::Iter;
iterator() : Iter<T>(nullptr, nullptr) { }
using Iter<T>::operator++; using Iter<T>::operator++;
iterator& operator++() { Iter<T>::operator++(); return *this; } iterator& operator++() { Iter<T>::operator++(); return *this; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment