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

PR libstdc++/59568 don't use putback or update value when extraction fails

Browse Source 
PR libstdc++/59568
	* include/std/complex (operator>>): Only use putback if a character
	was successfully extracted and only set the value if a number was
	successfully extracted.
	* testsuite/26_numerics/complex/inserters_extractors/char/59568.cc:
	New test.

From-SVN: r255633
This commit is contained in:
Jonathan Wakely 2017-12-14 11:53:02 +00:00 committed by Jonathan Wakely
parent 7eb38f05ee
commit 3824ac481e
3 changed files with 206 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2017-12-14 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/59568
* include/std/complex (operator>>): Only use putback if a character
was successfully extracted and only set the value if a number was
successfully extracted.
* testsuite/26_numerics/complex/inserters_extractors/char/59568.cc:
New test.
2017-12-12 Jonathan Wakely <jwakely@redhat.com> 2017-12-12 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/83395 PR libstdc++/83395

10
libstdc++-v3/include/std/complex
View File

@ -493,7 +493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x) operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
{ {
_Tp __re_x, __im_x; _Tp __re_x, __im_x;
_CharT __ch; _CharT __ch = _CharT();
__is >> __ch; __is >> __ch;
if (__ch == '(') if (__ch == '(')
{ {
@ -511,11 +511,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
else else
__is.setstate(ios_base::failbit); __is.setstate(ios_base::failbit);
} }
else else if (__is)
{ {
__is.putback(__ch); __is.putback(__ch);
__is >> __re_x; if (__is >> __re_x)
__x = __re_x; __x = __re_x;
else
__is.setstate(ios_base::failbit);
} }
return __is; return __is;
} }

191
libstdc++-v3/testsuite/26_numerics/complex/inserters_extractors/char/59568.cc Normal file
View File

@ -0,0 +1,191 @@
// Copyright (C) 2017 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/>.
#include <complex>
#include <sstream>
#include <testsuite_hooks.h>
void
test01()
{
std::istringstream in(" 1 (2) ( 2.0 , 0.5 ) ");
std::complex<double> c1, c2, c3;
in >> c1 >> c2 >> c3;
VERIFY( in.good() );
VERIFY( c1.real() == 1 && c1.imag() == 0 );
VERIFY( c2.real() == 2 && c2.imag() == 0 );
VERIFY( c3.real() == 2 && c3.imag() == 0.5 );
}
void
test02()
{
std::istringstream in;
std::complex<double> c(-1, -1);
const std::complex<double> c0 = c;
in.str("a");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == 'a' );
VERIFY( c == c0 );
in.str(" ( ) ");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == ')' );
VERIFY( c == c0 );
in.str("(,");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == ',' );
VERIFY( c == c0 );
in.str("(b)");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == 'b' );
VERIFY( c == c0 );
in.str("( c)");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == 'c' );
VERIFY( c == c0 );
in.str("(99d");
in >> c;
VERIFY( in.fail() );
in.clear();
// VERIFY( in.get() == 'd' );
VERIFY( c == c0 );
in.str("(99 e");
in >> c;
VERIFY( in.fail() );
in.clear();
// VERIFY( in.get() == 'e' );
VERIFY( c == c0 );
in.str("(99, f");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == 'f' );
VERIFY( c == c0 );
in.str("(99, 88g");
in >> c;
VERIFY( in.fail() );
in.clear();
// VERIFY( in.get() == 'g' );
VERIFY( c == c0 );
in.str("(99, 88 h");
in >> c;
VERIFY( in.fail() );
in.clear();
// VERIFY( in.get() == 'h' );
VERIFY( c == c0 );
in.str("(99, )");
in >> c;
VERIFY( in.fail() );
in.clear();
VERIFY( in.get() == ')' );
VERIFY( c == c0 );
}
void
test03()
{
// PR libstdc++/59568
std::istringstream in;
std::complex<double> c;
in.str("");
in >> c;
VERIFY( in.fail() );
VERIFY( in.eof() );
in.clear();
in.str(" ");
in >> c;
VERIFY( in.fail() );
VERIFY( in.eof() );
in.clear();
in.str("(99");
in >> c;
VERIFY( in.fail() );
VERIFY( in.eof() );
in.clear();
in.str("(99,");
in >> c;
VERIFY( in.fail() );
VERIFY( in.eof() );
in.clear();
in.str("(99,99");
in >> c;
VERIFY( in.fail() );
VERIFY( in.eof() );
in.clear();
}
void
test04()
{
// Test noskipws handling
std::istringstream in;
const char* bad_inputs[] = {
" 1", " (2)", "( 2)", "(2 )", "(2 ,3)", "(2,3 )", 0
};
const std::complex<double> c0(-1, -1);
std::complex<double> c;
for (int i = 0; bad_inputs[i]; ++i)
{
c = c0;
in.clear();
in.str(bad_inputs[i]);
in >> std::noskipws >> c;
VERIFY( in.fail() );
VERIFY( c == c0 );
in.clear();
in.str(bad_inputs[i]);
in >> std::skipws >> c;
VERIFY( !in.fail() );
VERIFY( c != c0 );
}
}
int
main()
{
test01();
test02();
test03();
test04();
}