This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[Patch] Fix libstdc++/13369
- From: Paolo Carlini <pcarlini at suse dot de>
- To: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Mon, 29 Dec 2003 21:25:35 +0100
- Subject: [Patch] Fix libstdc++/13369
Hi,
the fix is quite straightforward. A nice "side effect" is that
performance-wise we also improve on the current situation: I have
expounded a __verify_grouping for char and, first, compiled -O2
and stripped (x86-linux):
3.4
---
656 bytes
3.4 + patch
-----------
596 bytes
Then, exercised a bit with:
std::string curr("\003\003\003");
std::string ref("\003");
for (size_t i = 0; i < 100000000; ++i)
__verify_grouping(ref, curr);
3.4
---
2.860u 0.000s 0:02.87 99.6% 0+0k 0+0io 164pf+0w
3.4 + patch
-----------
1.530u 0.000s 0:01.54 99.3% 0+0k 0+0io 164pf+0w
Tested x86-linux, will wait 'til tomorrow.
Paolo.
P.S. While at it I have verified that __add_grouping is OK: probably
will prepare some testcases, anyway...
////////////
2003-12-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/13369
* include/bits/locale_facets.tcc (__verify_grouping):
Fix to deal properly with __grouping_tmp.size() >
__grouping.size().
* testsuite/22_locale/num_get/get/char/13.cc: New.
* testsuite/22_locale/num_get/get/wchar_t/13.cc: Ditto.
diff -prN libstdc++-v3-1/include/bits/locale_facets.tcc libstdc++-v3/include/bits/locale_facets.tcc
*** libstdc++-v3-1/include/bits/locale_facets.tcc Wed Dec 24 19:49:21 2003
--- libstdc++-v3/include/bits/locale_facets.tcc Thu Dec 25 22:17:40 2003
*************** namespace std
*** 2271,2293 ****
bool
__verify_grouping(const basic_string<_CharT>& __grouping,
const basic_string<_CharT>& __grouping_tmp)
! {
! size_t __i = 0;
! size_t __j = 0;
! const size_t __len = __grouping.size();
! const size_t __n = __grouping_tmp.size();
bool __test = true;
!
// Parsed number groupings have to match the
// numpunct::grouping string exactly, starting at the
// right-most point of the parsed sequence of elements ...
! while (__test && __i < __n - 1)
! for (__j = 0; __test && __j < __len && __i < __n - 1; ++__j, ++__i)
! __test = __grouping[__j] == __grouping_tmp[__n - __i - 1];
// ... but the last parsed grouping can be <= numpunct
// grouping.
! __j == __len ? __j = 0 : __j;
! __test &= __grouping[__j] >= __grouping_tmp[__n - __i - 1];
return __test;
}
--- 2271,2292 ----
bool
__verify_grouping(const basic_string<_CharT>& __grouping,
const basic_string<_CharT>& __grouping_tmp)
! {
! const size_t __n = __grouping_tmp.size() - 1;
! const size_t __min = std::min(__n, __grouping.size() - 1);
! size_t __i = __n;
bool __test = true;
!
// Parsed number groupings have to match the
// numpunct::grouping string exactly, starting at the
// right-most point of the parsed sequence of elements ...
! for (size_t __j = 0; __j < __min && __test; --__i, ++__j)
! __test = __grouping_tmp[__i] == __grouping[__j];
! for (; __i && __test; --__i)
! __test = __grouping_tmp[__i] == __grouping[__min];
// ... but the last parsed grouping can be <= numpunct
// grouping.
! __test &= __grouping_tmp[0] <= __grouping[__min];
return __test;
}
diff -prN libstdc++-v3-1/testsuite/22_locale/num_get/get/char/13.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc
*** libstdc++-v3-1/testsuite/22_locale/num_get/get/char/13.cc Thu Jan 1 01:00:00 1970
--- libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc Fri Dec 26 10:00:31 2003
***************
*** 0 ****
--- 1,79 ----
+ // 2003-12-29 Paolo Carlini <pcarlini@suse.de>
+
+ // Copyright (C) 2003 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 Punct1: std::numpunct<char>
+ { std::string do_grouping() const { return "\003\002\001"; } };
+
+ struct Punct2: std::numpunct<char>
+ { std::string do_grouping() const { return "\001\003"; } };
+
+ // libstdc++/13369
+ void test01()
+ {
+ using namespace std;
+ typedef istreambuf_iterator<char> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ istringstream iss1, iss2;
+ iss1.imbue(locale(iss1.getloc(), static_cast<numpunct<char>*>(new Punct1)));
+ iss2.imbue(locale(iss2.getloc(), static_cast<numpunct<char>*>(new Punct2)));
+ const num_get<char>& ng1 = use_facet<num_get<char> >(iss1.getloc());
+ const num_get<char>& ng2 = use_facet<num_get<char> >(iss2.getloc());
+
+ ios_base::iostate err = ios_base::goodbit;
+ iterator_type end;
+ long l = 0l;
+ long l1 = 12345678l;
+ double d = 0.0;
+ double d1 = 1234567.0;
+ double d2 = 123456.0;
+
+ iss1.str("1,2,3,45,678");
+ err = ios_base::goodbit;
+ end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( l == l1 );
+
+ iss2.str("123,456,7.0");
+ err = ios_base::goodbit;
+ end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d1 );
+
+ iss2.str("12,345,6.0");
+ iss2.clear();
+ err = ios_base::goodbit;
+ end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d2 );
+ }
+
+ int main()
+ {
+ test01();
+ return 0;
+ }
diff -prN libstdc++-v3-1/testsuite/22_locale/num_get/get/wchar_t/13.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc
*** libstdc++-v3-1/testsuite/22_locale/num_get/get/wchar_t/13.cc Thu Jan 1 01:00:00 1970
--- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc Fri Dec 26 10:01:00 2003
***************
*** 0 ****
--- 1,79 ----
+ // 2003-12-29 Paolo Carlini <pcarlini@suse.de>
+
+ // Copyright (C) 2003 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 Punct1: std::numpunct<wchar_t>
+ { std::string do_grouping() const { return "\003\002\001"; } };
+
+ struct Punct2: std::numpunct<wchar_t>
+ { std::string do_grouping() const { return "\001\003"; } };
+
+ // libstdc++/13369
+ void test01()
+ {
+ using namespace std;
+ typedef istreambuf_iterator<wchar_t> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ wistringstream iss1, iss2;
+ iss1.imbue(locale(iss1.getloc(), static_cast<numpunct<wchar_t>*>(new Punct1)));
+ iss2.imbue(locale(iss2.getloc(), static_cast<numpunct<wchar_t>*>(new Punct2)));
+ const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc());
+ const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc());
+
+ ios_base::iostate err = ios_base::goodbit;
+ iterator_type end;
+ long l = 0l;
+ long l1 = 12345678l;
+ double d = 0.0;
+ double d1 = 1234567.0;
+ double d2 = 123456.0;
+
+ iss1.str(L"1,2,3,45,678");
+ err = ios_base::goodbit;
+ end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( l == l1 );
+
+ iss2.str(L"123,456,7.0");
+ err = ios_base::goodbit;
+ end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d1 );
+
+ iss2.str(L"12,345,6.0");
+ iss2.clear();
+ err = ios_base::goodbit;
+ end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( d == d2 );
+ }
+
+ int main()
+ {
+ test01();
+ return 0;
+ }