From: "François Dumont" <frs.dumont@gmail.com>
To: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org>,
gcc-patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] Implement std::advance for istreambuf_iterator using pubseekoff
Date: Tue, 15 Oct 2019 20:31:00 -0000 [thread overview]
Message-ID: <00a8f27e-cc72-9852-45b3-1a1082d25ea2@gmail.com> (raw)
In-Reply-To: <5531cf67-62b3-a4bc-c611-0fe026b75066@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
Here is an update to set _M_sbuf to null if the user advance too much.
Note that in this case the streambuf remains un-modified which is
different from the current implementation. I think it is another
enhancement.
I also change the Debug assertion message for something more dedicated
to std::advance algo.
François
On 10/14/19 10:12 PM, François Dumont wrote:
> The same way I proposed to review std::copy overload for
> istreambuf_iterator we can implement std::advance using pubseekoff.
>
> It is both a cleaner implementation and avoids yet another friend
> declaration.
>
>
> Â Â Â * include/std/streambuf
> Â Â Â (advance(istreambuf_iterator<>&, _Distance)): Remove friend
> declaration.
> Â Â Â * include/bits/streambuf_iterator.h (__copy_move_a2): Re-implement
> using
> Â Â Â streambuf pubseekoff.
>
> Tested under Linux x86_64.
>
> Ok to commit ?
>
> François
>
[-- Attachment #2: istreambuf_ite_advance.patch --]
[-- Type: text/x-patch, Size: 4445 bytes --]
diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h
index 134b3486b9a..17dd3972d45 100644
--- a/libstdc++-v3/include/bits/streambuf_iterator.h
+++ b/libstdc++-v3/include/bits/streambuf_iterator.h
@@ -431,37 +431,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__glibcxx_assert(__n > 0);
__glibcxx_requires_cond(!__i._M_at_eof(),
- _M_message(__gnu_debug::__msg_inc_istreambuf)
- ._M_iterator(__i));
-
- typedef istreambuf_iterator<_CharT> __is_iterator_type;
- typedef typename __is_iterator_type::traits_type traits_type;
- typedef typename __is_iterator_type::streambuf_type streambuf_type;
- typedef typename traits_type::int_type int_type;
- const int_type __eof = traits_type::eof();
-
- streambuf_type* __sb = __i._M_sbuf;
- while (__n > 0)
- {
- streamsize __size = __sb->egptr() - __sb->gptr();
- if (__size > __n)
+ _M_message(__gnu_debug::__msg_advance_oob)
+ ._M_iterator(__i)
+ ._M_integer(__n));
+
+ typedef basic_streambuf<_CharT> __streambuf_t;
+ typedef typename __streambuf_t::pos_type __pos_t;
+ __pos_t __cur_pos
+ = __i._M_sbuf->pubseekoff(0, ios_base::cur, ios_base::in);
+ __pos_t __new_pos
+ = __i._M_sbuf->pubseekoff(__n, ios_base::cur, ios_base::in);
+ __i._M_c = char_traits<_CharT>::eof();
+
+ if (__new_pos - __cur_pos != __n)
{
- __sb->__safe_gbump(__n);
- break;
- }
-
- __sb->__safe_gbump(__size);
- __n -= __size;
- if (traits_type::eq_int_type(__sb->underflow(), __eof))
- {
- __glibcxx_requires_cond(__n == 0,
- _M_message(__gnu_debug::__msg_inc_istreambuf)
- ._M_iterator(__i));
- break;
- }
+ __i._M_sbuf = 0;
+ __glibcxx_requires_cond(!__i._M_at_eof(),
+ _M_message(__gnu_debug::__msg_advance_oob)
+ ._M_iterator(__i)
+ ._M_integer(__n));
}
-
- __i._M_c = __eof;
}
// @} group iterators
diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf
index 3442f19bd78..ef03da39bc2 100644
--- a/libstdc++-v3/include/std/streambuf
+++ b/libstdc++-v3/include/std/streambuf
@@ -155,11 +155,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
find(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
const _CharT2&);
- template<typename _CharT2, typename _Distance>
- friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
- void>::__type
- advance(istreambuf_iterator<_CharT2>&, _Distance);
-
template<typename _CharT2, typename _Traits2>
friend basic_istream<_CharT2, _Traits2>&
operator>>(basic_istream<_CharT2, _Traits2>&, _CharT2*);
diff --git a/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/3.cc b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/3.cc
new file mode 100644
index 00000000000..8763e7fa78e
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/advance/istreambuf_iterators/char/3.cc
@@ -0,0 +1,49 @@
+// Copyright (C) 2017-2019 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
+// <http://www.gnu.org/licenses/>.
+
+// Debug mode would detect the invalid std::advance call.
+// { dg-require-normal-mode "" }
+
+#include <iterator>
+#include <sstream>
+#include <algorithm>
+
+#include <testsuite_hooks.h>
+
+void test01()
+{
+ using namespace std;
+
+ typedef istreambuf_iterator<char> in_iterator_type;
+
+ const char data1[] = "Drei Phantasien nach Friedrich Holderlin";
+ istringstream iss1(data1);
+ in_iterator_type beg1(iss1);
+ in_iterator_type end1;
+
+ VERIFY( beg1 != end1 );
+
+ advance(beg1, sizeof(data1));
+
+ VERIFY( beg1 == end1 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
next prev parent reply other threads:[~2019-10-15 20:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 20:13 François Dumont
2019-10-15 20:31 ` François Dumont [this message]
2023-03-31 21:03 ` Jonathan Wakely
2023-04-24 17:24 ` François Dumont
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=00a8f27e-cc72-9852-45b3-1a1082d25ea2@gmail.com \
--to=frs.dumont@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).