mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-06 04:00:25 +08:00
re PR libstdc++/59987 ([C++11]: Missing ios_base::hexfloat format specifier)
2014-10-06 Rüdiger Sonderfeld <ruediger@c-plusplus.de> Jonathan Wakely <jwakely@redhat.com> PR libstdc++/59987 * doc/xml/manual/status_cxx2011.xml: Remove hexfloat from notes. * doc/html/manual/status.html: Regenerate. * include/bits/ios_base.h (hexfloat): New function. (defaultfloat): New function. * src/c++98/locale_facets.cc (__num_base::_S_format_float): Support hexadecimal floating point format. * testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc: New file. Co-Authored-By: Jonathan Wakely <jwakely@redhat.com> From-SVN: r215952
This commit is contained in:
Rüdiger Sonderfeld
Jonathan Wakely
parent
cec5d8be55
commit
c4b64f5bca
@ -1,3 +1,16 @@
|
||||
2014-10-06 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
|
||||
Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
PR libstdc++/59987
|
||||
* doc/xml/manual/status_cxx2011.xml: Remove hexfloat from notes.
|
||||
* doc/html/manual/status.html: Regenerate.
|
||||
* include/bits/ios_base.h (hexfloat): New function.
|
||||
(defaultfloat): New function.
|
||||
* src/c++98/locale_facets.cc (__num_base::_S_format_float): Support
|
||||
hexadecimal floating point format.
|
||||
* testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc:
|
||||
New file.
|
||||
|
||||
2014-10-06 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* include/Makefile.am: Add new header.
|
||||
|
||||
@ -215,7 +215,6 @@ particular release.
|
||||
</td></tr><tr><td align="left">27.1</td><td align="left">General</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.2</td><td align="left">Iostreams requirements</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.2.1</td><td align="left">Imbue Limitations</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.2.2</td><td align="left">Positioning Type Limitations</td><td align="left">Y</td><td align="left"> </td></tr><tr bgcolor="#B0B0B0"><td align="left">27.2.3</td><td align="left">Thread safety</td><td align="left">Partial</td><td align="left"> </td></tr><tr><td align="left">27.3</td><td align="left">Forward declarations</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.4</td><td align="left">Standard iostream objects</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.4.1</td><td align="left">Overview</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.4.2</td><td align="left">Narrow stream objects</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.4.3</td><td align="left">Wide stream objects</td><td align="left">Y</td><td align="left"> </td></tr><tr bgcolor="#B0B0B0"><td align="left">27.5</td><td align="left">Iostreams base classes</td><td align="left">Partial</td><td align="left">
|
||||
Missing <code class="code">io_errc</code> and <code class="code">iostream_category</code>.
|
||||
<code class="code">ios_base::failure</code> is not derived from <code class="code">system_error</code>.
|
||||
Missing <code class="code">ios_base::hexfloat</code>.
|
||||
</td></tr><tr><td align="left">27.6</td><td align="left">Stream buffers</td><td align="left">Y</td><td align="left"> </td></tr><tr bgcolor="#B0B0B0"><td align="left">27.7</td><td align="left">Formatting and manipulators</td><td align="left">Partial</td><td align="left">
|
||||
Missing <code class="code">get_time</code> and <code class="code">put_time</code> manipulators.
|
||||
</td></tr><tr><td align="left">27.8</td><td align="left">String-based streams</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">27.9</td><td align="left">File-based streams</td><td align="left">Y</td><td align="left"> </td></tr><tr><td align="left">
|
||||
|
||||
@ -2131,7 +2131,6 @@ particular release.
|
||||
<entry>
|
||||
Missing <code>io_errc</code> and <code>iostream_category</code>.
|
||||
<code>ios_base::failure</code> is not derived from <code>system_error</code>.
|
||||
Missing <code>ios_base::hexfloat</code>.
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
|
||||
@ -984,6 +984,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
return __base;
|
||||
}
|
||||
|
||||
#if __cplusplus >= 201103L
|
||||
// New C++11 floatfield manipulators
|
||||
|
||||
/// Calls
|
||||
/// base.setf(ios_base::fixed|ios_base::scientific, ios_base::floatfield)
|
||||
inline ios_base&
|
||||
hexfloat(ios_base& __base)
|
||||
{
|
||||
__base.setf(ios_base::fixed | ios_base::scientific, ios_base::floatfield);
|
||||
return __base;
|
||||
}
|
||||
|
||||
/// Calls @c base.unsetf(ios_base::floatfield)
|
||||
inline ios_base&
|
||||
defaultfloat(ios_base& __base)
|
||||
{
|
||||
__base.unsetf(ios_base::floatfield);
|
||||
return __base;
|
||||
}
|
||||
#endif
|
||||
|
||||
_GLIBCXX_END_NAMESPACE_VERSION
|
||||
} // namespace
|
||||
|
||||
|
||||
@ -69,19 +69,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
if (__flags & ios_base::showpoint)
|
||||
*__fptr++ = '#';
|
||||
|
||||
// As per DR 231: _always_, not only when
|
||||
// __flags & ios_base::fixed || __prec > 0
|
||||
*__fptr++ = '.';
|
||||
*__fptr++ = '*';
|
||||
ios_base::fmtflags __fltfield = __flags & ios_base::floatfield;
|
||||
|
||||
if (__fltfield != (ios_base::fixed | ios_base::scientific))
|
||||
{
|
||||
// As per DR 231: not only when __flags & ios_base::fixed || __prec > 0
|
||||
*__fptr++ = '.';
|
||||
*__fptr++ = '*';
|
||||
}
|
||||
|
||||
if (__mod)
|
||||
*__fptr++ = __mod;
|
||||
ios_base::fmtflags __fltfield = __flags & ios_base::floatfield;
|
||||
// [22.2.2.2.2] Table 58
|
||||
if (__fltfield == ios_base::fixed)
|
||||
*__fptr++ = 'f';
|
||||
else if (__fltfield == ios_base::scientific)
|
||||
*__fptr++ = (__flags & ios_base::uppercase) ? 'E' : 'e';
|
||||
#ifdef _GLIBCXX_USE_C99
|
||||
else if (__fltfield == (ios_base::fixed | ios_base::scientific))
|
||||
*__fptr++ = (__flags & ios_base::uppercase) ? 'A' : 'a';
|
||||
#endif
|
||||
else
|
||||
*__fptr++ = (__flags & ios_base::uppercase) ? 'G' : 'g';
|
||||
*__fptr = '\0';
|
||||
|
||||
@ -0,0 +1,152 @@
|
||||
// { dg-options "-std=gnu++11" }
|
||||
|
||||
// 2014-03-27 Rüdiger Sonderfeld
|
||||
// test the hexadecimal floating point inserters (facet num_put)
|
||||
|
||||
// Copyright (C) 2014 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 <iomanip>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
#ifndef _GLIBCXX_ASSERT
|
||||
# define TEST_NUMPUT_VERBOSE 1
|
||||
#endif
|
||||
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
# include <iostream>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
test01()
|
||||
{
|
||||
ostringstream os;
|
||||
double d = 272.; // 0x1.1p+8;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << os.precision() << endl;
|
||||
#endif
|
||||
os << hexfloat << setprecision(1);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stod(os.str()) == d );
|
||||
VERIFY( os.str().substr(0, 2) == "0x" );
|
||||
VERIFY( os.str().find('p') != std::string::npos );
|
||||
|
||||
os.str("");
|
||||
os << uppercase << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stod(os.str()) == d );
|
||||
VERIFY( os.str().substr(0, 2) == "0X" );
|
||||
VERIFY( os.str().find('P') != std::string::npos );
|
||||
|
||||
os << nouppercase;
|
||||
os.str("");
|
||||
os << defaultfloat << setprecision(6);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && os.str() == "272" );
|
||||
|
||||
os.str("");
|
||||
d = 15.; //0x1.ep+3;
|
||||
os << hexfloat << setprecision(1);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stod(os.str()) == d );
|
||||
os.str("");
|
||||
os << uppercase << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stod(os.str()) == d );
|
||||
os << nouppercase;
|
||||
os.str("");
|
||||
os << defaultfloat << setprecision(6);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && os.str() == "15" );
|
||||
}
|
||||
|
||||
void
|
||||
test02()
|
||||
{
|
||||
ostringstream os;
|
||||
long double d = 272.L; // 0x1.1p+8L;
|
||||
os << hexfloat << setprecision(1);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stold(os.str()) == d );
|
||||
os.str("");
|
||||
os << uppercase << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stold(os.str()) == d );
|
||||
os << nouppercase;
|
||||
os.str("");
|
||||
os << defaultfloat << setprecision(6);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && os.str() == "272" );
|
||||
|
||||
os.str("");
|
||||
os << hexfloat << setprecision(1);
|
||||
d = 15.; //0x1.ep+3;
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stold(os.str()) == d );
|
||||
os.str("");
|
||||
os << uppercase << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && std::stold(os.str()) == d );
|
||||
os << nouppercase;
|
||||
os.str("");
|
||||
os << defaultfloat << setprecision(6);
|
||||
os << d;
|
||||
#ifdef TEST_NUMPUT_VERBOSE
|
||||
cout << "got: " << os.str() << endl;
|
||||
#endif
|
||||
VERIFY( os && os.str() == "15" );
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
test01();
|
||||
test02();
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user