This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/6701
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 24 May 2002 09:00:48 -0700
- Subject: [v3] libstdc++/6701
Problems with ctype<wchar_t>::narrow. Impressively, found on a hacked
Solaris 2.8 config: I'll try to get the bits in to enable wide
characters on Solaris in the near future.
I took this opportunity to further break apart the ctype tests.
tested x86/linux
2002-05-24 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/6701
* testsuite/22_locale/ctype_narrow_char.cc: New.
* testsuite/22_locale/ctype_narrow_wchar_t.cc: New.
* testsuite/22_locale/ctype_widen_char.cc: New.
* testsuite/22_locale/ctype_widen_wchar_t.cc: New.
* testsuite/22_locale/ctype_members_char.cc: Move some bits into...
* testsuite/22_locale/ctype_is_char.cc: ...this.
* testsuite/22_locale/ctype_to_char.cc: ...and this.
* testsuite/22_locale/ctype_members_wchar_t.cc: Move some bits into...
* testsuite/22_locale/ctype_is_wchar_t.cc: ...this.
* testsuite/22_locale/ctype_to_wchar_t.cc: ...and this.
* testsuite/22_locale/ctype_scan_wchar_t.cc: Should pass.
2002-05-24 Dale Peakall <dale@peakall.net>
PR libstdc++/6701
* config/locale/gnu/ctype_members.cc (ctype<wchar_t>::do_narrow): Fix.
* config/locale/generic/ctype_members.cc: Same.
Index: config/locale/generic/ctype_members.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/generic/ctype_members.cc,v
retrieving revision 1.1
diff -c -p -r1.1 ctype_members.cc
*** config/locale/generic/ctype_members.cc 9 Mar 2002 02:16:32 -0000 1.1
--- config/locale/generic/ctype_members.cc 24 May 2002 15:57:50 -0000
***************
*** 1,6 ****
// std::ctype implementation details, generic version -*- C++ -*-
! // Copyright (C) 2001 Free Software Foundation, Inc.
//
// 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
--- 1,6 ----
// std::ctype implementation details, generic version -*- C++ -*-
! // Copyright (C) 2001, 2002 Free Software Foundation, Inc.
//
// 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
*************** namespace std
*** 183,194 ****
do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
char* __dest) const
{
! mbstate_t __state;
! memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t));
! size_t __len = __hi - __lo;
! size_t __conv = wcsrtombs(__dest, &__lo, __len, &__state);
! if (__conv == __len)
! *__dest = __dfault;
return __hi;
}
#endif // _GLIBCPP_USE_WCHAR_T
--- 183,205 ----
do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
char* __dest) const
{
! size_t __offset = 0;
! while (true)
! {
! const wchar_t* __start = __lo + __offset;
! size_t __len = __hi - __start;
!
! mbstate_t __state;
! memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t));
! size_t __con = wcsrtombs(__dest + __offset, &__start, __len, &__state);
! if (__con != __len && __start != 0)
! {
! __offset = __start - __lo;
! __dest[__offset++] = __dfault;
! }
! else
! break;
! }
return __hi;
}
#endif // _GLIBCPP_USE_WCHAR_T
Index: config/locale/gnu/ctype_members.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/ctype_members.cc,v
retrieving revision 1.2
diff -c -p -r1.2 ctype_members.cc
*** config/locale/gnu/ctype_members.cc 16 Apr 2002 00:45:18 -0000 1.2
--- config/locale/gnu/ctype_members.cc 24 May 2002 15:57:50 -0000
*************** namespace std
*** 190,201 ****
do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
char* __dest) const
{
! mbstate_t __state;
! memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t));
! size_t __len = __hi - __lo;
! size_t __conv = wcsrtombs(__dest, &__lo, __len, &__state);
! if (__conv == __len)
! *__dest = __dfault;
return __hi;
}
#endif // _GLIBCPP_USE_WCHAR_T
--- 190,212 ----
do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
char* __dest) const
{
! size_t __offset = 0;
! while (true)
! {
! const wchar_t* __start = __lo + __offset;
! size_t __len = __hi - __start;
!
! mbstate_t __state;
! memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t));
! size_t __con = wcsrtombs(__dest + __offset, &__start, __len, &__state);
! if (__con != __len && __start != 0)
! {
! __offset = __start - __lo;
! __dest[__offset++] = __dfault;
! }
! else
! break;
! }
return __hi;
}
#endif // _GLIBCPP_USE_WCHAR_T
Index: testsuite/22_locale/ctype_is_char.cc
===================================================================
RCS file: testsuite/22_locale/ctype_is_char.cc
diff -N testsuite/22_locale/ctype_is_char.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_is_char.cc 24 May 2002 15:57:53 -0000
***************
*** 0 ****
--- 1,275 ----
+ // Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ // XXX This test (test02) is not working for non-glibc locale models.
+ // { dg-do run { xfail *-*-* } }
+
+ typedef char char_type;
+ class gnu_ctype: public std::ctype<char_type> { };
+
+ void test01()
+ {
+ bool test = true;
+ const char_type strlit00[] = "manilla, cebu, tandag PHILIPPINES";
+ const char_type strlit01[] = "MANILLA, CEBU, TANDAG PHILIPPINES";
+ const char_type strlit02[] = "manilla, cebu, tandag philippines";
+ const char_type c00 = 'S';
+ const char_type c10 = 's';
+ const char_type c20 = '9';
+ const char_type c30 = ' ';
+ const char_type c40 = '!';
+ const char_type c50 = 'F';
+ const char_type c60 = 'f';
+ const char_type c70 = 'X';
+ const char_type c80 = 'x';
+
+ gnu_ctype gctype;
+ char_type c100;
+ int len = std::char_traits<char_type>::length(strlit00);
+ char_type c_array[len + 1];
+
+ // sanity check ctype_base::mask members
+ int i01 = std::ctype_base::space;
+ int i02 = std::ctype_base::upper;
+ int i03 = std::ctype_base::lower;
+ int i04 = std::ctype_base::digit;
+ int i05 = std::ctype_base::punct;
+ int i06 = std::ctype_base::alpha;
+ int i07 = std::ctype_base::xdigit;
+ int i08 = std::ctype_base::alnum;
+ int i09 = std::ctype_base::graph;
+ int i10 = std::ctype_base::print;
+ int i11 = std::ctype_base::cntrl;
+ int i12 = sizeof(std::ctype_base::mask);
+ VERIFY ( i01 != i02);
+ VERIFY ( i02 != i03);
+ VERIFY ( i03 != i04);
+ VERIFY ( i04 != i05);
+ VERIFY ( i05 != i06);
+ VERIFY ( i06 != i07);
+ VERIFY ( i07 != i08);
+ VERIFY ( i08 != i09);
+ VERIFY ( i09 != i10);
+ VERIFY ( i10 != i11);
+ VERIFY ( i11 != i01);
+
+ // bool is(mask m, char_type c) const;
+ VERIFY( gctype.is(std::ctype_base::space, c30) );
+ VERIFY( gctype.is(std::ctype_base::upper, c00) );
+ VERIFY( gctype.is(std::ctype_base::lower, c10) );
+ VERIFY( gctype.is(std::ctype_base::digit, c20) );
+ VERIFY( gctype.is(std::ctype_base::punct, c40) );
+ VERIFY( gctype.is(std::ctype_base::alpha, c50) );
+ VERIFY( gctype.is(std::ctype_base::alpha, c60) );
+ VERIFY( gctype.is(std::ctype_base::xdigit, c20) );
+ VERIFY( !gctype.is(std::ctype_base::xdigit, c80) );
+ VERIFY( gctype.is(std::ctype_base::alnum, c50) );
+ VERIFY( gctype.is(std::ctype_base::alnum, c20) );
+ VERIFY( gctype.is(std::ctype_base::graph, c40) );
+ VERIFY( gctype.is(std::ctype_base::graph, c20) );
+
+ // const char* is(const char* low, const char* high, mask* vec) const
+ std::ctype_base::mask m00 = static_cast<std::ctype_base::mask>(0);
+ std::ctype_base::mask m01[3];
+ std::ctype_base::mask m02[13];
+ const char_type* cc0 = strlit00;
+ const char_type* cc1 = NULL;
+ const char_type* cc2 = NULL;
+
+ cc0 = strlit00;
+ m01[0] = m00;
+ m01[1] = m00;
+ m01[2] = m00;
+ cc1 = gctype.is(cc0, cc0, m01);
+ VERIFY( cc1 == strlit00 );
+ VERIFY( m01[0] == m00 );
+ VERIFY( m01[1] == m00 );
+ VERIFY( m01[2] == m00 );
+
+ cc0 = strlit00;
+ m01[0] = m00;
+ m01[1] = m00;
+ m01[2] = m00;
+ cc2 = gctype.is(cc0, cc0 + 3, m01);
+ VERIFY( cc2 == strlit00 + 3);
+ VERIFY( m01[0] != m00 );
+ VERIFY( m01[1] != m00 );
+ VERIFY( m01[2] != m00 );
+ VERIFY( gctype.is(m01[0], cc0[0]) );
+ VERIFY( gctype.is(m01[1], cc0[1]) );
+ VERIFY( gctype.is(m01[2], cc0[2]) );
+
+ cc0 = strlit01;
+ cc1 = gctype.is(cc0, cc0 + 13, m02);
+ VERIFY( cc1 == strlit01 + 13);
+ VERIFY( m02[6] != m00 );
+ VERIFY( m02[7] != m00 );
+ VERIFY( m02[8] != m00 );
+ VERIFY( m02[8] != m02[6] );
+ VERIFY( m02[6] != m02[7] );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alnum) );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::upper) );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alpha) );
+ VERIFY( static_cast<bool>(m02[7] & std::ctype_base::punct) );
+ VERIFY( static_cast<bool>(m02[8] & std::ctype_base::space) );
+ VERIFY( gctype.is(m02[6], cc0[6]) );
+ VERIFY( gctype.is(m02[7], cc0[7]) );
+ VERIFY( gctype.is(m02[8], cc0[8]) );
+ }
+
+ // libstdc++/4456, libstdc++/4457, libstdc++/4458
+ void test02()
+ {
+ using namespace std;
+ typedef ctype_base::mask mask;
+ typedef vector<mask> vector_type;
+
+ bool test = true;
+
+ // const int max = numeric_limits<char>::max();
+ const int max = 255;
+ const int ctype_mask_max = 10;
+ vector_type v_c(max);
+ vector_type v_de(max);
+
+ // "C"
+ locale loc_c = locale::classic();
+ const ctype<char>& ctype_c = use_facet<ctype<char> >(loc_c);
+ for (int i = 0; i < max; ++i)
+ {
+ char_type c = static_cast<char>(i);
+ mask mask_test = static_cast<mask>(0);
+ mask mask_is = static_cast<mask>(0);
+ for (int j = 0; j <= ctype_mask_max; ++j)
+ {
+ mask_test = static_cast<mask>(1 << j);
+ if (ctype_c.is(mask_test, c))
+ mask_is |= mask_test;
+ }
+ v_c[i] = mask_is;
+ }
+
+ // "de_DE"
+ locale loc_de("de_DE");
+ const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de);
+ for (int i = 0; i < max; ++i)
+ {
+ char_type c = static_cast<char>(i);
+ mask mask_test = static_cast<mask>(0);
+ mask mask_is = static_cast<mask>(0);
+ for (int j = 0; j <= ctype_mask_max; ++j)
+ {
+ mask_test = static_cast<mask>(1 << j);
+ if (ctype_de.is(mask_test, c))
+ mask_is |= mask_test;
+ }
+ v_de[i] = mask_is;
+ }
+
+ #if QUANNUM_VERBOSE_LYRICALLY_ADEPT_BAY_AREA_MCS_MODE
+ for (int i = 0; i < max; ++i)
+ {
+ char_type mark = v_c[i] == v_de[i] ? ' ' : '-';
+ cout << i << ' ' << mark << ' ' << static_cast<char>(i) << '\t' ;
+ cout << "v_c: " << setw(4) << v_c[i] << '\t';
+ cout << "v_de: " << setw(4) << v_de[i] << endl;
+ }
+ cout << (v_c == v_de) << endl;
+ #endif
+
+ VERIFY( v_c != v_de );
+ }
+
+ // Per Liboriussen <liborius@stofanet.dk>
+ void test03()
+ {
+ bool test = true;
+ std::ctype_base::mask maskdata[256];
+ for (int i = 0; i < 256; ++i)
+ maskdata[i] = std::ctype_base::alpha;
+ std::ctype<char>* f = new std::ctype<char>(maskdata);
+ std::locale global;
+ std::locale loc(global, f);
+ for (int i = 0; i < 256; ++i)
+ {
+ char_type ch = i;
+ VERIFY( std::isalpha(ch, loc) );
+ }
+ }
+
+ // libstdc++/5280
+ void test04()
+ {
+ #ifdef _GLIBCPP_HAVE_SETENV
+ // Set the global locale to non-"C".
+ std::locale loc_de("de_DE");
+ std::locale::global(loc_de);
+
+ // Set LANG environment variable to de_DE.
+ const char* oldLANG = getenv("LANG");
+ if (!setenv("LANG", "de_DE", 1))
+ {
+ test01();
+ test02();
+ test03();
+ setenv("LANG", oldLANG ? oldLANG : "", 1);
+ }
+ #endif
+ }
+
+ // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
+ void test05()
+ {
+ bool test = true;
+
+ const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
+ if (tentLANG != NULL)
+ {
+ std::string preLANG = tentLANG;
+ test01();
+ test02();
+ test03();
+ std::string postLANG = setlocale(LC_ALL, NULL);
+ VERIFY( preLANG == postLANG );
+ }
+ }
+
+ int main()
+ {
+ test01();
+ test02();
+ test03();
+ test04();
+ test05();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_is_wchar_t.cc
===================================================================
RCS file: testsuite/22_locale/ctype_is_wchar_t.cc
diff -N testsuite/22_locale/ctype_is_wchar_t.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_is_wchar_t.cc 24 May 2002 15:57:53 -0000
***************
*** 0 ****
--- 1,193 ----
+ // Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ // XXX This test (test02) is not working for non-glibc locale models.
+ // { dg-do run { xfail *-*-* } }
+
+ typedef wchar_t char_type;
+ class gnu_ctype: public std::ctype<char_type> { };
+
+ void test01()
+ {
+ bool test = true;
+ const char_type strlit00[] = L"manilla, cebu, tandag PHILIPPINES";
+ const char_type strlit01[] = L"MANILLA, CEBU, TANDAG PHILIPPINES";
+ const char_type strlit02[] = L"manilla, cebu, tandag philippines";
+ const char_type c00 = L'S';
+ const char_type c10 = L's';
+ const char_type c20 = L'9';
+ const char_type c30 = L' ';
+ const char_type c40 = L'!';
+ const char_type c50 = L'F';
+ const char_type c60 = L'f';
+ const char_type c70 = L'X';
+ const char_type c80 = L'x';
+
+ gnu_ctype gctype;
+ char_type c100;
+ int len = std::char_traits<char_type>::length(strlit00);
+ char_type c_array[len + 1];
+
+ // sanity check ctype_base::mask members
+ int i01 = std::ctype_base::space;
+ int i02 = std::ctype_base::upper;
+ int i03 = std::ctype_base::lower;
+ int i04 = std::ctype_base::digit;
+ int i05 = std::ctype_base::punct;
+ int i06 = std::ctype_base::alpha;
+ int i07 = std::ctype_base::xdigit;
+ int i08 = std::ctype_base::alnum;
+ int i09 = std::ctype_base::graph;
+ int i10 = std::ctype_base::print;
+ int i11 = std::ctype_base::cntrl;
+ int i12 = sizeof(std::ctype_base::mask);
+ VERIFY ( i01 != i02);
+ VERIFY ( i02 != i03);
+ VERIFY ( i03 != i04);
+ VERIFY ( i04 != i05);
+ VERIFY ( i05 != i06);
+ VERIFY ( i06 != i07);
+ VERIFY ( i07 != i08);
+ VERIFY ( i08 != i09);
+ VERIFY ( i09 != i10);
+ VERIFY ( i10 != i11);
+ VERIFY ( i11 != i01);
+
+ // bool is(mask m, char_type c) const;
+ VERIFY( gctype.is(std::ctype_base::space, c30) );
+ VERIFY( gctype.is(std::ctype_base::upper, c00) );
+ VERIFY( gctype.is(std::ctype_base::lower, c10) );
+ VERIFY( gctype.is(std::ctype_base::digit, c20) );
+ VERIFY( gctype.is(std::ctype_base::punct, c40) );
+ VERIFY( gctype.is(std::ctype_base::alpha, c50) );
+ VERIFY( gctype.is(std::ctype_base::alpha, c60) );
+ VERIFY( gctype.is(std::ctype_base::xdigit, c20) );
+ VERIFY( !gctype.is(std::ctype_base::xdigit, c80) );
+ VERIFY( gctype.is(std::ctype_base::alnum, c50) );
+ VERIFY( gctype.is(std::ctype_base::alnum, c20) );
+ VERIFY( gctype.is(std::ctype_base::graph, c40) );
+ VERIFY( gctype.is(std::ctype_base::graph, c20) );
+
+ // const char* is(const char* low, const char* high, mask* vec) const
+ std::ctype_base::mask m00 = static_cast<std::ctype_base::mask>(0);
+ std::ctype_base::mask m01[3];
+ std::ctype_base::mask m02[13];
+ const char_type* cc0 = strlit00;
+ const char_type* cc1 = NULL;
+ const char_type* cc2 = NULL;
+
+ cc0 = strlit00;
+ m01[0] = m00;
+ m01[1] = m00;
+ m01[2] = m00;
+ cc1 = gctype.is(cc0, cc0, m01);
+ VERIFY( cc1 == strlit00 );
+ VERIFY( m01[0] == m00 );
+ VERIFY( m01[1] == m00 );
+ VERIFY( m01[2] == m00 );
+
+ cc0 = strlit00;
+ m01[0] = m00;
+ m01[1] = m00;
+ m01[2] = m00;
+ cc2 = gctype.is(cc0, cc0 + 3, m01);
+ VERIFY( cc2 == strlit00 + 3);
+ #if 0
+ VERIFY( m01[0] != m00 );
+ VERIFY( m01[1] != m00 );
+ VERIFY( m01[2] != m00 );
+ VERIFY( gctype.is(m01[0], cc0[0]) );
+ VERIFY( gctype.is(m01[1], cc0[1]) );
+ VERIFY( gctype.is(m01[2], cc0[2]) );
+ #endif
+
+ cc0 = strlit01;
+ cc1 = gctype.is(cc0, cc0 + 13, m02);
+ VERIFY( cc1 == strlit01 + 13);
+ #if 0
+ VERIFY( m02[6] != m00 );
+ VERIFY( m02[7] != m00 );
+ VERIFY( m02[8] != m00 );
+ VERIFY( m02[8] != m02[6] );
+ VERIFY( m02[6] != m02[7] );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alnum) );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::upper) );
+ VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alpha) );
+ VERIFY( static_cast<bool>(m02[7] & std::ctype_base::punct) );
+ VERIFY( static_cast<bool>(m02[8] & std::ctype_base::space) );
+ VERIFY( gctype.is(m02[6], cc0[6]) );
+ VERIFY( gctype.is(m02[7], cc0[7]) );
+ VERIFY( gctype.is(m02[8], cc0[8]) );
+ #endif
+ }
+
+ // libstdc++/5280
+ void test04()
+ {
+ #ifdef _GLIBCPP_HAVE_SETENV
+ // Set the global locale to non-"C".
+ std::locale loc_de("de_DE");
+ std::locale::global(loc_de);
+
+ // Set LANG environment variable to de_DE.
+ const char* oldLANG = getenv("LANG");
+ if (!setenv("LANG", "de_DE", 1))
+ {
+ test01();
+ setenv("LANG", oldLANG ? oldLANG : "", 1);
+ }
+ #endif
+ }
+
+ // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
+ void test05()
+ {
+ bool test = true;
+
+ const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
+ if (tentLANG != NULL)
+ {
+ std::string preLANG = tentLANG;
+ test01();
+ std::string postLANG = setlocale(LC_ALL, NULL);
+ VERIFY( preLANG == postLANG );
+ }
+ }
+
+ int main()
+ {
+ test01();
+ test04();
+ test05();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_members_char.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/ctype_members_char.cc,v
retrieving revision 1.10
diff -c -p -r1.10 ctype_members_char.cc
*** testsuite/22_locale/ctype_members_char.cc 13 May 2002 10:58:13 -0000 1.10
--- testsuite/22_locale/ctype_members_char.cc 24 May 2002 15:57:53 -0000
***************
*** 30,239 ****
// 22.2.1.3.2 ctype<char> members
#include <locale>
- #include <vector>
#include <testsuite_hooks.h>
- // XXX This test (test02) is not working for non-glibc locale models.
- // { dg-do run { xfail *-*-* } }
-
- class gnu_ctype: public std::ctype<char> { };
-
- void test01()
- {
- bool test = true;
- const char strlit00[] = "manilla, cebu, tandag PHILIPPINES";
- const char strlit01[] = "MANILLA, CEBU, TANDAG PHILIPPINES";
- const char strlit02[] = "manilla, cebu, tandag philippines";
- const char c00 = 'S';
- const char c10 = 's';
- const char c20 = '9';
- const char c30 = ' ';
- const char c40 = '!';
- const char c50 = 'F';
- const char c60 = 'f';
- const char c70 = 'X';
- const char c80 = 'x';
-
- gnu_ctype gctype;
- char c100;
- int len = std::char_traits<char>::length(strlit00);
- char c_array[len + 1];
-
- // sanity check ctype_base::mask members
- int i01 = std::ctype_base::space;
- int i02 = std::ctype_base::upper;
- int i03 = std::ctype_base::lower;
- int i04 = std::ctype_base::digit;
- int i05 = std::ctype_base::punct;
- int i06 = std::ctype_base::alpha;
- int i07 = std::ctype_base::xdigit;
- int i08 = std::ctype_base::alnum;
- int i09 = std::ctype_base::graph;
- int i10 = std::ctype_base::print;
- int i11 = std::ctype_base::cntrl;
- int i12 = sizeof(std::ctype_base::mask);
- VERIFY ( i01 != i02);
- VERIFY ( i02 != i03);
- VERIFY ( i03 != i04);
- VERIFY ( i04 != i05);
- VERIFY ( i05 != i06);
- VERIFY ( i06 != i07);
- VERIFY ( i07 != i08);
- VERIFY ( i08 != i09);
- VERIFY ( i09 != i10);
- VERIFY ( i10 != i11);
- VERIFY ( i11 != i01);
-
- // bool is(mask m, char c) const;
- VERIFY( gctype.is(std::ctype_base::space, c30) );
- VERIFY( gctype.is(std::ctype_base::upper, c00) );
- VERIFY( gctype.is(std::ctype_base::lower, c10) );
- VERIFY( gctype.is(std::ctype_base::digit, c20) );
- VERIFY( gctype.is(std::ctype_base::punct, c40) );
- VERIFY( gctype.is(std::ctype_base::alpha, c50) );
- VERIFY( gctype.is(std::ctype_base::alpha, c60) );
- VERIFY( gctype.is(std::ctype_base::xdigit, c20) );
- VERIFY( !gctype.is(std::ctype_base::xdigit, c80) );
- VERIFY( gctype.is(std::ctype_base::alnum, c50) );
- VERIFY( gctype.is(std::ctype_base::alnum, c20) );
- VERIFY( gctype.is(std::ctype_base::graph, c40) );
- VERIFY( gctype.is(std::ctype_base::graph, c20) );
-
- // const char* is(const char* low, const char* high, mask* vec) const
- std::ctype_base::mask m00 = static_cast<std::ctype_base::mask>(0);
- std::ctype_base::mask m01[3];
- std::ctype_base::mask m02[13];
- const char* cc0 = strlit00;
- const char* cc1 = NULL;
- const char* cc2 = NULL;
-
- cc0 = strlit00;
- m01[0] = m00;
- m01[1] = m00;
- m01[2] = m00;
- cc1 = gctype.is(cc0, cc0, m01);
- VERIFY( cc1 == strlit00 );
- VERIFY( m01[0] == m00 );
- VERIFY( m01[1] == m00 );
- VERIFY( m01[2] == m00 );
-
- cc0 = strlit00;
- m01[0] = m00;
- m01[1] = m00;
- m01[2] = m00;
- cc2 = gctype.is(cc0, cc0 + 3, m01);
- VERIFY( cc2 == strlit00 + 3);
- VERIFY( m01[0] != m00 );
- VERIFY( m01[1] != m00 );
- VERIFY( m01[2] != m00 );
- VERIFY( gctype.is(m01[0], cc0[0]) );
- VERIFY( gctype.is(m01[1], cc0[1]) );
- VERIFY( gctype.is(m01[2], cc0[2]) );
-
- cc0 = strlit01;
- cc1 = gctype.is(cc0, cc0 + 13, m02);
- VERIFY( cc1 == strlit01 + 13);
- VERIFY( m02[6] != m00 );
- VERIFY( m02[7] != m00 );
- VERIFY( m02[8] != m00 );
- VERIFY( m02[8] != m02[6] );
- VERIFY( m02[6] != m02[7] );
- VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alnum) );
- VERIFY( static_cast<bool>(m02[6] & std::ctype_base::upper) );
- VERIFY( static_cast<bool>(m02[6] & std::ctype_base::alpha) );
- VERIFY( static_cast<bool>(m02[7] & std::ctype_base::punct) );
- VERIFY( static_cast<bool>(m02[8] & std::ctype_base::space) );
- VERIFY( gctype.is(m02[6], cc0[6]) );
- VERIFY( gctype.is(m02[7], cc0[7]) );
- VERIFY( gctype.is(m02[8], cc0[8]) );
-
- // char toupper(char c) const
- c100 = gctype.toupper(c10);
- VERIFY( c100 == c00 );
-
- // char tolower(char c) const
- c100 = gctype.tolower(c00);
- VERIFY( c100 == c10 );
-
- // char toupper(char* low, const char* hi) const
- std::char_traits<char>::copy(c_array, strlit02, len + 1);
- gctype.toupper(c_array, c_array + len);
- VERIFY( !std::char_traits<char>::compare(c_array, strlit01, len - 1) );
-
- // char tolower(char* low, const char* hi) const
- std::char_traits<char>::copy(c_array, strlit01, len + 1);
- gctype.tolower(c_array, c_array + len);
- VERIFY( !std::char_traits<char>::compare(c_array, strlit02, len - 1) );
-
-
- #ifdef DEBUG_ASSERT
- assert(test);
- #endif
- }
-
- // libstdc++/4456, libstdc++/4457, libstdc++/4458
- void test02()
- {
- using namespace std;
- typedef ctype_base::mask mask;
- typedef vector<mask> vector_type;
-
- bool test = true;
-
- // const int max = numeric_limits<char>::max();
- const int max = 255;
- const int ctype_mask_max = 10;
- vector_type v_c(max);
- vector_type v_de(max);
-
- // "C"
- locale loc_c = locale::classic();
- const ctype<char>& ctype_c = use_facet<ctype<char> >(loc_c);
- for (int i = 0; i < max; ++i)
- {
- char c = static_cast<char>(i);
- mask mask_test = static_cast<mask>(0);
- mask mask_is = static_cast<mask>(0);
- for (int j = 0; j <= ctype_mask_max; ++j)
- {
- mask_test = static_cast<mask>(1 << j);
- if (ctype_c.is(mask_test, c))
- mask_is |= mask_test;
- }
- v_c[i] = mask_is;
- }
-
- // "de_DE"
- locale loc_de("de_DE");
- const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de);
- for (int i = 0; i < max; ++i)
- {
- char c = static_cast<char>(i);
- mask mask_test = static_cast<mask>(0);
- mask mask_is = static_cast<mask>(0);
- for (int j = 0; j <= ctype_mask_max; ++j)
- {
- mask_test = static_cast<mask>(1 << j);
- if (ctype_de.is(mask_test, c))
- mask_is |= mask_test;
- }
- v_de[i] = mask_is;
- }
-
- #if QUANNUM_VERBOSE_LYRICALLY_ADEPT_BAY_AREA_MCS_MODE
- for (int i = 0; i < max; ++i)
- {
- char mark = v_c[i] == v_de[i] ? ' ' : '-';
- cout << i << ' ' << mark << ' ' << static_cast<char>(i) << '\t' ;
- cout << "v_c: " << setw(4) << v_c[i] << '\t';
- cout << "v_de: " << setw(4) << v_de[i] << endl;
- }
- cout << (v_c == v_de) << endl;
- #endif
-
- VERIFY( v_c != v_de );
- }
-
// Dietmar Kühl via Peter Schmid
class comma_ctype: public std::ctype<char>
{
--- 30,37 ----
*************** public:
*** 243,308 ****
{ classic_table(); }
};
- // Per Liboriussen <liborius@stofanet.dk>
- void test03()
- {
- bool test = true;
- std::ctype_base::mask maskdata[256];
- for (int i = 0; i < 256; ++i)
- maskdata[i] = std::ctype_base::alpha;
- std::ctype<char>* f = new std::ctype<char>(maskdata);
- std::locale global;
- std::locale loc(global, f);
- for (int i = 0; i < 256; ++i)
- {
- char ch = i;
- VERIFY( std::isalpha(ch, loc) );
- }
- }
-
- // libstdc++/5280
- void test04()
- {
- #ifdef _GLIBCPP_HAVE_SETENV
- // Set the global locale to non-"C".
- std::locale loc_de("de_DE");
- std::locale::global(loc_de);
-
- // Set LANG environment variable to de_DE.
- const char* oldLANG = getenv("LANG");
- if (!setenv("LANG", "de_DE", 1))
- {
- test01();
- test02();
- test03();
- setenv("LANG", oldLANG ? oldLANG : "", 1);
- }
- #endif
- }
-
- // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
- void test05()
- {
- bool test = true;
-
- const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
- if (tentLANG != NULL)
- {
- std::string preLANG = tentLANG;
- test01();
- test02();
- test03();
- std::string postLANG = setlocale(LC_ALL, NULL);
- VERIFY( preLANG == postLANG );
- }
- }
-
int main()
{
- test01();
- test02();
- test03();
- test04();
- test05();
return 0;
}
--- 41,47 ----
Index: testsuite/22_locale/ctype_members_wchar_t.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc,v
retrieving revision 1.7
diff -c -p -r1.7 ctype_members_wchar_t.cc
*** testsuite/22_locale/ctype_members_wchar_t.cc 13 May 2002 10:58:13 -0000 1.7
--- testsuite/22_locale/ctype_members_wchar_t.cc 24 May 2002 15:57:53 -0000
***************
*** 30,133 ****
// 22.2.1.3.2 ctype<char> members
#include <locale>
- // NB: Don't include any other headers in this file.
#include <testsuite_hooks.h>
#if _GLIBCPP_USE_WCHAR_T
- class gnu_ctype: public std::ctype<wchar_t> {};
-
void test01()
{
! bool test = true;
! typedef wchar_t char_type;
!
! const char_type strlit00[] = L"manilla, cebu, tandag PHILIPPINES";
! const char_type strlit01[] = L"MANILLA, CEBU, TANDAG PHILIPPINES";
! const char_type strlit02[] = L"manilla, cebu, tandag philippines";
! const char_type c00 = L'S';
! const char_type c10 = L's';
! const char_type c20 = L'9';
! const char_type c30 = L' ';
! const char_type c40 = L'!';
! const char_type c50 = L'F';
! const char_type c60 = L'f';
! const char_type c70 = L'X';
! const char_type c80 = L'x';
!
! gnu_ctype gctype;
! char_type c100;
! int len = std::char_traits<char_type>::length(strlit00);
! char_type c_array[len + 1];
!
! // bool is(mask m, char_type c) const;
! VERIFY( gctype.is(std::ctype_base::space, c30) );
! VERIFY( gctype.is(std::ctype_base::upper, c00) );
! VERIFY( gctype.is(std::ctype_base::lower, c10) );
! VERIFY( gctype.is(std::ctype_base::digit, c20) );
! VERIFY( gctype.is(std::ctype_base::punct, c40) );
! VERIFY( gctype.is(std::ctype_base::alpha, c50) );
! VERIFY( gctype.is(std::ctype_base::alpha, c60) );
! VERIFY( gctype.is(std::ctype_base::xdigit, c20) );
! VERIFY( !gctype.is(std::ctype_base::xdigit, c80) );
! VERIFY( gctype.is(std::ctype_base::alnum, c50) );
! VERIFY( gctype.is(std::ctype_base::alnum, c20) );
! VERIFY( gctype.is(std::ctype_base::graph, c40) );
! VERIFY( gctype.is(std::ctype_base::graph, c20) );
!
! // char_type toupper(char_type c) const
! c100 = gctype.toupper(c10);
! VERIFY( c100 == c00 );
!
! // char_type tolower(char_type c) const
! c100 = gctype.tolower(c00);
! VERIFY( c100 == c10 );
!
! // char_type toupper(char_type* low, const char_type* hi) const
! std::char_traits<char_type>::copy(c_array, strlit02, len + 1);
! gctype.toupper(c_array, c_array + len);
! VERIFY( !std::char_traits<char_type>::compare(c_array, strlit01, len - 1) );
!
! // char_type tolower(char_type* low, const char_type* hi) const
! std::char_traits<char_type>::copy(c_array, strlit01, len + 1);
! gctype.tolower(c_array, c_array + len);
! VERIFY( !std::char_traits<char_type>::compare(c_array, strlit02, len - 1) );
!
! #ifdef DEBUG_ASSERT
! assert(test);
! #endif
! }
!
! // libstdc++/5280
! void test03()
! {
! #ifdef _GLIBCPP_HAVE_SETENV
! // Set the global locale to non-"C".
! std::locale loc_de("de_DE");
! std::locale::global(loc_de);
!
! // Set LANG environment variable to de_DE.
! const char* oldLANG = getenv("LANG");
! if (!setenv("LANG", "de_DE", 1))
! {
! test01();
! setenv("LANG", oldLANG ? oldLANG : "", 1);
! }
! #endif
! }
!
! // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
! void test04()
! {
! bool test = true;
!
! const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
! if (tentLANG != NULL)
! {
! std::string preLANG = tentLANG;
! test01();
! std::string postLANG = setlocale(LC_ALL, NULL);
! VERIFY( preLANG == postLANG );
! }
}
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
--- 30,41 ----
// 22.2.1.3.2 ctype<char> members
#include <locale>
#include <testsuite_hooks.h>
#if _GLIBCPP_USE_WCHAR_T
void test01()
{
! // Nothing, right now.
}
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
*************** int main()
*** 135,142 ****
{
#if _GLIBCPP_USE_WCHAR_T
test01();
- test03();
- test04();
#endif
return 0;
--- 43,48 ----
Index: testsuite/22_locale/ctype_narrow_char.cc
===================================================================
RCS file: testsuite/22_locale/ctype_narrow_char.cc
diff -N testsuite/22_locale/ctype_narrow_char.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_narrow_char.cc 24 May 2002 15:57:53 -0000
***************
*** 0 ****
--- 1,103 ----
+ // 2002-05-24 bkoz
+
+ // Copyright (C) 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ // libstdc++/6701
+ void test01()
+ {
+ using namespace std;
+ typedef char wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ basic_string<wide_type> wide("wibble");
+ basic_string<char> narrow("wibble");
+ vector<char> narrow_chars(wide.length() + 1);
+
+ // narrow(charT c, char dfault) const
+ for (int i = 0; i < wide.length(); ++i)
+ {
+ char c = ctype_c.narrow(wide[i], dfault);
+ VERIFY( c == narrow[i] );
+ }
+
+ // narrow(const charT* low, const charT* high, char dfault, char* dest) const
+ ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);
+ VERIFY( narrow_chars[0] != dfault );
+ for (int i = 0; i < wide.length(); ++i)
+ VERIFY( narrow_chars[i] == narrow[i] );
+ }
+
+ void test02()
+ {
+ using namespace std;
+ typedef char wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ // Construct non-asci string.
+ basic_string<wide_type> wide("wibble");
+ wide += wide_type(1240);
+ wide += "kibble";
+ basic_string<char> narrow("wibble");
+ narrow += char(1240);
+ narrow += "kibble";
+ vector<char> narrow_chars(wide.length() + 1);
+
+ // narrow(charT c, char dfault) const
+ for (int i = 0; i < wide.length(); ++i)
+ {
+ char c = ctype_c.narrow(wide[i], dfault);
+ VERIFY( c == narrow[i] );
+ }
+
+ // narrow(const charT* low, const charT* high, char dfault, char* dest) const
+ ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);
+ VERIFY( narrow_chars[0] != dfault );
+ for (int i = 0; i < wide.length(); ++i)
+ VERIFY( narrow_chars[i] == narrow[i] );
+ }
+
+ int main()
+ {
+ test01();
+ test02();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_narrow_wchar_t.cc
===================================================================
RCS file: testsuite/22_locale/ctype_narrow_wchar_t.cc
diff -N testsuite/22_locale/ctype_narrow_wchar_t.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_narrow_wchar_t.cc 24 May 2002 15:57:53 -0000
***************
*** 0 ****
--- 1,103 ----
+ // 2002-05-24 bkoz
+
+ // Copyright (C) 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ // libstdc++/6701
+ void test01()
+ {
+ using namespace std;
+ typedef wchar_t wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ basic_string<wide_type> wide(L"wibble");
+ basic_string<char> narrow("wibble");
+ vector<char> narrow_chars(wide.length() + 1);
+
+ // narrow(charT c, char dfault) const
+ for (int i = 0; i < wide.length(); ++i)
+ {
+ char c = ctype_c.narrow(wide[i], dfault);
+ VERIFY( c == narrow[i] );
+ }
+
+ // narrow(const charT* low, const charT* high, char dfault, char* dest) const
+ ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);
+ VERIFY( narrow_chars[0] != dfault );
+ for (int i = 0; i < wide.length(); ++i)
+ VERIFY( narrow_chars[i] == narrow[i] );
+ }
+
+ void test02()
+ {
+ using namespace std;
+ typedef wchar_t wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ // Construct non-asci string.
+ basic_string<wide_type> wide(L"wibble");
+ wide += wide_type(1240);
+ wide += L"kibble";
+ basic_string<char> narrow("wibble");
+ narrow += dfault;
+ narrow += "kibble";
+ vector<char> narrow_chars(wide.length() + 1);
+
+ // narrow(charT c, char dfault) const
+ for (int i = 0; i < wide.length(); ++i)
+ {
+ char c = ctype_c.narrow(wide[i], dfault);
+ VERIFY( c == narrow[i] );
+ }
+
+ // narrow(const charT* low, const charT* high, char dfault, char* dest) const
+ ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);
+ VERIFY( narrow_chars[0] != dfault );
+ for (int i = 0; i < wide.length(); ++i)
+ VERIFY( narrow_chars[i] == narrow[i] );
+ }
+
+ int main()
+ {
+ test01();
+ test02();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_scan_wchar_t.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/ctype_scan_wchar_t.cc,v
retrieving revision 1.1
diff -c -p -r1.1 ctype_scan_wchar_t.cc
*** testsuite/22_locale/ctype_scan_wchar_t.cc 13 May 2002 14:24:34 -0000 1.1
--- testsuite/22_locale/ctype_scan_wchar_t.cc 24 May 2002 15:57:54 -0000
***************
*** 32,40 ****
#include <locale>
#include <testsuite_hooks.h>
- // XXX This test is not working for non-glibc locale models.
- // { dg-do run { xfail *-*-* } }
-
typedef wchar_t char_type;
typedef std::char_traits<char_type> traits_type;
class gnu_ctype: public std::ctype<char_type> { };
--- 32,37 ----
Index: testsuite/22_locale/ctype_to_char.cc
===================================================================
RCS file: testsuite/22_locale/ctype_to_char.cc
diff -N testsuite/22_locale/ctype_to_char.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_to_char.cc 24 May 2002 15:57:54 -0000
***************
*** 0 ****
--- 1,140 ----
+ // Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ typedef char char_type;
+ class gnu_ctype: public std::ctype<char_type> { };
+
+ void test01()
+ {
+ bool test = true;
+ const char_type strlit00[] = "manilla, cebu, tandag PHILIPPINES";
+ const char_type strlit01[] = "MANILLA, CEBU, TANDAG PHILIPPINES";
+ const char_type strlit02[] = "manilla, cebu, tandag philippines";
+ const char_type c00 = 'S';
+ const char_type c10 = 's';
+ const char_type c20 = '9';
+ const char_type c30 = ' ';
+ const char_type c40 = '!';
+ const char_type c50 = 'F';
+ const char_type c60 = 'f';
+ const char_type c70 = 'X';
+ const char_type c80 = 'x';
+
+ gnu_ctype gctype;
+ char_type c100;
+ int len = std::char_traits<char_type>::length(strlit00);
+ char_type c_array[len + 1];
+
+ // sanity check ctype_base::mask members
+ int i01 = std::ctype_base::space;
+ int i02 = std::ctype_base::upper;
+ int i03 = std::ctype_base::lower;
+ int i04 = std::ctype_base::digit;
+ int i05 = std::ctype_base::punct;
+ int i06 = std::ctype_base::alpha;
+ int i07 = std::ctype_base::xdigit;
+ int i08 = std::ctype_base::alnum;
+ int i09 = std::ctype_base::graph;
+ int i10 = std::ctype_base::print;
+ int i11 = std::ctype_base::cntrl;
+ int i12 = sizeof(std::ctype_base::mask);
+ VERIFY ( i01 != i02);
+ VERIFY ( i02 != i03);
+ VERIFY ( i03 != i04);
+ VERIFY ( i04 != i05);
+ VERIFY ( i05 != i06);
+ VERIFY ( i06 != i07);
+ VERIFY ( i07 != i08);
+ VERIFY ( i08 != i09);
+ VERIFY ( i09 != i10);
+ VERIFY ( i10 != i11);
+ VERIFY ( i11 != i01);
+
+ // char_type toupper(char_type c) const
+ c100 = gctype.toupper(c10);
+ VERIFY( c100 == c00 );
+
+ // char_type tolower(char_type c) const
+ c100 = gctype.tolower(c00);
+ VERIFY( c100 == c10 );
+
+ // char_type toupper(char_type* low, const char_type* hi) const
+ std::char_traits<char_type>::copy(c_array, strlit02, len + 1);
+ gctype.toupper(c_array, c_array + len);
+ VERIFY( !std::char_traits<char_type>::compare(c_array, strlit01, len - 1) );
+
+ // char_type tolower(char_type* low, const char_type* hi) const
+ std::char_traits<char_type>::copy(c_array, strlit01, len + 1);
+ gctype.tolower(c_array, c_array + len);
+ VERIFY( !std::char_traits<char_type>::compare(c_array, strlit02, len - 1) );
+ }
+
+ // libstdc++/5280
+ void test04()
+ {
+ #ifdef _GLIBCPP_HAVE_SETENV
+ // Set the global locale to non-"C".
+ std::locale loc_de("de_DE");
+ std::locale::global(loc_de);
+
+ // Set LANG environment variable to de_DE.
+ const char* oldLANG = getenv("LANG");
+ if (!setenv("LANG", "de_DE", 1))
+ {
+ test01();
+ setenv("LANG", oldLANG ? oldLANG : "", 1);
+ }
+ #endif
+ }
+
+ // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
+ void test05()
+ {
+ bool test = true;
+
+ const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
+ if (tentLANG != NULL)
+ {
+ std::string preLANG = tentLANG;
+ test01();
+ std::string postLANG = setlocale(LC_ALL, NULL);
+ VERIFY( preLANG == postLANG );
+ }
+ }
+
+ int main()
+ {
+ test01();
+ test04();
+ test05();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_to_wchar_t.cc
===================================================================
RCS file: testsuite/22_locale/ctype_to_wchar_t.cc
diff -N testsuite/22_locale/ctype_to_wchar_t.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_to_wchar_t.cc 24 May 2002 15:57:54 -0000
***************
*** 0 ****
--- 1,140 ----
+ // Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ typedef wchar_t char_type;
+ class gnu_ctype: public std::ctype<char_type> { };
+
+ void test01()
+ {
+ bool test = true;
+ const char_type strlit00[] = L"manilla, cebu, tandag PHILIPPINES";
+ const char_type strlit01[] = L"MANILLA, CEBU, TANDAG PHILIPPINES";
+ const char_type strlit02[] = L"manilla, cebu, tandag philippines";
+ const char_type c00 = L'S';
+ const char_type c10 = L's';
+ const char_type c20 = L'9';
+ const char_type c30 = L' ';
+ const char_type c40 = L'!';
+ const char_type c50 = L'F';
+ const char_type c60 = L'f';
+ const char_type c70 = L'X';
+ const char_type c80 = L'x';
+
+ gnu_ctype gctype;
+ char_type c100;
+ int len = std::char_traits<char_type>::length(strlit00);
+ char_type c_array[len + 1];
+
+ // sanity check ctype_base::mask members
+ int i01 = std::ctype_base::space;
+ int i02 = std::ctype_base::upper;
+ int i03 = std::ctype_base::lower;
+ int i04 = std::ctype_base::digit;
+ int i05 = std::ctype_base::punct;
+ int i06 = std::ctype_base::alpha;
+ int i07 = std::ctype_base::xdigit;
+ int i08 = std::ctype_base::alnum;
+ int i09 = std::ctype_base::graph;
+ int i10 = std::ctype_base::print;
+ int i11 = std::ctype_base::cntrl;
+ int i12 = sizeof(std::ctype_base::mask);
+ VERIFY ( i01 != i02);
+ VERIFY ( i02 != i03);
+ VERIFY ( i03 != i04);
+ VERIFY ( i04 != i05);
+ VERIFY ( i05 != i06);
+ VERIFY ( i06 != i07);
+ VERIFY ( i07 != i08);
+ VERIFY ( i08 != i09);
+ VERIFY ( i09 != i10);
+ VERIFY ( i10 != i11);
+ VERIFY ( i11 != i01);
+
+ // char_type toupper(char_type c) const
+ c100 = gctype.toupper(c10);
+ VERIFY( c100 == c00 );
+
+ // char_type tolower(char_type c) const
+ c100 = gctype.tolower(c00);
+ VERIFY( c100 == c10 );
+
+ // char_type toupper(char_type* low, const char_type* hi) const
+ std::char_traits<char_type>::copy(c_array, strlit02, len + 1);
+ gctype.toupper(c_array, c_array + len);
+ VERIFY( !std::char_traits<char_type>::compare(c_array, strlit01, len - 1) );
+
+ // char_type tolower(char_type* low, const char_type* hi) const
+ std::char_traits<char_type>::copy(c_array, strlit01, len + 1);
+ gctype.tolower(c_array, c_array + len);
+ VERIFY( !std::char_traits<char_type>::compare(c_array, strlit02, len - 1) );
+ }
+
+ // libstdc++/5280
+ void test04()
+ {
+ #ifdef _GLIBCPP_HAVE_SETENV
+ // Set the global locale to non-"C".
+ std::locale loc_de("de_DE");
+ std::locale::global(loc_de);
+
+ // Set LANG environment variable to de_DE.
+ const char* oldLANG = getenv("LANG");
+ if (!setenv("LANG", "de_DE", 1))
+ {
+ test01();
+ setenv("LANG", oldLANG ? oldLANG : "", 1);
+ }
+ #endif
+ }
+
+ // http://gcc.gnu.org/ml/libstdc++/2002-05/msg00038.html
+ void test05()
+ {
+ bool test = true;
+
+ const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
+ if (tentLANG != NULL)
+ {
+ std::string preLANG = tentLANG;
+ test01();
+ std::string postLANG = setlocale(LC_ALL, NULL);
+ VERIFY( preLANG == postLANG );
+ }
+ }
+
+ int main()
+ {
+ test01();
+ test04();
+ test05();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_widen_char.cc
===================================================================
RCS file: testsuite/22_locale/ctype_widen_char.cc
diff -N testsuite/22_locale/ctype_widen_char.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_widen_char.cc 24 May 2002 15:57:54 -0000
***************
*** 0 ****
--- 1,67 ----
+ // 2002-05-24 bkoz
+
+ // Copyright (C) 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ void test01()
+ {
+ using namespace std;
+ typedef char wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ basic_string<wide_type> wide("drusilla, louvinia, bayard");
+ basic_string<char> narrow("drusilla, louvinia, bayard");
+ vector<wide_type> wide_chars(narrow.length() + 1);
+
+ // widen(char c) const
+ for (int i = 0; i < narrow.length(); ++i)
+ {
+ char c = ctype_c.widen(narrow[i]);
+ VERIFY( c == wide[i] );
+ }
+
+ // widen(const char* low, const char* high, charT* dest) const
+ ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]);
+ for (int i = 0; i < narrow.length(); ++i)
+ VERIFY( wide_chars[i] == wide[i] );
+ }
+
+ int main()
+ {
+ test01();
+ return 0;
+ }
Index: testsuite/22_locale/ctype_widen_wchar_t.cc
===================================================================
RCS file: testsuite/22_locale/ctype_widen_wchar_t.cc
diff -N testsuite/22_locale/ctype_widen_wchar_t.cc
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- testsuite/22_locale/ctype_widen_wchar_t.cc 24 May 2002 15:57:54 -0000
***************
*** 0 ****
--- 1,67 ----
+ // 2002-05-24 bkoz
+
+ // Copyright (C) 2002 Free Software Foundation, Inc.
+ //
+ // 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.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ // 22.2.1.3.2 ctype<char> members
+
+ #include <locale>
+ #include <vector>
+ #include <testsuite_hooks.h>
+
+ void test01()
+ {
+ using namespace std;
+ typedef wchar_t wide_type;
+
+ bool test = true;
+ const char dfault = '?';
+ const locale loc_c = locale::classic();
+ const ctype<wide_type>& ctype_c = use_facet<ctype<wide_type> >(loc_c);
+
+ basic_string<wide_type> wide(L"drusilla, louvinia, bayard");
+ basic_string<char> narrow("drusilla, louvinia, bayard");
+ vector<wide_type> wide_chars(narrow.length() + 1);
+
+ // widen(char c) const
+ for (int i = 0; i < narrow.length(); ++i)
+ {
+ char c = ctype_c.widen(narrow[i]);
+ VERIFY( c == wide[i] );
+ }
+
+ // widen(const char* low, const char* high, charT* dest) const
+ ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]);
+ for (int i = 0; i < narrow.length(); ++i)
+ VERIFY( wide_chars[i] == wide[i] );
+ }
+
+ int main()
+ {
+ test01();
+ return 0;
+ }