diff options
author | Paolo Carlini <pcarlini@suse.de> | 2003-12-30 10:43:54 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-12-30 10:43:54 +0000 |
commit | a27cf81c7a193551238e3491e556fd73a7d63a34 (patch) | |
tree | 16972ab6a97ef1f78e4d772df67159b9c598b2ba /libstdc++-v3/testsuite/22_locale | |
parent | d47cc544b60738db5e983c4b1ac6b40236b9633c (diff) | |
download | gcc-a27cf81c7a193551238e3491e556fd73a7d63a34.zip gcc-a27cf81c7a193551238e3491e556fd73a7d63a34.tar.gz gcc-a27cf81c7a193551238e3491e556fd73a7d63a34.tar.bz2 |
re PR libstdc++/13369 (__verify_grouping (and __add_grouping?) not correct)
2003-12-30 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.
From-SVN: r75227
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale')
-rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc | 79 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc | 79 |
2 files changed, 158 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc new file mode 100644 index 0000000..63cb008 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/13.cc @@ -0,0 +1,79 @@ +// 2003-12-30 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 --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc new file mode 100644 index 0000000..2176959 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc @@ -0,0 +1,79 @@ +// 2003-12-30 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; +} |