From 120e873484f20d9a0b8400e2e464ac5b2088a747 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 24 Feb 2020 13:11:31 +0000 Subject: [PATCH] libstdc++: Add default_sentinel support to stream iterators Missing pieces of P0896R4 "The One Ranges Proposal" for C++20. * include/bits/stream_iterator.h (istream_iterator(default_sentinel_t)): Add constructor. (operator==(istream_iterator, default_sentinel_t)): Add operator. (ostream_iterator::difference_type): Define to ptrdiff_t for C++20. * include/bits/streambuf_iterator.h (istreambuf_iterator(default_sentinel_t)): Add constructor. (operator==(istreambuf_iterator, default_sentinel_t)): Add operator. * testsuite/24_iterators/istream_iterator/cons/sentinel.cc: New test. * testsuite/24_iterators/istream_iterator/sentinel.cc: New test. * testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc: New test. * testsuite/24_iterators/istreambuf_iterator/sentinel.cc: New test. --- libstdc++-v3/ChangeLog | 14 +++++ libstdc++-v3/include/bits/stream_iterator.h | 15 +++++ .../include/bits/streambuf_iterator.h | 11 ++++ .../istream_iterator/cons/sentinel.cc | 27 +++++++++ .../24_iterators/istream_iterator/sentinel.cc | 57 +++++++++++++++++++ .../istreambuf_iterator/cons/sentinel.cc | 26 +++++++++ 6 files changed, 150 insertions(+) create mode 100644 libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc create mode 100644 libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc create mode 100644 libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 457afdbadc8..e18f9d07360 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,19 @@ 2020-02-24 Jonathan Wakely + * include/bits/stream_iterator.h (istream_iterator(default_sentinel_t)): + Add constructor. + (operator==(istream_iterator, default_sentinel_t)): Add operator. + (ostream_iterator::difference_type): Define to ptrdiff_t for C++20. + * include/bits/streambuf_iterator.h + (istreambuf_iterator(default_sentinel_t)): Add constructor. + (operator==(istreambuf_iterator, default_sentinel_t)): Add operator. + * testsuite/24_iterators/istream_iterator/cons/sentinel.cc: + New test. + * testsuite/24_iterators/istream_iterator/sentinel.cc: New test. + * testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc: + New test. + * testsuite/24_iterators/istreambuf_iterator/sentinel.cc: New test. + * include/std/ranges (__deep_const_range, __enable_view_impl): Remove. (ranges::enable_view): Simplify (LWG 3326). * include/bits/range_access.h (ranges::enable_view): Declare. diff --git a/libstdc++-v3/include/bits/stream_iterator.h b/libstdc++-v3/include/bits/stream_iterator.h index 345a4d84e25..1ddf647f729 100644 --- a/libstdc++-v3/include/bits/stream_iterator.h +++ b/libstdc++-v3/include/bits/stream_iterator.h @@ -77,6 +77,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_ok(__obj._M_ok) { } +#if __cplusplus > 201703L + constexpr + istream_iterator(default_sentinel_t) noexcept + : istream_iterator() { } +#endif + #if __cplusplus >= 201103L istream_iterator& operator=(const istream_iterator&) = default; ~istream_iterator() = default; @@ -145,6 +151,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION friend bool operator!=(const istream_iterator& __x, const istream_iterator& __y) { return !__x._M_equal(__y); } + +#if __cplusplus > 201703L + friend bool + operator==(const istream_iterator& __i, default_sentinel_t) + { return !__i._M_stream; } +#endif }; /** @@ -166,6 +178,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: //@{ /// Public typedef +#if __cplusplus > 201703L + using difference_type = ptrdiff_t; +#endif typedef _CharT char_type; typedef _Traits traits_type; typedef basic_ostream<_CharT, _Traits> ostream_type; diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index fe612f39fe9..fc06c50040c 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -115,6 +115,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_CONSTEXPR istreambuf_iterator() _GLIBCXX_USE_NOEXCEPT : _M_sbuf(0), _M_c(traits_type::eof()) { } +#if __cplusplus > 201703L + constexpr istreambuf_iterator(default_sentinel_t) noexcept + : istreambuf_iterator() { } +#endif + #if __cplusplus >= 201103L istreambuf_iterator(const istreambuf_iterator&) noexcept = default; @@ -209,6 +214,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const int_type __eof = traits_type::eof(); return traits_type::eq_int_type(__c, __eof); } + +#if __cplusplus > 201703L + friend bool + operator==(const istreambuf_iterator& __i, default_sentinel_t __s) + { return __i._M_at_eof(); } +#endif }; template diff --git a/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc new file mode 100644 index 00000000000..77a19498817 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +// C++20 doesn't require this to be non-throwing. +static_assert( std::is_nothrow_constructible_v, + std::default_sentinel_t> ); + +constexpr std::istream_iterator i = std::default_sentinel; diff --git a/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc new file mode 100644 index 00000000000..ec0c7db56fd --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +void +test01() +{ + static_assert( std::sentinel_for> ); + static_assert( std::sentinel_for> ); + + std::istream_iterator i = std::default_sentinel; + VERIFY( i == std::default_sentinel ); + VERIFY( std::default_sentinel == i ); +} + +void +test02() +{ + std::istringstream in("1 2 3"); + std::istream_iterator iter(in); + VERIFY( iter != std::default_sentinel ); + VERIFY( std::default_sentinel != iter ); + + *iter++; + *iter++; + *iter++; + VERIFY( iter == std::default_sentinel ); + VERIFY( std::default_sentinel == iter ); +} + +int main() +{ + test01(); + test02(); +} diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc new file mode 100644 index 00000000000..0b05fb532e5 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc @@ -0,0 +1,26 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +static_assert( std::is_nothrow_constructible_v, + std::default_sentinel_t> ); + +constexpr std::istreambuf_iterator i = std::default_sentinel; -- 2.30.2