This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix a bug in num_get::do_get
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 28 Feb 2004 21:40:18 +0100
- Subject: [v3] Fix a bug in num_get::do_get
Hi,
tested x86-linux.
Paolo.
//////////////
2004-02-28 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (num_get<>::_M_extract_float):
According to 22.2.3.1, p2, 'units' may be followed by 'e' with
no 'decimal-point' in the middle: in this case too we must fix
up __found_grouping; slightly tweak.
* testsuite/22_locale/num_get/get/char/14.cc: New.
* testsuite/22_locale/num_get/get/wchar_t/14.cc: New.
diff -urN libstdc++-v3-orig/include/bits/locale_facets.tcc libstdc++-v3/include/bits/locale_facets.tcc
--- libstdc++-v3-orig/include/bits/locale_facets.tcc 2004-02-27 12:25:10.000000000 +0100
+++ libstdc++-v3/include/bits/locale_facets.tcc 2004-02-28 01:21:34.000000000 +0100
@@ -188,8 +188,7 @@
&& (!__lc->_M_use_grouping
|| !__traits_type::eq(__c, __lc->_M_thousands_sep)))
{
- __xtrc += __plus ? _S_atoms_in[_S_iplus]
- : _S_atoms_in[_S_iminus];
+ __xtrc += __plus ? '+' : '-';
++__beg;
}
}
@@ -206,7 +205,7 @@
{
if (!__found_mantissa)
{
- __xtrc += _S_atoms_in[_S_izero];
+ __xtrc += '0';
__found_mantissa = true;
}
++__beg;
@@ -223,6 +222,7 @@
__found_grouping.reserve(32);
int __sep_pos = 0;
bool __e;
+ const char_type* __lit_zero = __lit + _S_izero;
const char_type* __q;
while (__beg != __end)
{
@@ -267,7 +267,7 @@
else
break;
}
- else if (__q = __traits_type::find(__lit + _S_izero, 10, __c))
+ else if (__q = __traits_type::find(__lit_zero, 10, __c))
{
__xtrc += _S_atoms_in[__q - __lit];
__found_mantissa = true;
@@ -279,7 +279,9 @@
&& __found_mantissa && !__found_sci)
{
// Scientific notation.
- __xtrc += __e ? _S_atoms_in[_S_ie] : _S_atoms_in[_S_iE];
+ if (__found_grouping.size() && !__found_dec)
+ __found_grouping += static_cast<char>(__sep_pos);
+ __xtrc += __e ? 'e' : 'E';
__found_sci = true;
// Remove optional plus or minus sign, if they exist.
@@ -289,8 +291,7 @@
__lit[_S_iplus]);
if (__plus || __traits_type::eq(*__beg, __lit[_S_iminus]))
{
- __xtrc += __plus ? _S_atoms_in[_S_iplus]
- : _S_atoms_in[_S_iminus];
+ __xtrc += __plus ? '+' : '-';
++__beg;
}
}
@@ -304,8 +305,8 @@
// match, then get very very upset, and set failbit.
if (__found_grouping.size())
{
- // Add the ending grouping if a decimal wasn't found.
- if (!__found_dec)
+ // Add the ending grouping if a decimal or 'e'/'E' wasn't found.
+ if (!__found_dec && !__found_sci)
__found_grouping += static_cast<char>(__sep_pos);
if (!std::__verify_grouping(__lc->_M_grouping, __lc->_M_grouping_size,
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/14.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/14.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/14.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/14.cc 2004-02-28 01:39:33.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-02-28 Paolo Carlini <pcarlini@suse.de>
+
+// Copyright (C) 2004 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.1.1 num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct: std::numpunct<char>
+{
+ std::string do_grouping() const { return "\1"; }
+};
+
+void test01()
+{
+ using namespace std;
+ typedef istreambuf_iterator<char> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ istringstream iss;
+ iss.imbue(locale(iss.getloc(), static_cast<numpunct<char>*>(new Punct)));
+ const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc());
+
+ ios_base::iostate err = ios_base::goodbit;
+ iterator_type end;
+ double d = 0.0;
+ double d1 = 1000.0;
+
+ iss.str("1,0e2");
+ err = ios_base::goodbit;
+ end = ng.get(iss.rdbuf(), 0, iss, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d1 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/14.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/14.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/14.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/14.cc 2004-02-28 01:41:10.000000000 +0100
@@ -0,0 +1,59 @@
+// 2004-02-28 Paolo Carlini <pcarlini@suse.de>
+
+// Copyright (C) 2004 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.1.1 num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct: std::numpunct<wchar_t>
+{
+ std::string do_grouping() const { return "\1"; }
+};
+
+void test01()
+{
+ using namespace std;
+ typedef istreambuf_iterator<wchar_t> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ wistringstream iss;
+ iss.imbue(locale(iss.getloc(), static_cast<numpunct<wchar_t>*>(new Punct)));
+ const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc());
+
+ ios_base::iostate err = ios_base::goodbit;
+ iterator_type end;
+ double d = 0.0;
+ double d1 = 1000.0;
+
+ iss.str(L"1,0e2");
+ err = ios_base::goodbit;
+ end = ng.get(iss.rdbuf(), 0, iss, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d1 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}