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';
--- /dev/null
+// { 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();
+}
projects / platform / upstream / linaro-gcc.git / commitdiff