codecvt.h: Implement codecvt<wchar_t, char, mbstate_t>.
2000-08-21 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * bits/codecvt.h: Implement codecvt<wchar_t, char, mbstate_t>. Fix up __enc_traits template so as to be marginally useful. * src/codecvt.cc: And here. * bits/char_traits: Tweak. * bits/locale_facets.h: Tweak. * bits/locale_facets.tcc: Tweak. * bits/localefwd.h: Tweak. * src/locale-inst.cc: Add use_facet/has_facet instantiations here. * testsuite/22_locale/codecvt_wchar_t_cc.cc: New file. * testsuite/22_locale/codecvt_char_char.cc: New file. * testsuite/22_locale/codecvt_unicode_char.cc: New file. From-SVN: r35871
This commit is contained in:
Benjamin Kosnik
parent
a5834d1b79
commit
6f322d2778
|
|
@ -0,0 +1,90 @@
|
|||
// 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
|
||||
|
||||
// Copyright (C) 2000 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 <debug_assert.h>
|
||||
|
||||
// Required instantiation, degenerate conversion.
|
||||
// codecvt<char, char, mbstate_t>
|
||||
void test01()
|
||||
{
|
||||
using namespace std;
|
||||
typedef codecvt_base::result result;
|
||||
typedef codecvt<char, char, mbstate_t> c_codecvt;
|
||||
|
||||
bool test = true;
|
||||
const char* c_lit = "black pearl jasmine tea";
|
||||
const char* from_next;
|
||||
int size = 25;
|
||||
char* c_arr = new char[size];
|
||||
char* to_next;
|
||||
|
||||
locale loc;
|
||||
c_codecvt::state_type state;
|
||||
const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
|
||||
|
||||
// in
|
||||
result r1 = cvt->in(state, c_lit, c_lit + size, from_next,
|
||||
c_arr, c_arr + size, to_next);
|
||||
VERIFY( r1 == codecvt_base::noconv );
|
||||
VERIFY( !strcmp(c_arr, c_lit) );
|
||||
VERIFY( from_next == c_lit );
|
||||
VERIFY( to_next == c_arr );
|
||||
|
||||
// out
|
||||
result r2 = cvt->out(state, c_lit, c_lit + size, from_next,
|
||||
c_arr, c_arr + size, to_next);
|
||||
VERIFY( r2 == codecvt_base::noconv );
|
||||
VERIFY( !strcmp(c_arr, c_lit) );
|
||||
VERIFY( from_next == c_lit );
|
||||
VERIFY( to_next == c_arr );
|
||||
|
||||
// unshift
|
||||
strcpy(c_arr, c_lit);
|
||||
result r3 = cvt->unshift(state, c_arr, c_arr + size, to_next);
|
||||
VERIFY( r3 == codecvt_base::noconv );
|
||||
VERIFY( !strcmp(c_arr, c_lit) );
|
||||
VERIFY( to_next == c_arr );
|
||||
|
||||
int i = cvt->encoding();
|
||||
VERIFY( i == 1 );
|
||||
|
||||
VERIFY( cvt->always_noconv() );
|
||||
|
||||
int j = cvt->length(state, c_lit, c_lit + size, 5);
|
||||
VERIFY( j == 5 );
|
||||
|
||||
int k = cvt->max_length();
|
||||
VERIFY( k == 1 );
|
||||
|
||||
delete [] c_arr;
|
||||
}
|
||||
|
||||
int main ()
|
||||
{
|
||||
test01();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,176 @@
|
|||
// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com>
|
||||
|
||||
// Copyright (C) 2000 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 <debug_assert.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/*
|
||||
> how do I check that these conversions are correct?
|
||||
Very easy. Since all the characters are from ASCII you simply
|
||||
zero-extend the values.
|
||||
|
||||
drepper$ echo 'black pearl jasmine tea' | od -t x1
|
||||
0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d
|
||||
0000020 69 6e 65 20 74 65 61 0a
|
||||
|
||||
So the UCS-2 string is
|
||||
|
||||
0x0062, 0x006c, 0x0061, ...
|
||||
|
||||
You get the idea. With iconv() you have to take care of the
|
||||
byte-order, though. UCS-2 can mean little- or big endian. Looking at
|
||||
your result
|
||||
|
||||
> $9 = 25856
|
||||
|
||||
it shows that the other byte-order is used (25856 == 0x6500).
|
||||
*/
|
||||
|
||||
#if 0
|
||||
void
|
||||
create_internal_literal(unsigned short* i_lit)
|
||||
{
|
||||
i_lit[00] = 25088; //b
|
||||
i_lit[01] = 27648; //l
|
||||
i_lit[02] = 24832; //a
|
||||
i_lit[03] = 25344; //c
|
||||
i_lit[04] = 27392; //k
|
||||
i_lit[05] = 8192;
|
||||
i_lit[06] = 28672; //p
|
||||
i_lit[07] = 25856; //e
|
||||
i_lit[08] = 24832; //a
|
||||
i_lit[09] = 29148; //r
|
||||
i_lit[10] = 27648; //l
|
||||
i_lit[11] = 8192;
|
||||
i_lit[12] = 27136; //j
|
||||
i_lit[13] = 24832;
|
||||
i_lit[14] = 29440;
|
||||
i_lit[15] = 27904;
|
||||
i_lit[16] = 26880;
|
||||
i_lit[17] = 28160;
|
||||
i_lit[18] = 25856; //e
|
||||
i_lit[19] = 8192;
|
||||
i_lit[20] = 29696; //t
|
||||
i_lit[21] = 25856; //e
|
||||
i_lit[22] = 24832; //a
|
||||
i_lit[23] = 2560;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
initialize_state(__enc_traits& state)
|
||||
{ state._M_init(); }
|
||||
|
||||
// Partial specialization using __enc_traits.
|
||||
// codecvt<unicode_t, char, __enc_traits>
|
||||
void test01()
|
||||
{
|
||||
typedef codecvt_base::result result;
|
||||
typedef unsigned short unicode_t;
|
||||
typedef unicode_t int_type;
|
||||
typedef char ext_type;
|
||||
typedef __enc_traits enc_type;
|
||||
typedef codecvt<int_type, ext_type, enc_type> unicode_codecvt;
|
||||
typedef char_traits<int_type> int_traits;
|
||||
typedef char_traits<ext_type> ext_traits;
|
||||
|
||||
bool test = true;
|
||||
const ext_type* e_lit = "black pearl jasmine tea";
|
||||
const ext_type* efrom_next;
|
||||
const int_type* ifrom_next;
|
||||
int size = strlen(e_lit);
|
||||
|
||||
int_type i_lit_base[24] =
|
||||
{ 25088, 27648, 24832, 25344, 27392, 8192, 28672, 25856, 24832, 29184,
|
||||
27648, 8192, 27136, 24832, 29440, 27904, 26880, 28160, 25856, 8192, 29696,
|
||||
25856, 24832, 2560
|
||||
};
|
||||
const int_type* i_lit = i_lit_base;
|
||||
|
||||
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;
|
||||
|
||||
// construct a locale object with the specialized facet.
|
||||
locale loc(locale::classic(), new unicode_codecvt);
|
||||
// sanity check the constructed locale has the specialized facet.
|
||||
VERIFY( has_facet<unicode_codecvt>(loc) );
|
||||
const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc);
|
||||
|
||||
// in
|
||||
unicode_codecvt::state_type state01("UNICODE", "ISO_8859-1");
|
||||
initialize_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 );
|
||||
|
||||
// out
|
||||
unicode_codecvt::state_type state02;
|
||||
initialize_state(state02);
|
||||
result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next,
|
||||
e_arr, e_arr + size, eto_next);
|
||||
VERIFY( r2 == codecvt_base::ok );
|
||||
VERIFY( !ext_traits::compare(e_arr, e_lit, size) );
|
||||
VERIFY( ifrom_next == i_lit + size );
|
||||
VERIFY( eto_next == e_arr + size );
|
||||
|
||||
// unshift
|
||||
ext_traits::copy(e_arr, e_lit, size);
|
||||
unicode_codecvt::state_type state03;
|
||||
initialize_state(state03);
|
||||
result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
|
||||
VERIFY( r3 == codecvt_base::noconv );
|
||||
VERIFY( !ext_traits::compare(e_arr, e_lit, size) );
|
||||
VERIFY( eto_next == e_arr );
|
||||
|
||||
int i = cvt.encoding();
|
||||
VERIFY( i == 0 );
|
||||
|
||||
VERIFY( !cvt.always_noconv() );
|
||||
|
||||
unicode_codecvt::state_type state04;
|
||||
initialize_state(state04);
|
||||
int j = cvt.length(state03, e_lit, e_lit + size, 5);
|
||||
VERIFY( j == 5 );
|
||||
|
||||
int k = cvt.max_length();
|
||||
VERIFY( k == 1 );
|
||||
|
||||
delete [] e_arr;
|
||||
delete [] i_arr;
|
||||
}
|
||||
|
||||
int main ()
|
||||
{
|
||||
test01();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
// 2000-08-18 Benjamin Kosnik <bkoz@cygnus.com>
|
||||
|
||||
// Copyright (C) 2000 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 <debug_assert.h>
|
||||
|
||||
|
||||
// Need to explicitly set the state(mbstate_t) to zero.
|
||||
// How to do this is not specified by the ISO C9X 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(mbstate_t& state)
|
||||
{ memset(&state, 0, sizeof(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);
|
||||
|
||||
// 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 );
|
||||
|
||||
// out
|
||||
w_codecvt::state_type state02;
|
||||
zero_state(state02);
|
||||
result r2 = cvt->out(state02, i_lit, i_lit + size, ifrom_next,
|
||||
e_arr, e_arr + size, eto_next);
|
||||
VERIFY( r2 == codecvt_base::ok );
|
||||
VERIFY( !ext_traits::compare(e_arr, e_lit, size) );
|
||||
VERIFY( ifrom_next == i_lit + size );
|
||||
VERIFY( eto_next == e_arr + size );
|
||||
|
||||
// unshift
|
||||
strcpy(e_arr, e_lit);
|
||||
w_codecvt::state_type state03;
|
||||
zero_state(state03);
|
||||
result r3 = cvt->unshift(state03, e_arr, e_arr + size, eto_next);
|
||||
VERIFY( r3 == codecvt_base::noconv );
|
||||
VERIFY( !strcmp(e_arr, e_lit) );
|
||||
VERIFY( eto_next == e_arr );
|
||||
|
||||
int i = cvt->encoding();
|
||||
VERIFY( i == 0 );
|
||||
|
||||
VERIFY( !cvt->always_noconv() );
|
||||
|
||||
w_codecvt::state_type state04;
|
||||
zero_state(state04);
|
||||
int j = cvt->length(state03, e_lit, e_lit + size, 5);
|
||||
VERIFY( j == 5 );
|
||||
|
||||
int k = cvt->max_length();
|
||||
VERIFY( k == 1 );
|
||||
|
||||
delete [] e_arr;
|
||||
delete [] i_arr;
|
||||
}
|
||||
|
||||
int main ()
|
||||
{
|
||||
test01();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue