0214010c60
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale:🆔:id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
205 lines
6.5 KiB
C++
205 lines
6.5 KiB
C++
// Wrapper for underlying C-language localization -*- 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.8 Standard locale categories.
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <locale>
|
|
#include <stdexcept>
|
|
#include <langinfo.h>
|
|
|
|
namespace std
|
|
{
|
|
void
|
|
locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s)
|
|
{
|
|
// XXX
|
|
// perhaps locale::categories could be made equivalent to LC_*_MASK
|
|
// _M_c_locale = __newlocale(1 << LC_ALL, __str.c_str(), NULL);
|
|
// _M_c_locale = __newlocale(locale::all, __str.c_str(), NULL);
|
|
__cloc = __newlocale(LC_ALL, __s, NULL);
|
|
if (!__cloc)
|
|
{
|
|
// This named locale is not supported by the underlying OS.
|
|
throw runtime_error("attempt to create locale from unknown name");
|
|
}
|
|
}
|
|
|
|
void
|
|
locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
|
|
{
|
|
if (__cloc)
|
|
__freelocale(__cloc);
|
|
}
|
|
|
|
template<>
|
|
void
|
|
numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_decimal_point = '.';
|
|
_M_thousands_sep = ',';
|
|
_M_grouping = "";
|
|
}
|
|
else
|
|
{
|
|
// Named locale.
|
|
_M_decimal_point = *(__nl_langinfo_l(RADIXCHAR, __cloc));
|
|
_M_thousands_sep = *(__nl_langinfo_l(THOUSEP, __cloc));
|
|
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
|
|
}
|
|
// NB: There is no way to extact this info from posix locales.
|
|
// _M_truename = __nl_langinfo_l(YESSTR, __cloc);
|
|
_M_truename = "true";
|
|
// _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
|
|
_M_falsename = "false";
|
|
}
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template<>
|
|
void
|
|
numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_decimal_point = L'.';
|
|
_M_thousands_sep = L',';
|
|
_M_grouping = "";
|
|
}
|
|
else
|
|
{
|
|
// Named locale.
|
|
_M_decimal_point = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc));
|
|
_M_thousands_sep = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc));
|
|
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
|
|
}
|
|
// NB: There is no way to extact this info from posix locales.
|
|
// _M_truename = __nl_langinfo_l(YESSTR, __cloc);
|
|
_M_truename = L"true";
|
|
// _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
|
|
_M_falsename = L"false";
|
|
}
|
|
#endif
|
|
|
|
template<>
|
|
void
|
|
moneypunct<char>::_M_initialize_moneypunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_decimal_point = '.';
|
|
_M_thousands_sep = ',';
|
|
_M_grouping = "";
|
|
_M_curr_symbol = string_type();
|
|
_M_positive_sign = string_type();
|
|
_M_negative_sign = string_type();
|
|
_M_frac_digits = 0;
|
|
_M_pos_format = money_base::_S_default_pattern;
|
|
_M_neg_format = money_base::_S_default_pattern;
|
|
}
|
|
else
|
|
{
|
|
// Named locale.
|
|
_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, __cloc));
|
|
_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, __cloc));
|
|
_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
|
|
_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
|
|
_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
|
|
if (intl)
|
|
{
|
|
_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
|
|
_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc));
|
|
char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES,
|
|
__cloc));
|
|
char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
|
|
char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
|
|
_M_pos_format = _S_construct_pattern(__ppreceeds, __pspace,
|
|
__pposn);
|
|
char __npreceeds = *(__nl_langinfo_l(__INT_N_CS_PRECEDES,
|
|
__cloc));
|
|
char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
|
|
char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
|
|
_M_neg_format = _S_construct_pattern(__npreceeds, __nspace,
|
|
__nposn);
|
|
}
|
|
else
|
|
{
|
|
_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
|
|
_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
|
|
char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
|
|
char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
|
|
char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
|
|
_M_pos_format = _S_construct_pattern(__ppreceeds, __pspace,
|
|
__pposn);
|
|
char __npreceeds = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
|
|
char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
|
|
char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
|
|
_M_neg_format = _S_construct_pattern(__npreceeds, __nspace,
|
|
__nposn);
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template<>
|
|
void
|
|
moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale /*__cloc*/)
|
|
{
|
|
// XXX implement
|
|
// "C" locale
|
|
_M_decimal_point = L'.';
|
|
_M_thousands_sep = L',';
|
|
_M_grouping = "";
|
|
_M_curr_symbol = string_type();
|
|
_M_positive_sign = string_type();
|
|
_M_negative_sign = string_type();
|
|
_M_frac_digits = 0;
|
|
_M_pos_format = money_base::_S_default_pattern;
|
|
_M_neg_format = money_base::_S_default_pattern;
|
|
}
|
|
#endif
|
|
} // namespace std
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|