diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b47af2849be0..f0474b5ff73e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2003-04-23 Phil Edwards + + * docs/html/ext/howto.html ('LWG Issues'): Add issue 60, partial + implementation only. + * include/bits/istream.tcc (putback, unget, sync, tellg, seekg): + Comment and change to comply with DR 60 and the effect on gcount(). + * include/std/std_istream.h: Update comments. + * testsuite/27_io/basic_istream/putback/char/1.cc (test01): Add + comments about reasons for tests. Test sync() against gcount(). + * testsuite/27_io/basic_istream/seekg/char/2.cc: New file, test + for effect on gcount(). + * testsuite/27_io/basic_istream/tellg/char/2.cc: New file, test + for effect on gcount(). + 2003-04-22 Loren J. Rittle * testsuite/27_io/basic_filebuf/close/char/9964.cc (test_07): diff --git a/libstdc++-v3/docs/html/ext/howto.html b/libstdc++-v3/docs/html/ext/howto.html index 67bf2d316c54..d2fc51ca3a8e 100644 --- a/libstdc++-v3/docs/html/ext/howto.html +++ b/libstdc++-v3/docs/html/ext/howto.html @@ -464,6 +464,13 @@ "copying stream state" was deemed too complicated. +
60: + What is a formatted input function? +
+
This DR made many widespread changes to basic_istream, + not all of which have been implemented. +
+
68: Extractors for char* should store null at end
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 713c7bb6f878..17af6e028cd3 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -841,7 +841,10 @@ namespace std basic_istream<_CharT, _Traits>:: putback(char_type __c) { +#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +// 60. What is a formatted input function? _M_gcount = 0; +#endif sentry __cerb(*this, true); if (__cerb) { @@ -872,7 +875,10 @@ namespace std basic_istream<_CharT, _Traits>:: unget(void) { +#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +// 60. What is a formatted input function? _M_gcount = 0; +#endif sentry __cerb(*this, true); if (__cerb) { @@ -903,8 +909,8 @@ namespace std basic_istream<_CharT, _Traits>:: sync(void) { + // DR60. Do not change _M_gcount. int __ret = -1; - _M_gcount = 0; sentry __cerb(*this, true); if (__cerb) { @@ -948,7 +954,7 @@ namespace std basic_istream<_CharT, _Traits>:: seekg(pos_type __pos) { - _M_gcount = 0; + // DR60. Do not change _M_gcount. if (!this->fail()) { #ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS @@ -968,7 +974,7 @@ namespace std basic_istream<_CharT, _Traits>:: seekg(off_type __off, ios_base::seekdir __dir) { - _M_gcount = 0; + // DR60. Do not change _M_gcount. if (!this->fail()) { #ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h index 616fd8ab10fd..8559337de402 100644 --- a/libstdc++-v3/include/std/std_istream.h +++ b/libstdc++-v3/include/std/std_istream.h @@ -476,10 +476,6 @@ namespace std * * @note Since no characters are extracted, the next call to * @c gcount() will return 0, as required by DR 60. - * - * @if maint - * FIXME We don't comply with DR 60 here, _M_gcount is untouched. - * @endif */ __istream_type& putback(char_type __c); @@ -513,9 +509,6 @@ namespace std * @note This function does not count the number of characters * extracted, if any, and therefore does not affect the next * call to @c gcount(). - * @if maint - * FIXME We don't comply with DR 60 here, _M_gcount is zeroed. - * @endif */ int sync(); @@ -545,9 +538,6 @@ namespace std * @note This function does not count the number of characters * extracted, if any, and therefore does not affect the next * call to @c gcount(). - * @if maint - * FIXME We don't comply with DR 60 here, _M_gcount is zeroed. - * @endif */ __istream_type& seekg(pos_type); @@ -564,9 +554,6 @@ namespace std * @note This function does not count the number of characters * extracted, if any, and therefore does not affect the next * call to @c gcount(). - * @if maint - * FIXME We don't comply with DR 60 here, _M_gcount is zeroed. - * @endif */ __istream_type& seekg(off_type, ios_base::seekdir); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc index 17b55d8e9a01..0213e3dfac06 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc @@ -39,8 +39,9 @@ test01() std::stringbuf isbuf_03(str_02, std::ios_base::in); std::stringbuf isbuf_04(str_02, std::ios_base::in); + std::stringbuf isbuf_05(str_02, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(&isbuf_05); std::istream is_03(&isbuf_03); std::istream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; @@ -54,7 +55,7 @@ test01() is_04.clear(); state1 = is_04.rdstate(); is_04.putback('|'); - VERIFY( is_04.gcount() == 0 ); + VERIFY( is_04.gcount() == 0 ); // DR 60 state2 = is_04.rdstate(); VERIFY( state1 == state2 ); VERIFY( is_04.peek() == '|' ); @@ -63,13 +64,17 @@ test01() is_04.clear(); state1 = is_04.rdstate(); is_04.unget(); - VERIFY( is_04.gcount() == 0 ); + VERIFY( is_04.gcount() == 0 ); // DR 60 state2 = is_04.rdstate(); VERIFY( state1 == state2 ); VERIFY( is_04.peek() == 'r' ); // int sync() + is_00.ignore(10); + int count1 = is_00.gcount(); int i = is_00.sync(); + int count2 = is_00.gcount(); + VERIFY (count1 == count2 ); // DR 60 } int diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc new file mode 100644 index 000000000000..04078dbafeb8 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc @@ -0,0 +1,48 @@ +// 2003-04-22 pme + +// Copyright (C) 2003 Free Software Foundation +// +// 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.3 unformatted input functions +// DR 60 -- seekg does not effect calls to gcount + +#include +#include +#include + +void test01() +{ + using namespace std; + bool test = true; + + istringstream ist("the lamb lies down on broadway"); + ios::pos_type pos = ist.tellg(); + ist.ignore(4); + int count1 = ist.gcount(); + ist.seekg(pos); + int count2 = ist.gcount(); + ist.seekg(pos, ios::beg); + count2 = ist.gcount(); + VERIFY( count1 == count2 ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc new file mode 100644 index 000000000000..b9af611c0447 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc @@ -0,0 +1,45 @@ +// 2003-04-22 pme + +// Copyright (C) 2003 Free Software Foundation +// +// 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.3 unformatted input functions +// DR 60 -- tellg does not effect calls to gcount + +#include +#include +#include + +void test01() +{ + using namespace std; + bool test = true; + + istringstream ist("three sides live"); + ist.ignore(4); + int count1 = ist.gcount(); + ist.tellg(); + int count2 = ist.gcount(); + VERIFY( count1 == count2 ); +} + +int main() +{ + test01(); + return 0; +}