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

re PR libstdc++/20909 (incorrect floating point format) 

2005-04-08  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/20909
	* include/bits/locale_facets.tcc (num_put<>::_M_insert_float):
	Don't even try to group numbers like 2e20, i.e., no decimal
	point, scientific notation.
	* testsuite/22_locale/num_put/put/char/20909.cc: New.
	* testsuite/22_locale/num_put/put/wchar_t/20909.cc: Likewise.

From-SVN: r97873
This commit is contained in:
Paolo Carlini 2005-04-09 00:08:58 +00:00 committed by Paolo Carlini
parent 334269b9dd
commit eaf727f9d8
4 changed files with 172 additions and 1 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 @@
2005-04-08 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/20909
* include/bits/locale_facets.tcc (num_put<>::_M_insert_float):
Don't even try to group numbers like 2e20, i.e., no decimal
point, scientific notation.
* testsuite/22_locale/num_put/put/char/20909.cc: New.
* testsuite/22_locale/num_put/put/wchar_t/20909.cc: Likewise.
2005-04-08 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Define _GLIBCXX_ASM_SYMVER.

6
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -1153,7 +1153,11 @@ namespace std
__ws[__p - __ws] = __dec;
// Add grouping, if necessary.
if (__lc->_M_use_grouping)
// N.B. Make sure to not group things like 2e20, i.e., no decimal
// point, scientific notation.
if (__lc->_M_use_grouping
&& (__p || __len < 3 || (__cs[1] != 'e' && __cs[2] != 'e'
&& __cs[1] != 'E' && __cs[2] != 'E')))
{
// Grouping can add (almost) as many separators as the
// number of digits, but no more.

79
libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc Normal file
View File

@ -0,0 +1,79 @@
// 2005-04-08 Paolo Carlini <pcarlini@suse.de>
// Copyright (C) 2005 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.
// 22.2.2.2.1 num_put members
#include <locale>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/20909
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
// A locale that expects grouping.
locale loc_de = __gnu_test::try_named_locale("de_DE");
const string empty;
string result;
ostringstream oss;
oss.imbue(loc_de);
const num_put<char>& np = use_facet<num_put<char> >(oss.getloc());
double d0 = 2e20;
double d1 = -2e20;
oss.str(empty);
oss.clear();
np.put(oss.rdbuf(), oss, '*', d0);
result = oss.str();
VERIFY( result == "2e+20" );
oss.str(empty);
oss.clear();
np.put(oss.rdbuf(), oss, '*', d1);
result = oss.str();
VERIFY( result == "-2e+20" );
oss.str(empty);
oss.clear();
oss.setf(ios::uppercase);
np.put(oss.rdbuf(), oss, '*', d0);
result = oss.str();
VERIFY( result == "2E+20" );
oss.str(empty);
oss.clear();
oss.setf(ios::showpos);
np.put(oss.rdbuf(), oss, '*', d0);
result = oss.str();
VERIFY( result == "+2E+20" );
}
int main()
{
test01();
return 0;
}

79
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc Normal file
View File

@ -0,0 +1,79 @@
// 2005-04-08 Paolo Carlini <pcarlini@suse.de>
// Copyright (C) 2005 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.
// 22.2.2.2.1 num_put members
#include <locale>
#include <sstream>
#include <testsuite_hooks.h>
// libstdc++/20909
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
// A locale that expects grouping.
locale loc_de = __gnu_test::try_named_locale("de_DE");
const wstring empty;
wstring result;
wostringstream oss;
oss.imbue(loc_de);
const num_put<wchar_t>& np = use_facet<num_put<wchar_t> >(oss.getloc());
double d0 = 2e20;
double d1 = -2e20;
oss.str(empty);
oss.clear();
np.put(oss.rdbuf(), oss, L'*', d0);
result = oss.str();
VERIFY( result == L"2e+20" );
oss.str(empty);
oss.clear();
np.put(oss.rdbuf(), oss, L'*', d1);
result = oss.str();
VERIFY( result == L"-2e+20" );
oss.str(empty);
oss.clear();
oss.setf(ios::uppercase);
np.put(oss.rdbuf(), oss, L'*', d0);
result = oss.str();
VERIFY( result == L"2E+20" );
oss.str(empty);
oss.clear();
oss.setf(ios::showpos);
np.put(oss.rdbuf(), oss, L'*', d0);
result = oss.str();
VERIFY( result == L"+2E+20" );
}
int main()
{
test01();
return 0;
}