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
91 lines
2.8 KiB
C++
91 lines
2.8 KiB
C++
// 2001-07-17 Benjamin Kosnik <bkoz@redhat.com>
|
||
|
||
// Copyright (C) 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.7.1.1 messages members
|
||
|
||
#include <locale>
|
||
#include <testsuite_hooks.h>
|
||
|
||
// XXX This test is not working for non-glibc locale models.
|
||
// { dg-do run { xfail *-*-* } }
|
||
|
||
void test01()
|
||
{
|
||
using namespace std;
|
||
typedef std::messages<char>::catalog catalog;
|
||
typedef std::messages<char>::string_type string_type;
|
||
|
||
bool test = true;
|
||
// This is exported through RUNTESTFLAGS in testsuite/Makefile.am.
|
||
const char* dir = LOCALEDIR;
|
||
|
||
// basic construction
|
||
locale loc_c = locale::classic();
|
||
locale loc_us("en_US");
|
||
locale loc_fr("fr_FR");
|
||
locale loc_de("de_DE");
|
||
VERIFY( loc_c != loc_de );
|
||
VERIFY( loc_us != loc_fr );
|
||
VERIFY( loc_us != loc_de );
|
||
VERIFY( loc_de != loc_fr );
|
||
|
||
// cache the messages facets
|
||
const messages<char>& mssg_c = use_facet<messages<char> >(loc_c);
|
||
const messages<char>& mssg_us = use_facet<messages<char> >(loc_us);
|
||
const messages<char>& mssg_fr = use_facet<messages<char> >(loc_fr);
|
||
const messages<char>& mssg_de = use_facet<messages<char> >(loc_de);
|
||
|
||
// catalog open(const string&, const locale&) const;
|
||
// string_type get(catalog, int, int, const string_type& ) const;
|
||
// void close(catalog) const;
|
||
|
||
// Check German (de_DE) locale.
|
||
catalog cat_de = mssg_de.open("libstdc++", loc_c, dir);
|
||
string s01 = mssg_de.get(cat_de, 0, 0, "please");
|
||
string s02 = mssg_de.get(cat_de, 0, 0, "thank you");
|
||
VERIFY ( s01 == "bitte" );
|
||
VERIFY ( s02 == "danke" );
|
||
mssg_de.close(cat_de);
|
||
|
||
// Check French (fr_FR) locale.
|
||
catalog cat_fr = mssg_fr.open("libstdc++", loc_c, dir);
|
||
s01 = mssg_fr.get(cat_fr, 0, 0, "please");
|
||
s02 = mssg_fr.get(cat_fr, 0, 0, "thank you");
|
||
VERIFY ( s01 == "s'il vous pla<6C>t" );
|
||
VERIFY ( s02 == "merci" );
|
||
mssg_fr.close(cat_fr);
|
||
|
||
// Check US (en_US) locale.
|
||
catalog cat_us = mssg_fr.open("libstdc++", loc_c, dir);
|
||
s01 = mssg_us.get(cat_us, 0, 0, "please");
|
||
s02 = mssg_us.get(cat_us, 0, 0, "thank you");
|
||
VERIFY ( s01 == "please" );
|
||
VERIFY ( s02 == "thank you" );
|
||
mssg_us.close(cat_us);
|
||
|
||
}
|
||
|
||
int main()
|
||
{
|
||
test01();
|
||
|
||
return 0;
|
||
}
|