From: Paolo Carlini Date: Sat, 9 Apr 2005 00:08:58 +0000 (+0000) Subject: re PR libstdc++/20909 (incorrect floating point format) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaf727f9d8c183f0c6a05ee2dead2b67c73a80d3;p=platform%2Fupstream%2Fgcc.git re PR libstdc++/20909 (incorrect floating point format) 2005-04-08 Paolo Carlini 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 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fc8b84a..ae6ebba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2005-04-08 Paolo Carlini + + 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 * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Define _GLIBCXX_ASM_SYMVER. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index ae3a102..0301781 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -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. diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc new file mode 100644 index 0000000..abb2e5c --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc @@ -0,0 +1,79 @@ +// 2005-04-08 Paolo Carlini + +// 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 +#include +#include + +// 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& np = use_facet >(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; +} + + diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc new file mode 100644 index 0000000..2269718 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc @@ -0,0 +1,79 @@ +// 2005-04-08 Paolo Carlini + +// 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 +#include +#include + +// 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& np = use_facet >(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; +} + +