mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-22 12:09:44 +08:00
def9790d51
2001-12-14 Benjamin Kosnik <bkoz@redhat.com>
Clean up initialization and simplfy caching of underlying "C"
locale objects.
* src/localename.cc (locale::_Impl::_Impl(string, size_t):
Unconditionally create __clocale object for all named locales,
including "C" and "POSIX".
* config/locale/c_locale_generic.cc
(locale::facet::_S_create_c_locale): Always set __cloc to zero.
* config/locale/c_locale_gnu.cc: Always delete.
* include/bits/localefwd.h (locale::facet::_S_c_locale): New.
* src/locale.cc (locale::classic()): Initialize
locale::facet::_S_c_locale.
(locale::facet::_S_c_locale): Define.
* include/bits/locale_facets.h: Add ctype_byname<wchar_t> ctor
specialization.
* src/locale.cc: Add definition here.
* config/os/gnu-linux/bits/ctype_inline.h: Tweak.
* config/os/gnu-linux/bits/ctype_noninline.h: Adjust initializations.
* include/bits/locale_facets.h (ctype<char>::_M_c_locale_ctype): Add.
Adjust ctors, dtors.
(ctype<char>::_M_toupper): Remove const&.
(ctype<char>::_M_tolower): Remove const&.
(ctype<char>::_M_ctable): Remove const&.
* include/bits/locale_facets.h (collate): Clean up initialization
of _M_c_locale_collate in ctors and dtors.
* config/locale/collate_members_gnu.cc: Always use extended
functions.
* include/bits/locale_facets.h (messages): Clean up inits in ctor/dtor.
(messages_byname): Same.
* config/locale/messages_members_generic.h (messages::~messages):
Remove.
* config/locale/messages_members_gnu.h: Same.
* include/bits/localefwd.h: Clean. Move dtor definitions to
* src/locale.cc: Here.
* testsuite/22_locale/facet.cc: Fix spelling.
Named locale support for ctype<wchar_t>.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add variable
ctype_members_* bits.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (sources): Add ctype.cc.
* src/Makefile.in: Regenerate.
* config/locale/ctype_members_generic.cc: New file.
* config/locale/ctype_members_gnu.cc: New file.
* src/locale.cc: Remove ctype<wchart_t> definitions.
From-SVN: r48034
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
// std::messages implementation details, GNU version -*- C++ -*-
|
|
|
|
// Copyright (C) 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.7.1.2 messages virtual functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
// Non-virtual member functions.
|
|
template<typename _CharT>
|
|
messages<_CharT>::catalog
|
|
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
|
|
const char* __dir) const
|
|
{
|
|
bindtextdomain(__s.c_str(), __dir);
|
|
return this->do_open(__s, __loc);
|
|
}
|
|
|
|
template<typename _CharT>
|
|
messages<_CharT>::catalog
|
|
messages<_CharT>::do_open(const basic_string<char>& __s,
|
|
const locale&) const
|
|
{
|
|
// No error checking is done, assume the catalog exists and can
|
|
// be used.
|
|
textdomain(__s.c_str());
|
|
return 0;
|
|
}
|
|
|
|
template<typename _CharT>
|
|
messages<_CharT>::string_type
|
|
messages<_CharT>::do_get(catalog, int, int,
|
|
const string_type& __dfault) const
|
|
{
|
|
#if 0
|
|
// Requires glibc 2.3
|
|
__c_locale __old = uselocale(_M_c_locale_messages);
|
|
char* __msg = gettext(_M_convert_to_char(__dfault));
|
|
uselocale(__old);
|
|
return _M_convert_from_char(__msg);
|
|
#else
|
|
setlocale(LC_ALL, _M_name_messages);
|
|
char* __msg = gettext(_M_convert_to_char(__dfault));
|
|
return _M_convert_from_char(__msg);
|
|
#endif
|
|
}
|
|
|
|
template<typename _CharT>
|
|
void
|
|
messages<_CharT>::do_close(catalog) const
|
|
{ }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|