[PATCH] codecvt<wchar_t, char, mbstate_t> support for UTF-8
Pétur Runólfsson
peturr02@ru.is
Sun Jan 26 17:08:00 GMT 2003
Hi,
This patch changes codecvt<wchar_t, char, mbstate_t> to use MB_CUR_MAX to
determine the return values of do_encoding() and do_max_length(). With this
patch the return values should be correct for stateless encodings (in
particular for UTF-8 and single-byte encodings such as ISO-8859-1).
I've added tests that test the functions encoding(), in() and max_length()
against the locales en_US.ISO-8859-1, en_US.ISO-8859-15 and en_US.UTF-8.
I also removed a lot of unused variables and typedefs from the existing
tests.
The patch breaks the tests
22_locale/codecvt/{encoding,max_length}/wchar_t/wrapped_locale.cc
These tests try to run tests made for the "C" locale (single-byte encoding)
in the locale ja_JP.eucjp, which seems to use a multibyte encoding (at
least MB_CUR_MAX == 3). If this locale should be tested, it needs its own
tests.
Tested on linux on x86 with glibc-2.3
Regards,
Petur
2003-01-26 Petur Runolfsson <peturr02@ru.is>
* src/codecvt.cc
(codecvt<wchar_t, char, mbstate_t>::encoding, max_length):
Use MB_CUR_MAX and move...
* config/locale/generic/codecvt_members.cc: ...here.
* config/locale/gnu/codecvt_members.cc: ...and here.
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc:
Cleanup and check for correct return value from encoding
for "C" locale.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: New test.
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/config/locale/generic/codecvt_members.cc gcc-20030120/libstdc++-v3/config/locale/generic/codecvt_members.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/config/locale/generic/codecvt_members.cc 2002-09-11 03:36:44.000000000 +0000
--- gcc-20030120/libstdc++-v3/config/locale/generic/codecvt_members.cc 2003-01-25 21:04:07.000000000 +0000
***************
*** 34,39 ****
--- 34,40 ----
// Written by Benjamin Kosnik <bkoz@redhat.com>
#include <locale>
+ #include <cstdlib>
#include "c++locale_internal.h"
namespace std
*************** namespace std
*** 97,101 ****
--- 98,120 ----
return __ret;
}
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_encoding() const throw()
+ {
+ int __ret = 0;
+ if (MB_CUR_MAX == 1)
+ __ret = 1;
+ return __ret;
+ }
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_max_length() const throw()
+ {
+ int __ret = MB_CUR_MAX;
+ return __ret;
+ }
#endif
}
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/config/locale/gnu/codecvt_members.cc gcc-20030120/libstdc++-v3/config/locale/gnu/codecvt_members.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/config/locale/gnu/codecvt_members.cc 2002-09-11 03:36:44.000000000 +0000
--- gcc-20030120/libstdc++-v3/config/locale/gnu/codecvt_members.cc 2003-01-25 21:04:05.000000000 +0000
***************
*** 34,39 ****
--- 34,40 ----
// Written by Benjamin Kosnik <bkoz@redhat.com>
#include <locale>
+ #include <cstdlib>
#include "c++locale_internal.h"
namespace std
*************** namespace std
*** 109,113 ****
--- 110,144 ----
return __ret;
}
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_encoding() const throw()
+ {
+ int __ret = 0;
+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
+ #endif
+ if (MB_CUR_MAX == 1)
+ __ret = 1;
+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ __uselocale(__old);
+ #endif
+ return __ret;
+ }
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_max_length() const throw()
+ {
+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
+ #endif
+ int __ret = MB_CUR_MAX;
+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ __uselocale(__old);
+ #endif
+ return __ret;
+ }
#endif
}
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/src/codecvt.cc gcc-20030120/libstdc++-v3/src/codecvt.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/src/codecvt.cc 2003-01-08 20:20:03.000000000 +0000
--- gcc-20030120/libstdc++-v3/src/codecvt.cc 2003-01-25 21:04:07.000000000 +0000
*************** namespace std
*** 142,152 ****
return noconv;
}
- int
- codecvt<wchar_t, char, mbstate_t>::
- do_encoding() const throw()
- { return sizeof(wchar_t); }
-
bool
codecvt<wchar_t, char, mbstate_t>::
do_always_noconv() const throw()
--- 142,147 ----
*************** namespace std
*** 157,166 ****
do_length(const state_type&, const extern_type* __from,
const extern_type* __end, size_t __max) const
{ return min(__max, static_cast<size_t>(__end - __from)); }
-
- int
- codecvt<wchar_t, char, mbstate_t>::
- do_max_length() const throw()
- { return 1; }
#endif // _GLIBCPP_USE_WCHAR_T
} // namespace std
--- 152,156 ----
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/1.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/1.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/1.cc 2003-01-25 19:12:24.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/1.cc 2003-01-25 20:20:46.000000000 +0000
***************
*** 23,72 ****
#include <locale>
#include <testsuite_hooks.h>
- // Need to explicitly set the state(mbstate_t) to zero.
- // How to do this is not specified by the ISO C99 standard, so we
- // might need to add some operators to make the intuiative case
- // work:
- // w_codecvt::state_type state00;
- // state00 = 0;
- // or, can use this explicit "C" initialization:
- // w_codecvt::state_type state01 = {0, 0};
- // .. except Ulrich says: Use memset. Always use memset. Feel the force...
- void
- zero_state(std::mbstate_t& state)
- { std::memset(&state, 0, sizeof(std::mbstate_t)); }
-
// Required instantiation
// codecvt<wchar_t, char, mbstate_t>
void test01()
{
using namespace std;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
- typedef codecvt_base::result result;
- typedef wchar_t int_type;
- typedef char ext_type;
- typedef char_traits<wchar_t> int_traits;
- typedef char_traits<char> ext_traits;
-
bool test = true;
- const ext_type* e_lit = "black pearl jasmine tea";
- const ext_type* efrom_next;
- const int_type* i_lit = L"black pearl jasmine tea";
- const int_type* ifrom_next;
- int size = strlen(e_lit);
- ext_type* e_arr = new ext_type[size + 1];
- ext_type* eto_next;
- int_type* i_arr = new int_type[size + 1];
- int_type* ito_next;
locale loc;
const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
int i = cvt->encoding();
! VERIFY( i == 4 ); // Target-dependent.
!
! delete [] e_arr;
! delete [] i_arr;
}
int main ()
--- 23,41 ----
#include <locale>
#include <testsuite_hooks.h>
// Required instantiation
// codecvt<wchar_t, char, mbstate_t>
void test01()
{
using namespace std;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
bool test = true;
locale loc;
const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
int i = cvt->encoding();
! VERIFY( i == 1 ); // Target-dependent.
}
int main ()
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc 2003-01-25 20:46:20.000000000 +0000
***************
*** 0 ****
--- 1,46 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ bool test = true;
+
+ locale loc ("en_US.ISO-8859-1");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int i = cvt->encoding();
+ VERIFY( i == 1 ); // ISO-8859-1 is a single-byte encoding
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc 2003-01-25 20:46:19.000000000 +0000
***************
*** 0 ****
--- 1,46 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ bool test = true;
+
+ locale loc ("en_US.ISO-8859-15");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int i = cvt->encoding();
+ VERIFY( i == 1 ); // ISO-8859-15 is a single-byte encoding
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc 2003-01-25 20:46:19.000000000 +0000
***************
*** 0 ****
--- 1,46 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ bool test = true;
+
+ locale loc ("en_US.UTF-8");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int i = cvt->encoding();
+ VERIFY( i == 0 ); // UTF-8 is a stateless multibyte encoding
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc 2003-01-25 19:12:24.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc 2003-01-26 08:51:27.000000000 +0000
*************** void test01()
*** 46,61 ****
typedef wchar_t int_type;
typedef char ext_type;
typedef char_traits<wchar_t> int_traits;
- typedef char_traits<char> ext_traits;
bool test = true;
const ext_type* e_lit = "black pearl jasmine tea";
const ext_type* efrom_next;
const int_type* i_lit = L"black pearl jasmine tea";
- const int_type* ifrom_next;
int size = strlen(e_lit);
- ext_type* e_arr = new ext_type[size + 1];
- ext_type* eto_next;
int_type* i_arr = new int_type[size + 1];
int_type* ito_next;
--- 46,57 ----
*************** void test01()
*** 72,78 ****
VERIFY( efrom_next == e_lit + size );
VERIFY( ito_next == i_arr + size );
- delete [] e_arr;
delete [] i_arr;
}
--- 68,73 ----
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc 2003-01-26 09:15:17.000000000 +0000
***************
*** 0 ****
--- 1,107 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Need to explicitly set the state(mbstate_t) to zero.
+ // How to do this is not specified by the ISO C99 standard, so we
+ // might need to add some operators to make the intuiative case
+ // work:
+ // w_codecvt::state_type state00;
+ // state00 = 0;
+ // or, can use this explicit "C" initialization:
+ // w_codecvt::state_type state01 = {0, 0};
+ // .. except Ulrich says: Use memset. Always use memset. Feel the force...
+ void
+ zero_state(std::mbstate_t& state)
+ { std::memset(&state, 0, sizeof(std::mbstate_t)); }
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ typedef codecvt_base::result result;
+ typedef wchar_t int_type;
+ typedef char ext_type;
+ typedef char_traits<wchar_t> int_traits;
+
+ bool test = true;
+ const ext_type* e_lit =
+ "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13"
+ "\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20!\"#$%&"
+ "'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
+ "abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86"
+ "\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95"
+ "\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4"
+ "\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3"
+ "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2"
+ "\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1"
+ "\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"
+ "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+ "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe"
+ "\xff";
+
+ const ext_type* efrom_next;
+ const int_type* i_lit =
+ L"\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13"
+ "\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20!\"#$%&"
+ "'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
+ "abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86"
+ "\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95"
+ "\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4"
+ "\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3"
+ "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2"
+ "\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1"
+ "\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"
+ "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+ "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe"
+ "\xff";
+
+ int size = strlen(e_lit);
+ int_type* i_arr = new int_type[size + 1];
+ int_type* ito_next;
+
+ locale loc ("en_US.ISO-8859-1");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ // in
+ w_codecvt::state_type state01;
+ zero_state(state01);
+ result r1 = cvt->in(state01, e_lit, e_lit + size, efrom_next,
+ i_arr, i_arr + size, ito_next);
+ VERIFY( r1 == codecvt_base::ok );
+ VERIFY( !int_traits::compare(i_arr, i_lit, size) );
+ VERIFY( efrom_next == e_lit + size );
+ VERIFY( ito_next == i_arr + size );
+
+ delete [] i_arr;
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc 2003-01-26 09:30:24.000000000 +0000
***************
*** 0 ****
--- 1,121 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Need to explicitly set the state(mbstate_t) to zero.
+ // How to do this is not specified by the ISO C99 standard, so we
+ // might need to add some operators to make the intuiative case
+ // work:
+ // w_codecvt::state_type state00;
+ // state00 = 0;
+ // or, can use this explicit "C" initialization:
+ // w_codecvt::state_type state01 = {0, 0};
+ // .. except Ulrich says: Use memset. Always use memset. Feel the force...
+ void
+ zero_state(std::mbstate_t& state)
+ { std::memset(&state, 0, sizeof(std::mbstate_t)); }
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ typedef codecvt_base::result result;
+ typedef wchar_t int_type;
+ typedef char ext_type;
+ typedef char_traits<wchar_t> int_traits;
+
+ bool test = true;
+ const ext_type* e_lit =
+ "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13"
+ "\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20!\"#$%&"
+ "'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
+ "abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86"
+ "\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95"
+ "\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4"
+ "\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3"
+ "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2"
+ "\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1"
+ "\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"
+ "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+ "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe"
+ "\xff";
+
+ const ext_type* efrom_next;
+ const int_type i_lit[] = {
+ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc,
+ 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, L'!',
+ L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+',
+ L',', L'-', L'.', L'/', L'0', L'1', L'2', L'3', L'4', L'5',
+ L'6', L'7', L'8', L'9', L':', L';', L'<', L'=', L'>', L'?',
+ L'@', L'A', L'B', L'C', L'D', L'E', L'F', L'G', L'H', L'I',
+ L'J', L'K', L'L', L'M', L'N', L'O', L'P', L'Q', L'R', L'S',
+ L'T', L'U', L'V', L'W', L'X', L'Y', L'Z', L'[', L'\\', L']',
+ L'^', L'_', L'`', L'a', L'b', L'c', L'd', L'e', L'f', L'g',
+ L'h', L'i', L'j', L'k', L'l', L'm', L'n', L'o', L'p', L'q',
+ L'r', L's', L't', L'u', L'v', L'w', L'x', L'y', L'z', L'{',
+ L'|', L'}', L'~', 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
+ 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+ 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
+ 0x20ac, 0xa5, 0x160, 0xa7, 0x161, 0xa9, 0xaa, 0xab, 0xac, 0xad,
+ 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0x17d, 0xb5, 0xb6, 0xb7,
+ 0x17e, 0xb9, 0xba, 0xbb, 0x152, 0x153, 0x178, 0xbf, 0xc0, 0xc1,
+ 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb,
+ 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5,
+ 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+ 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3,
+ 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd,
+ 0xfe, 0xff, 0x0
+ };
+
+ int size = strlen(e_lit);
+ int_type* i_arr = new int_type[size + 1];
+ int_type* ito_next;
+
+ locale loc ("en_US.ISO-8859-15");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ // in
+ w_codecvt::state_type state01;
+ zero_state(state01);
+ result r1 = cvt->in(state01, e_lit, e_lit + size, efrom_next,
+ i_arr, i_arr + size, ito_next);
+ VERIFY( r1 == codecvt_base::ok );
+ VERIFY( !int_traits::compare(i_arr, i_lit, size) );
+ VERIFY( efrom_next == e_lit + size );
+ VERIFY( ito_next == i_arr + size );
+
+ delete [] i_arr;
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc 2003-01-26 10:50:12.000000000 +0000
***************
*** 0 ****
--- 1,128 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Need to explicitly set the state(mbstate_t) to zero.
+ // How to do this is not specified by the ISO C99 standard, so we
+ // might need to add some operators to make the intuiative case
+ // work:
+ // w_codecvt::state_type state00;
+ // state00 = 0;
+ // or, can use this explicit "C" initialization:
+ // w_codecvt::state_type state01 = {0, 0};
+ // .. except Ulrich says: Use memset. Always use memset. Feel the force...
+ void
+ zero_state(std::mbstate_t& state)
+ { std::memset(&state, 0, sizeof(std::mbstate_t)); }
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+ typedef codecvt_base::result result;
+ typedef wchar_t int_type;
+ typedef char ext_type;
+ typedef char_traits<wchar_t> int_traits;
+
+ bool test = true;
+ const ext_type* e_lit =
+ "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13"
+ "\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20!\"#$%&"
+ "'()*+,-./0123456789:;<=>?@}~\x7f\xc2\x80\xc2\x81\xc2\x82\xc2"
+ "\x83\xc2\x84\xc2\x85\xc2\x86\xc2\x87\xc2\x88\xc2\x89\xc2\x8a"
+ "\xc2\x8b\xc2\x8c\xc2\x8d\xc2\x8e\xc2\x8f\xc2\x90\xc2\x91\xc2"
+ "\x92\xc2\x93\xc2\x94\xc2\x95\xc2\x96\xc2\x97\xc2\x98\xc2\x99"
+ "\xc2\x9a\xc2\x9b\xc2\x9c\xc3\xba\xc3\xbb\xc3\xbc\xc3\xbd\xc3"
+ "\xbe\xc3\xbf\xc4\x80\xc4\x81\xc4\x82\xc4\x83\xc4\x84\xc4\x85"
+ "\xc4\x86\xc4\x87\xc4\x88\xc4\x89\xc4\x8a\xc4\x8b\xc4\x8c\xc4"
+ "\x8d\xc4\x8e\xc4\x8f\xc4\x90\xc4\x91\xc4\x92\xc4\x93\xc4\x94"
+ "\xc4\x95\xc4\x96\xc4\x97\xc4\x98\xc4\x99\xdf\xb8\xdf\xb9\xdf"
+ "\xba\xdf\xbb\xdf\xbc\xdf\xbd\xdf\xbe\xdf\xbf\xe0\xa0\x80\xe0"
+ "\xa0\x81\xe0\xa0\x82\xe0\xa0\x83\xe0\xa0\x84\xe0\xa0\x85\xe0"
+ "\xa0\x86\xe0\xa0\x87\xe0\xa0\x88\xe0\xa0\x89\xe0\xa0\x8a\xe0"
+ "\xa0\x8b\xe0\xa0\x8c\xe0\xa0\x8d\xe0\xa0\x8e\xe0\xa0\x8f\xe0"
+ "\xa0\x90\xe0\xa0\x91\xe0\xa0\x92\xe0\xa0\x93\xe0\xa0\x94\xe0"
+ "\xa0\x95\xe0\xa0\x96\xe0\xa0\x97\x1\x2\x4\x8\x10\x20@\xc2\x80"
+ "\xc4\x80\xc8\x80\xd0\x80\xe0\xa0\x80\xe1\x80\x80\xe2\x80\x80"
+ "\xe4\x80\x80\xe8\x80\x80\xf0\x90\x80\x80\xf0\xa0\x80\x80\xf1"
+ "\x80\x80\x80\xf2\x80\x80\x80\xf4\x80\x80\x80\xf8\x88\x80\x80"
+ "\x80\xf8\x90\x80\x80\x80\xf8\xa0\x80\x80\x80\xf9\x80\x80\x80"
+ "\x80\xfa\x80\x80\x80\x80\xfc\x84\x80\x80\x80\x80\xfc\x88\x80"
+ "\x80\x80\x80\xfc\x90\x80\x80\x80\x80\xfc\xa0\x80\x80\x80\x80"
+ "\xfd\x80\x80\x80\x80\x80";
+
+ const ext_type* efrom_next;
+ const int_type i_lit[] = {
+ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc,
+ 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, L'!',
+ L'"', L'#', L'$', L'%', L'&', L'\'', L'(', L')', L'*', L'+',
+ L',', L'-', L'.', L'/', L'0', L'1', L'2', L'3', L'4', L'5',
+ L'6', L'7', L'8', L'9', L':', L';', L'<', L'=', L'>', L'?',
+ L'@', L'}', L'~', 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
+ 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+ 0x9a, 0x9b, 0x9c, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x100,
+ 0x101, 0x102, 0x103, 0x104, 0x105, 0x106, 0x107, 0x108, 0x109,
+ 0x10a, 0x10b, 0x10c, 0x10d, 0x10e, 0x10f, 0x110, 0x111, 0x112,
+ 0x113, 0x114, 0x115, 0x116, 0x117, 0x118, 0x119, 0x7f8, 0x7f9,
+ 0x7fa, 0x7fb, 0x7fc, 0x7fd, 0x7fe, 0x7ff, 0x800, 0x801, 0x802,
+ 0x803, 0x804, 0x805, 0x806, 0x807, 0x808, 0x809, 0x80a, 0x80b,
+ 0x80c, 0x80d, 0x80e, 0x80f, 0x810, 0x811, 0x812, 0x813, 0x814,
+ 0x815, 0x816, 0x817, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, L'@',
+ 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000,
+ 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000,
+ 0x800000, 0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000,
+ 0x20000000, 0x40000000, 0x0
+ };
+
+ int esize = strlen(e_lit);
+ int isize = wcslen(i_lit);
+ int_type* i_arr = new int_type[isize + 1];
+ int_type* ito_next;
+
+ locale loc ("en_US.UTF-8");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ // in
+ w_codecvt::state_type state01;
+ zero_state(state01);
+ result r1 = cvt->in(state01, e_lit, e_lit + esize, efrom_next,
+ i_arr, i_arr + isize, ito_next);
+ VERIFY( r1 == codecvt_base::ok );
+ VERIFY( !int_traits::compare(i_arr, i_lit, isize) );
+ VERIFY( efrom_next == e_lit + esize );
+ VERIFY( ito_next == i_arr + isize );
+
+ delete [] i_arr;
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/1.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/1.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/1.cc 2003-01-25 19:12:24.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/1.cc 2003-01-25 20:55:42.000000000 +0000
***************
*** 23,73 ****
#include <locale>
#include <testsuite_hooks.h>
-
- // Need to explicitly set the state(mbstate_t) to zero.
- // How to do this is not specified by the ISO C99 standard, so we
- // might need to add some operators to make the intuiative case
- // work:
- // w_codecvt::state_type state00;
- // state00 = 0;
- // or, can use this explicit "C" initialization:
- // w_codecvt::state_type state01 = {0, 0};
- // .. except Ulrich says: Use memset. Always use memset. Feel the force...
- void
- zero_state(std::mbstate_t& state)
- { std::memset(&state, 0, sizeof(std::mbstate_t)); }
-
// Required instantiation
// codecvt<wchar_t, char, mbstate_t>
void test01()
{
using namespace std;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
- typedef codecvt_base::result result;
- typedef wchar_t int_type;
- typedef char ext_type;
- typedef char_traits<wchar_t> int_traits;
- typedef char_traits<char> ext_traits;
-
- bool test = true;
- const ext_type* e_lit = "black pearl jasmine tea";
- const ext_type* efrom_next;
- const int_type* i_lit = L"black pearl jasmine tea";
- const int_type* ifrom_next;
- int size = strlen(e_lit);
- ext_type* e_arr = new ext_type[size + 1];
- ext_type* eto_next;
- int_type* i_arr = new int_type[size + 1];
- int_type* ito_next;
locale loc;
const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
int k = cvt->max_length();
VERIFY( k == 1 );
-
- delete [] e_arr;
- delete [] i_arr;
}
int main ()
--- 23,40 ----
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc 2003-01-25 20:56:54.000000000 +0000
***************
*** 0 ****
--- 1,45 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+
+ locale loc ("en_US.ISO-8859-1");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int k = cvt->max_length();
+ VERIFY( k == 1 ); // ISO-8859-1 is a single-byte encoding
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc 2003-01-25 20:58:28.000000000 +0000
***************
*** 0 ****
--- 1,45 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+
+ locale loc ("en_US.ISO-8859-15");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int k = cvt->max_length();
+ VERIFY( k == 1 ); // ISO-8859-15 is a single-byte encoding
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
diff -c3prN /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc
*** /home/petur/tmp/gcc-20030120-patched/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc 1970-01-01 00:00:00.000000000 +0000
--- gcc-20030120/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc 2003-01-25 20:59:58.000000000 +0000
***************
*** 0 ****
--- 1,47 ----
+ // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
+
+ // Copyright (C) 2000, 2002, 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.1.5 - Template class codecvt [lib.locale.codecvt]
+
+ #include <locale>
+ #include <testsuite_hooks.h>
+
+ // Required instantiation
+ // codecvt<wchar_t, char, mbstate_t>
+ void test01()
+ {
+ using namespace std;
+ typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
+
+ locale loc ("en_US.UTF-8");
+ locale::global(loc);
+ const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
+
+ int k = cvt->max_length();
+ // Each UCS-4 wide character can be converted to at most 6 narrow
+ // characters in the UTF-8 encoding.
+ VERIFY( k == 6 );
+ }
+
+ int main ()
+ {
+ test01();
+ return 0;
+ }
More information about the Libstdc++
mailing list