33590f13b2
2001-08-07 Benjamin Kosnik <bkoz@redhat.com> Implement std::messages. Make config a fully-nested directory. * config/locale: New directory. * config/c_locale_generic.cc: Move into locale subdirectory. * config/c_locale_generic.h: Same. * config/c_locale_gnu.cc: Same. * config/c_locale_gnu.h: Same. * config/c_locale_ieee_1003.1-200x.cc: Same. * config/c_locale_ieee_1003.1-200x_.h: Same. * config/codecvt_specializations_generic.h: Same. * config/codecvt_specializations_ieee_1003.1-200x.h: Same. * config/messages_members_gnu.h: Same. * config/messaages_members_gnu.cc: Same. * config/messages_members_generic.h: Same. * config/messaages_members_generic.cc: Same. * config/messages_members_ieee_1003.1-200x.h: Same. * config/messaages_members_ieee_1003.1-200x.cc: Same. * config/io: New directory. * config/basic_file_libio.h: Move into io subdirectory. * config/basic_file_libio.cc: Same. * config/c_io_libio.h: Same. * config/c_io_libio_codecvt.c: Same. * config/basic_file_stdio.h: Same. * config/basic_file_stdio.cc: Same. * config/c_io_stdio.h: Same. * po: New directory. * po/POTFILES.in: New file. * po/Makefile.am: New file. * po/Makefile.in: New file. * po/libstdc++.pot: Generic translation file. * po/fr.po: Preliminary French translation. * po/de.po: Preliminary German translation. * intl: New directory. * intl/Makefile.am: New file. * intl/Makefile.in: New file. * intl/string_literals.cc: New file. * acinclude.m4 (GLIBCPP_CONFIGURE): Bump VERSION to 3.1.0. Add requisite setup for gettext. Re-arrange. * aclocal.m4: Regenerate. * configure.in: Don't call GLIBCPP_CHECK_COMPILER_VERSION. Output Makefile bits for po and intl. * configure: Regenerate. * Makefile.am (SUBDIRS): Add intl, po. Add rule for dist. * Makefile.in: Regenerate. * acconfig.h: Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY. * config.h.in: Regenerate. * acinclude.m4 (AC_REPLACE_STRINGFUNCS): Remove. * include/Makefile.am (install-data-local): Don't install Makefile. * include/Makefile.in: Regenerate. * include/bits/locale_facet.h (locale::facet::_S_clone_c_locale): Add member. * config/locale/c_locale_gnu.cc (_S_clone_c_locale): Add definition. * config/locale/c_locale_generic.cc: Same. * config/locale/c_locale_ieee_1003.1-200x.cc: Same. * include/bits/codecvt.h: Excise non-standard, non-required bits. This includes __enc_traits, and partial specializations of codecvt for __enc_traits. * src/codecvt.cc (__enc_traits::_S_max_size): Guard * config/codecvt_partials_ieee_1003.1-200x.h: New file. * config/codecvt_partials_generic.h: New file. * include/Makefile.am (allstamps): Add stamp-codecvt_model. (stamp-codecvt_model): Add. * include/Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in codecvt configury. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/22_locale/codecvt_unicode_wchar_t.cc: Use macro guard. * testsuite/22_locale/codecvt_unicode_char.cc: Same. * testsuite/22_locale/ctor_copy_dtor.cc: And here. * include/bits/localefwd.h (class locale::facet): Add __enc_traits as a friend for _S_*_c_locale functions. * include/bits/codecvt.h (__enc_traits::__enc_traits): Add locale argument to default constructor so that CODESET information can be deduced. * include/bits/locale_facets.h (messages_byname): Re-implement. Remove specializations. * src/locale.cc (messages_byname<char>): Remove specialization. (messages_byname<wchar_t>): Same. * config/locale/c_locale_ieee_1003.1-200x.cc: New file. * config/locale/c_locale_ieee_1003.1-200x.h: New file. * config/locale/messages_members_ieee_1003.1-200x.cc: New file. * config/locale/messages_members_ieee_1003.1-200x.h: New file. * config/locale/messages_members_gnu.cc: New file. * config/locale/messages_members_gnu.h: New file. * config/locale/messages_members_generic.cc: New file. * config/locale/messages_members_generic.h: New file. * docs/html/configopts.html: Add documentation for new locale model, ieee_1003.1. Adjust other flags for current defaults. * docs/html/22_locale/locale.html: Update. * docs/html/22_locale/howto.html: Add link to messages.html. Organize. * docs/html/22_locale/messages.html: New. * src/Makefile.am (sources): Add messages_virtuals.cc. * src/Makefile.in: Regenerate. * include/Makefile.am (allstamps): Add stamp-messages_model. (stamp-messages_model): Add. * include/Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in messages configury. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite_flags.in (--cxxflags): Add LOCALEDIR. * testsuite/lib/libstdc++-v3-dg.exp: Remove broken LD_LIBRARY_PATH bits for Irix. * acinclude (GLIBCPP_ENABLE_CLOCALE): Set glibcpp_localedir to the build directories message catalog base directory, and export. Eventually this should probably be made to deal with build and install directories. For now, punt on this as the library itself doesn't use message catalogs (yet). * testsuite/22_locale/messages.cc: New file. * testsuite/22_locale/messages_char_members.cc: New file. * testsuite/22_locale/messages_byname.cc: New file. From-SVN: r44702
240 lines
7.4 KiB
C++
240 lines
7.4 KiB
C++
// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com>
|
|
|
|
// Copyright (C) 2000, 2001 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>
|
|
|
|
using namespace std;
|
|
|
|
#ifdef _GLIBCPP_USE___ENC_TRAITS
|
|
|
|
/*
|
|
> 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).
|
|
*/
|
|
|
|
|
|
void
|
|
initialize_state(__enc_traits& state)
|
|
{ state._M_init(); }
|
|
|
|
// Partial specialization using __enc_traits.
|
|
// codecvt<unicode_t, char, __enc_traits>
|
|
// UNICODE - UCS2 (big endian)
|
|
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";
|
|
int size = strlen(e_lit);
|
|
|
|
int_type i_lit_base[25] =
|
|
{
|
|
0x6200, 0x6c00, 0x6100, 0x6300, 0x6b00, 0x2000, 0x7000, 0x6500, 0x6100,
|
|
0x7200, 0x6c00, 0x2000, 0x6a00, 0x6100, 0x7300, 0x6d00, 0x6900, 0x6e00,
|
|
0x6500, 0x2000, 0x7400, 0x6500, 0x6100, 0xa000
|
|
};
|
|
const int_type* i_lit = i_lit_base;
|
|
|
|
const ext_type* efrom_next;
|
|
const int_type* ifrom_next;
|
|
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("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
|
|
initialize_state(state01);
|
|
// internal encoding is bigger because of bom
|
|
result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next,
|
|
i_arr, i_arr + size + 1, 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("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
|
|
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("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
|
|
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("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
|
|
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;
|
|
}
|
|
|
|
// Partial specialization using __enc_traits.
|
|
// codecvt<unicode_t, char, __enc_traits>
|
|
// UNICODE - UCS2 (little endian)
|
|
void test02()
|
|
{
|
|
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";
|
|
int size = strlen(e_lit);
|
|
|
|
int_type i_lit_base[25] =
|
|
{
|
|
0x0062, 0x006c, 0x0061, 0x0063, 0x006b, 0x0020, 0x0070, 0x0065, 0x0061,
|
|
0x0072, 0x006c, 0x0020, 0x006a, 0x0061, 0x0073, 0x006d, 0x0069, 0x006e,
|
|
0x0065, 0x0020, 0x0074, 0x0065, 0x0061, 0x00a0
|
|
};
|
|
const int_type* i_lit = i_lit_base;
|
|
|
|
const ext_type* efrom_next;
|
|
const int_type* ifrom_next;
|
|
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("UCS-2LE", "ISO-8859-15", 0xfeff, 0);
|
|
initialize_state(state01);
|
|
// internal encoding is bigger because of bom
|
|
result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next,
|
|
i_arr, i_arr + size + 1, 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("UCS-2LE", "ISO-8859-15", 0xfeff, 0);
|
|
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("UCS-2LE", "ISO-8859-15", 0xfeff, 0);
|
|
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("UCS-2LE", "ISO-8859-15", 0xfeff, 0);
|
|
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;
|
|
}
|
|
|
|
#endif // _GLIBCPP_USE___ENC_TRAITS
|
|
|
|
int main ()
|
|
{
|
|
#if _GLIBCPP_USE___ENC_TRAITS
|
|
test01();
|
|
test02();
|
|
#endif
|
|
|
|
return 0;
|
|
}
|