mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-29 21:15:50 +08:00
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
309 lines
9.0 KiB
C++
309 lines
9.0 KiB
C++
// Locale support (codecvt) -*- C++ -*-
|
|
|
|
// Copyright (C) 2000, 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
|
|
// 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.
|
|
|
|
//
|
|
// ISO C++ 14882: 22.2.1.5 Template class codecvt
|
|
//
|
|
|
|
// Warning: this file is not meant for user inclusion. Use <locale>.
|
|
|
|
// Written by Benjamin Kosnik <bkoz@cygnus.com>
|
|
|
|
#ifndef _CPP_BITS_CODECVT_H
|
|
#define _CPP_BITS_CODECVT_H 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
// 22.2.1.5 Template class codecvt
|
|
class codecvt_base
|
|
{
|
|
public:
|
|
enum result
|
|
{
|
|
ok,
|
|
partial,
|
|
error,
|
|
noconv
|
|
};
|
|
};
|
|
|
|
// Template class __codecvt_abstract_base
|
|
// NB: An abstract base class that fills in the public inlines, so
|
|
// that the specializations don't have to re-copy the public
|
|
// interface.
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
class __codecvt_abstract_base
|
|
: public locale::facet, public codecvt_base
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef codecvt_base::result result;
|
|
typedef _InternT intern_type;
|
|
typedef _ExternT extern_type;
|
|
typedef _StateT state_type;
|
|
|
|
// 22.2.1.5.1 codecvt members
|
|
result
|
|
out(state_type& __state, const intern_type* __from,
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const
|
|
{
|
|
return this->do_out(__state, __from, __from_end, __from_next,
|
|
__to, __to_end, __to_next);
|
|
}
|
|
|
|
result
|
|
unshift(state_type& __state, extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const
|
|
{ return this->do_unshift(__state, __to,__to_end,__to_next); }
|
|
|
|
result
|
|
in(state_type& __state, const extern_type* __from,
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
intern_type* __to, intern_type* __to_end,
|
|
intern_type*& __to_next) const
|
|
{
|
|
return this->do_in(__state, __from, __from_end, __from_next,
|
|
__to, __to_end, __to_next);
|
|
}
|
|
|
|
int
|
|
encoding() const throw()
|
|
{ return this->do_encoding(); }
|
|
|
|
bool
|
|
always_noconv() const throw()
|
|
{ return this->do_always_noconv(); }
|
|
|
|
int
|
|
length(const state_type& __state, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const
|
|
{ return this->do_length(__state, __from, __end, __max); }
|
|
|
|
int
|
|
max_length() const throw()
|
|
{ return this->do_max_length(); }
|
|
|
|
protected:
|
|
explicit
|
|
__codecvt_abstract_base(size_t __refs = 0) : locale::facet(__refs) { }
|
|
|
|
virtual
|
|
~__codecvt_abstract_base() { }
|
|
|
|
virtual result
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const = 0;
|
|
|
|
virtual result
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
extern_type* __to_end, extern_type*& __to_next) const = 0;
|
|
|
|
virtual result
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
intern_type* __to, intern_type* __to_end,
|
|
intern_type*& __to_next) const = 0;
|
|
|
|
virtual int
|
|
do_encoding() const throw() = 0;
|
|
|
|
virtual bool
|
|
do_always_noconv() const throw() = 0;
|
|
|
|
virtual int
|
|
do_length(const state_type&, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const = 0;
|
|
|
|
virtual int
|
|
do_max_length() const throw() = 0;
|
|
};
|
|
|
|
// 22.2.1.5 Template class codecvt
|
|
// NB: Generic, mostly useless implementation.
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
class codecvt
|
|
: public __codecvt_abstract_base<_InternT, _ExternT, _StateT>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef codecvt_base::result result;
|
|
typedef _InternT intern_type;
|
|
typedef _ExternT extern_type;
|
|
typedef _StateT state_type;
|
|
|
|
// Data Members:
|
|
static locale::id id;
|
|
|
|
explicit
|
|
codecvt(size_t __refs = 0)
|
|
: __codecvt_abstract_base<_InternT,_ExternT,_StateT> (__refs) { }
|
|
|
|
protected:
|
|
virtual
|
|
~codecvt() { }
|
|
};
|
|
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
locale::id codecvt<_InternT, _ExternT, _StateT>::id;
|
|
|
|
// codecvt<char, char, mbstate_t> required specialization
|
|
template<>
|
|
class codecvt<char, char, mbstate_t>
|
|
: public __codecvt_abstract_base<char, char, mbstate_t>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef char intern_type;
|
|
typedef char extern_type;
|
|
typedef mbstate_t state_type;
|
|
|
|
// Data Members:
|
|
static locale::id id;
|
|
|
|
explicit
|
|
codecvt(size_t __refs = 0);
|
|
|
|
protected:
|
|
virtual
|
|
~codecvt();
|
|
|
|
virtual result
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
extern_type* __to_end, extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
intern_type* __to, intern_type* __to_end,
|
|
intern_type*& __to_next) const;
|
|
|
|
virtual int
|
|
do_encoding() const throw();
|
|
|
|
virtual bool
|
|
do_always_noconv() const throw();
|
|
|
|
virtual int
|
|
do_length(const state_type&, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
virtual int
|
|
do_max_length() const throw();
|
|
};
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
// codecvt<wchar_t, char, mbstate_t> required specialization
|
|
template<>
|
|
class codecvt<wchar_t, char, mbstate_t>
|
|
: public __codecvt_abstract_base<wchar_t, char, mbstate_t>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef wchar_t intern_type;
|
|
typedef char extern_type;
|
|
typedef mbstate_t state_type;
|
|
|
|
// Data Members:
|
|
static locale::id id;
|
|
|
|
explicit
|
|
codecvt(size_t __refs = 0);
|
|
|
|
protected:
|
|
virtual
|
|
~codecvt();
|
|
|
|
virtual result
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_unshift(state_type& __state,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_in(state_type& __state,
|
|
const extern_type* __from, const extern_type* __from_end,
|
|
const extern_type*& __from_next,
|
|
intern_type* __to, intern_type* __to_end,
|
|
intern_type*& __to_next) const;
|
|
|
|
virtual
|
|
int do_encoding() const throw();
|
|
|
|
virtual
|
|
bool do_always_noconv() const throw();
|
|
|
|
virtual
|
|
int do_length(const state_type&, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
virtual int
|
|
do_max_length() const throw();
|
|
};
|
|
#endif //_GLIBCPP_USE_WCHAR_T
|
|
|
|
// 22.2.1.6 Template class codecvt_byname
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT>
|
|
{
|
|
public:
|
|
explicit
|
|
codecvt_byname(const char*, size_t __refs = 0)
|
|
: codecvt<_InternT, _ExternT, _StateT>(__refs) { }
|
|
protected:
|
|
virtual
|
|
~codecvt_byname() { }
|
|
};
|
|
|
|
// Include host and configuration specific partial specializations
|
|
// with additional functionality, if possible.
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
#include <bits/codecvt_specializations.h>
|
|
#endif
|
|
|
|
#endif // _CPP_BITS_CODECVT_H
|
|
|
|
|
|
|
|
|