OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libstdc++/26211 + N3168

Browse Source 
2010-11-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/26211 + N3168
	* include/bits/istream.tcc (basic_istream<>::tellg, seekg(pos_type),
	seekg(off_type, ios_base::seekdir)): Construct a sentry.
	(basic_istream<>::tellg, seekg(pos_type), seekg(off_type,
	ios_base::seekdir, putback, unget)): Clear eofbit first, per N3168.  
	* testsuite/27_io/basic_istream/seekg/char/26211.cc: New.
	* testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/8348.cc: Tweak.
	* testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise.

From-SVN: r166911
This commit is contained in:
Paolo Carlini 2010-11-18 17:21:35 +00:00 committed by Paolo Carlini
parent 275853ab38
commit 2ca2a8990a
8 changed files with 309 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/26211 + N3168
* include/bits/istream.tcc (basic_istream<>::tellg, seekg(pos_type),
seekg(off_type, ios_base::seekdir)): Construct a sentry.
(basic_istream<>::tellg, seekg(pos_type), seekg(off_type,
ios_base::seekdir, putback, unget)): Clear eofbit first, per N3168.
* testsuite/27_io/basic_istream/seekg/char/26211.cc: New.
* testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/char/8348.cc: Tweak.
* testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise.
2010-11-18 H.J. Lu <hongjiu.lu@intel.com>
PR other/42670

118
libstdc++-v3/include/bits/istream.tcc
View File

@ -1,7 +1,7 @@
// istream classes -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
// 2006, 2007, 2008, 2009
// 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -713,6 +713,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 60. What is a formatted input function?
_M_gcount = 0;
// Clear eofbit per N3168.
this->clear(this->rdstate() & ~ios_base::eofbit);
sentry __cerb(*this, true);
if (__cerb)
{
@ -746,6 +748,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 60. What is a formatted input function?
_M_gcount = 0;
// Clear eofbit per N3168.
this->clear(this->rdstate() & ~ios_base::eofbit);
sentry __cerb(*this, true);
if (__cerb)
{
@ -815,19 +819,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// DR60. Do not change _M_gcount.
pos_type __ret = pos_type(-1);
__try
sentry __cerb(*this, true);
if (__cerb)
{
if (!this->fail())
__ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
ios_base::in);
__try
{
if (!this->fail())
__ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
ios_base::in);
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
return __ret;
}
@ -838,29 +846,35 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// DR60. Do not change _M_gcount.
ios_base::iostate __err = ios_base::goodbit;
__try
// Clear eofbit per N3168.
this->clear(this->rdstate() & ~ios_base::eofbit);
sentry __cerb(*this, true);
if (__cerb)
{
if (!this->fail())
ios_base::iostate __err = ios_base::goodbit;
__try
{
// 136. seekp, seekg setting wrong streams?
const pos_type __p = this->rdbuf()->pubseekpos(__pos,
ios_base::in);
// 129. Need error indication from seekp() and seekg()
if (__p == pos_type(off_type(-1)))
__err |= ios_base::failbit;
if (!this->fail())
{
// 136. seekp, seekg setting wrong streams?
const pos_type __p = this->rdbuf()->pubseekpos(__pos,
ios_base::in);
// 129. Need error indication from seekp() and seekg()
if (__p == pos_type(off_type(-1)))
__err |= ios_base::failbit;
}
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
if (__err)
this->setstate(__err);
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
if (__err)
this->setstate(__err);
return *this;
}
@ -871,29 +885,35 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// DR60. Do not change _M_gcount.
ios_base::iostate __err = ios_base::goodbit;
__try
// Clear eofbit per N3168.
this->clear(this->rdstate() & ~ios_base::eofbit);
sentry __cerb(*this, true);
if (__cerb)
{
if (!this->fail())
ios_base::iostate __err = ios_base::goodbit;
__try
{
// 136. seekp, seekg setting wrong streams?
const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
ios_base::in);
if (!this->fail())
{
// 136. seekp, seekg setting wrong streams?
const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
ios_base::in);
// 129. Need error indication from seekp() and seekg()
if (__p == pos_type(off_type(-1)))
__err |= ios_base::failbit;
// 129. Need error indication from seekp() and seekg()
if (__p == pos_type(off_type(-1)))
__err |= ios_base::failbit;
}
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
if (__err)
this->setstate(__err);
}
__catch(__cxxabiv1::__forced_unwind&)
{
this->_M_setstate(ios_base::badbit);
__throw_exception_again;
}
__catch(...)
{ this->_M_setstate(ios_base::badbit); }
if (__err)
this->setstate(__err);
return *this;
}

63
libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/26211.cc Normal file
View File

@ -0,0 +1,63 @@
// 2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2010 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 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/>.
#include <istream>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/26211
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
typedef istringstream::pos_type pos_type;
istringstream iss("Duos for Doris");
ostringstream oss;
const pos_type p0 = iss.tellg();
VERIFY( p0 == pos_type(0) );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
iss.seekg(0, ios_base::beg);
VERIFY( iss.good() );
iss.seekg(0, ios_base::beg);
VERIFY( !iss.fail() );
VERIFY( iss.tellg() == p0 );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
iss.seekg(p0);
VERIFY( iss.good() );
iss.seekg(p0);
VERIFY( !iss.fail() );
VERIFY( iss.tellg() == p0 );
}
int main()
{
test01();
return 0;
}

63
libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc Normal file
View File

@ -0,0 +1,63 @@
// 2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2010 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 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/>.
#include <istream>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/26211
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
typedef wistringstream::pos_type pos_type;
wistringstream iss(L"Duos for Doris");
wostringstream oss;
const pos_type p0 = iss.tellg();
VERIFY( p0 == pos_type(0) );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
iss.seekg(0, ios_base::beg);
VERIFY( iss.good() );
iss.seekg(0, ios_base::beg);
VERIFY( !iss.fail() );
VERIFY( iss.tellg() == p0 );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
iss.seekg(p0);
VERIFY( iss.good() );
iss.seekg(p0);
VERIFY( !iss.fail() );
VERIFY( iss.tellg() == p0 );
}
int main()
{
test01();
return 0;
}

49
libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/26211.cc Normal file
View File

@ -0,0 +1,49 @@
// 2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2010 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 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/>.
#include <istream>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/26211
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
typedef istringstream::pos_type pos_type;
istringstream iss("Duos for Doris");
ostringstream oss;
VERIFY( iss.tellg() == pos_type(0) );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
VERIFY( iss.tellg() == pos_type(-1) );
iss.clear();
VERIFY( iss.tellg() == pos_type(14) );
}
int main()
{
test01();
return 0;
}

1
libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc
View File

@ -40,6 +40,7 @@ void test06(void)
iss >> asNum;
VERIFY( test = iss.eof() );
VERIFY( test = !iss.fail() );
iss.clear();
iss.tellg();
VERIFY( test = !iss.fail() );
}

49
libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc Normal file
View File

@ -0,0 +1,49 @@
// 2010-11-18 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2010 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 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/>.
#include <istream>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/26211
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
typedef wistringstream::pos_type pos_type;
wistringstream iss(L"Duos for Doris");
wostringstream oss;
VERIFY( iss.tellg() == pos_type(0) );
iss >> oss.rdbuf();
VERIFY( iss.rdstate() == iss.eofbit );
VERIFY( iss.tellg() == pos_type(-1) );
iss.clear();
VERIFY( iss.tellg() == pos_type(14) );
}
int main()
{
test01();
return 0;
}

1
libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc
View File

@ -37,6 +37,7 @@ void test06(void)
iss >> asNum;
VERIFY( test = iss.eof() );
VERIFY( test = !iss.fail() );
iss.clear();
iss.tellg();
VERIFY( test = !iss.fail() );
}