diff options
Diffstat (limited to 'contrib/libstdc++/src/locale.cc')
| -rw-r--r-- | contrib/libstdc++/src/locale.cc | 626 |
1 files changed, 216 insertions, 410 deletions
diff --git a/contrib/libstdc++/src/locale.cc b/contrib/libstdc++/src/locale.cc index 17ccdc2..623eb26 100644 --- a/contrib/libstdc++/src/locale.cc +++ b/contrib/libstdc++/src/locale.cc @@ -1,4 +1,4 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -28,22 +28,14 @@ #include <clocale> #include <cstring> +#include <cstdlib> // For getenv #include <cctype> #include <cwctype> // For towupper, etc. #include <locale> #include <bits/atomicity.h> -namespace __gnu_cxx -{ - // Defined in globals.cc. - extern std::locale c_locale; - extern std::locale::_Impl c_locale_impl; -} // namespace __gnu_cxx - namespace std { - using namespace __gnu_cxx; - // Definitions for static const data members of locale. const locale::category locale::none; const locale::category locale::ctype; @@ -54,116 +46,18 @@ namespace std const locale::category locale::messages; const locale::category locale::all; - // In the future, GLIBCXX_ABI > 5 should remove all uses of - // _GLIBCPP_ASM_SYMVER in this file, and remove exports of any - // static data members of locale. - locale::_Impl* locale::_S_classic; + // These are no longer exported. + locale::_Impl* locale::_S_classic; locale::_Impl* locale::_S_global; const size_t locale::_S_categories_size; - _GLIBCPP_ASM_SYMVER(_ZNSt6locale18_S_categories_sizeE, _ZNSt6locale17_S_num_categoriesE, GLIBCPP_3.2) - const size_t locale::_S_extra_categories_size; - - // Definitions for static const data members of locale::id - _Atomic_word locale::id::_S_highwater; // init'd to 0 by linker - - // Definitions for static const data members of locale::_Impl - const locale::id* const - locale::_Impl::_S_id_ctype[] = - { - &std::ctype<char>::id, - &codecvt<char, char, mbstate_t>::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &std::ctype<wchar_t>::id, - &codecvt<wchar_t, char, mbstate_t>::id, -#endif - 0 - }; - - const locale::id* const - locale::_Impl::_S_id_numeric[] = - { - &num_get<char>::id, - &num_put<char>::id, - &numpunct<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &num_get<wchar_t>::id, - &num_put<wchar_t>::id, - &numpunct<wchar_t>::id, -#endif - 0 - }; - - const locale::id* const - locale::_Impl::_S_id_collate[] = - { - &std::collate<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &std::collate<wchar_t>::id, -#endif - 0 - }; - - const locale::id* const - locale::_Impl::_S_id_time[] = - { - &__timepunct<char>::id, - &time_get<char>::id, - &time_put<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &__timepunct<wchar_t>::id, - &time_get<wchar_t>::id, - &time_put<wchar_t>::id, -#endif - 0 - }; - - const locale::id* const - locale::_Impl::_S_id_monetary[] = - { - &money_get<char>::id, - &money_put<char>::id, - &moneypunct<char, false>::id, - &moneypunct<char, true >::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &money_get<wchar_t>::id, - &money_put<wchar_t>::id, - &moneypunct<wchar_t, false>::id, - &moneypunct<wchar_t, true >::id, -#endif - 0 - }; - const locale::id* const - locale::_Impl::_S_id_messages[] = - { - &std::messages<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T - &std::messages<wchar_t>::id, +#ifdef __GTHREADS + __gthread_once_t locale::_S_once = __GTHREAD_ONCE_INIT; #endif - 0 - }; - - const locale::id* const* const - locale::_Impl::_S_facet_categories[] = - { - // Order must match the decl order in class locale. - locale::_Impl::_S_id_ctype, - locale::_Impl::_S_id_numeric, - locale::_Impl::_S_id_collate, - locale::_Impl::_S_id_time, - locale::_Impl::_S_id_monetary, - locale::_Impl::_S_id_messages, - 0 - }; - - locale::locale() throw() - { - _S_initialize(); - (_M_impl = _S_global)->_M_add_reference(); - } locale::locale(const locale& __other) throw() - { (_M_impl = __other._M_impl)->_M_add_reference(); } + : _M_impl(__other._M_impl) + { _M_impl->_M_add_reference(); } // This is used to initialize global and classic locales, and // assumes that the _Impl objects are constructed correctly. @@ -171,141 +65,22 @@ namespace std locale::locale(_Impl* __ip) throw() : _M_impl(__ip) { } - locale::locale(const char* __s) - { - if (__s) - { - _S_initialize(); - if (strcmp(__s, "C") == 0 || strcmp(__s, "POSIX") == 0) - (_M_impl = _S_classic)->_M_add_reference(); - else if (strcmp(__s, "") != 0) - _M_impl = new _Impl(__s, 1); - else - { - // Get it from the environment. - char* __env = getenv("LC_ALL"); - // If LC_ALL is set we are done. - if (__env && strcmp(__env, "") != 0) - { - if (strcmp(__env, "C") == 0 || strcmp(__env, "POSIX") == 0) - (_M_impl = _S_classic)->_M_add_reference(); - else - _M_impl = new _Impl(__env, 1); - } - else - { - char* __res; - // LANG may set a default different from "C". - char* __env = getenv("LANG"); - if (!__env || strcmp(__env, "") == 0 || strcmp(__env, "C") == 0 - || strcmp(__env, "POSIX") == 0) - __res = strdup("C"); - else - __res = strdup(__env); - - // Scan the categories looking for the first one - // different from LANG. - size_t __i = 0; - if (strcmp(__res, "C") == 0) - for (; __i < _S_categories_size - + _S_extra_categories_size; ++__i) - { - __env = getenv(_S_categories[__i]); - if (__env && strcmp(__env, "") != 0 - && strcmp(__env, "C") != 0 - && strcmp(__env, "POSIX") != 0) - break; - } - else - for (; __i < _S_categories_size - + _S_extra_categories_size; ++__i) - { - __env = getenv(_S_categories[__i]); - if (__env && strcmp(__env, "") != 0 - && strcmp(__env, __res) != 0) - break; - } - - // If one is found, build the complete string of - // the form LC_CTYPE=xxx;LC_NUMERIC=yyy; and so on... - if (__i < _S_categories_size + _S_extra_categories_size) - { - string __str; - for (size_t __j = 0; __j < __i; ++__j) - { - __str += _S_categories[__j]; - __str += '='; - __str += __res; - __str += ';'; - } - __str += _S_categories[__i]; - __str += '='; - __str += __env; - __str += ';'; - __i++; - for (; __i < _S_categories_size - + _S_extra_categories_size; ++__i) - { - __env = getenv(_S_categories[__i]); - if (!__env || strcmp(__env, "") == 0) - { - __str += _S_categories[__i]; - __str += '='; - __str += __res; - __str += ';'; - } - else if (strcmp(__env, "C") == 0 - || strcmp(__env, "POSIX") == 0) - { - __str += _S_categories[__i]; - __str += "=C;"; - } - else - { - __str += _S_categories[__i]; - __str += '='; - __str += __env; - __str += ';'; - } - } - __str.erase(__str.end() - 1); - _M_impl = new _Impl(__str.c_str(), 1); - } - // ... otherwise either an additional instance of - // the "C" locale or LANG. - else if (strcmp(__res, "C") == 0) - (_M_impl = _S_classic)->_M_add_reference(); - else - _M_impl = new _Impl(__res, 1); - free(__res); - } - } - } - else - __throw_runtime_error("attempt to create locale from NULL name"); - } - - locale::locale(const locale& __base, const char* __s, category __cat) - { - // NB: There are complicated, yet more efficient ways to do - // this. Building up locales on a per-category way is tedious, so - // let's do it this way until people complain. - locale __add(__s); - _M_coalesce(__base, __add, __cat); - } - - locale::locale(const locale& __base, const locale& __add, category __cat) - { _M_coalesce(__base, __add, __cat); } - locale::~locale() throw() { _M_impl->_M_remove_reference(); } bool locale::operator==(const locale& __rhs) const throw() { - string __name = this->name(); - return (_M_impl == __rhs._M_impl - || (__name != "*" && __name == __rhs.name())); + bool __ret = false; + if (_M_impl == __rhs._M_impl) + __ret = true; + else + { + const string __name = this->name(); + if (__name != "*" && __name == __rhs.name()) + __ret = true; + } + return __ret; } const locale& @@ -317,26 +92,6 @@ namespace std return *this; } - locale - locale::global(const locale& __other) - { - // XXX MT - _S_initialize(); - _Impl* __old = _S_global; - __other._M_impl->_M_add_reference(); - _S_global = __other._M_impl; - if (_S_global->_M_check_same_name() - && (strcmp(_S_global->_M_names[0], "*") != 0)) - setlocale(LC_ALL, __other.name().c_str()); - - // Reference count sanity check: one reference removed for the - // subsition of __other locale, one added by return-by-value. Net - // difference: zero. When the returned locale object's destrutor - // is called, then the reference count is decremented and possibly - // destroyed. - return locale(__old); - } - string locale::name() const { @@ -348,9 +103,7 @@ namespace std __ret += _S_categories[0]; __ret += '='; __ret += _M_impl->_M_names[0]; - for (size_t __i = 1; - __i < _S_categories_size + _S_extra_categories_size; - ++__i) + for (size_t __i = 1; __i < _S_categories_size; ++__i) { __ret += ';'; __ret += _S_categories[__i]; @@ -361,49 +114,6 @@ namespace std return __ret; } - const locale& - locale::classic() - { - // Locking protocol: singleton-called-before-threading-starts - if (!_S_classic) - { - try - { - // 26 Standard facets, 2 references. - // One reference for _S_classic, one for _S_global - _S_classic = new (&c_locale_impl) _Impl(0, 2, true); - _S_global = _S_classic; - new (&c_locale) locale(_S_classic); - } - catch(...) - { - // Just call destructor, so that locale_impl_c's memory is - // not deallocated via a call to delete. - if (_S_classic) - _S_classic->~_Impl(); - _S_classic = _S_global = 0; - __throw_exception_again; - } - } - return c_locale; - } - - void - locale::_M_coalesce(const locale& __base, const locale& __add, - category __cat) - { - __cat = _S_normalize_category(__cat); - _M_impl = new _Impl(*__base._M_impl, 1); - - try - { _M_impl->_M_replace_categories(__add._M_impl, __cat); } - catch (...) - { - _M_impl->_M_remove_reference(); - __throw_exception_again; - } - } - locale::category locale::_S_normalize_category(category __cat) { @@ -430,7 +140,7 @@ namespace std case LC_TIME: __ret = time; break; -#ifdef _GLIBCPP_HAVE_LC_MESSAGES +#ifdef _GLIBCXX_HAVE_LC_MESSAGES case LC_MESSAGES: __ret = messages; break; @@ -439,129 +149,225 @@ namespace std __ret = all; break; default: - __throw_runtime_error("bad locale category"); + __throw_runtime_error(__N("locale::_S_normalize_category " + "category not found")); } } return __ret; } - __c_locale - locale::facet::_S_c_locale; - - char locale::facet::_S_c_name[2]; + // locale::facet + __c_locale locale::facet::_S_c_locale; - locale::facet:: - ~facet() { } + const char locale::facet::_S_c_name[2] = "C"; - locale::facet:: - facet(size_t __refs) throw() : _M_references(__refs ? 1 : 0) - { } +#ifdef __GTHREADS + __gthread_once_t locale::facet::_S_once = __GTHREAD_ONCE_INIT; +#endif - void - locale::facet:: - _M_add_reference() throw() - { __atomic_add(&_M_references, 1); } + void + locale::facet::_S_initialize_once() + { + // Initialize the underlying locale model. + _S_create_c_locale(_S_c_locale, _S_c_name); + } - void - locale::facet:: - _M_remove_reference() throw() + __c_locale + locale::facet::_S_get_c_locale() { - if (__exchange_and_add(&_M_references, -1) == 1) +#ifdef __GHTREADS + if (__gthread_active_p()) + __gthread_once(&_S_once, _S_initialize_once); + else +#endif { - try - { delete this; } - catch (...) - { } + if (!_S_c_locale) + _S_initialize_once(); } + return _S_c_locale; } - - locale::id::id() - { } - // Definitions for static const data members of time_base - template<> - const char* - __timepunct<char>::_S_timezones[14] = - { - "GMT", "HST", "AKST", "PST", "MST", "CST", "EST", "AST", "NST", "CET", - "IST", "EET", "CST", "JST" - }; - -#ifdef _GLIBCPP_USE_WCHAR_T - template<> - const wchar_t* - __timepunct<wchar_t>::_S_timezones[14] = - { - L"GMT", L"HST", L"AKST", L"PST", L"MST", L"CST", L"EST", L"AST", - L"NST", L"CET", L"IST", L"EET", L"CST", L"JST" - }; -#endif + const char* + locale::facet::_S_get_c_name() + { return _S_c_name; } + + locale::facet:: + ~facet() { } - // Definitions for static const data members of money_base - const money_base::pattern - money_base::_S_default_pattern = { {symbol, sign, none, value} }; + // locale::_Impl + locale::_Impl:: + ~_Impl() throw() + { + if (_M_facets) + for (size_t __i = 0; __i < _M_facets_size; ++__i) + if (_M_facets[__i]) + _M_facets[__i]->_M_remove_reference(); + delete [] _M_facets; + + if (_M_caches) + for (size_t __i = 0; __i < _M_facets_size; ++__i) + if (_M_caches[__i]) + _M_caches[__i]->_M_remove_reference(); + delete [] _M_caches; + + if (_M_names) + for (size_t __i = 0; __i < _S_categories_size; ++__i) + delete [] _M_names[__i]; + delete [] _M_names; + } - const char* __num_base::_S_atoms_in = "0123456789eEabcdfABCDF"; - const char* __num_base::_S_atoms_out ="-+xX0123456789abcdef0123456789ABCDEF"; + // Clone existing _Impl object. + locale::_Impl:: + _Impl(const _Impl& __imp, size_t __refs) + : _M_refcount(__refs), _M_facets(0), _M_facets_size(__imp._M_facets_size), + _M_caches(0), _M_names(0) + { + try + { + _M_facets = new const facet*[_M_facets_size]; + for (size_t __i = 0; __i < _M_facets_size; ++__i) + { + _M_facets[__i] = __imp._M_facets[__i]; + if (_M_facets[__i]) + _M_facets[__i]->_M_add_reference(); + } + _M_caches = new const facet*[_M_facets_size]; + for (size_t __j = 0; __j < _M_facets_size; ++__j) + { + _M_caches[__j] = __imp._M_caches[__j]; + if (_M_caches[__j]) + _M_caches[__j]->_M_add_reference(); + } + _M_names = new char*[_S_categories_size]; + for (size_t __k = 0; __k < _S_categories_size; ++__k) + _M_names[__k] = 0; + + // Name all the categories. + for (size_t __l = 0; __l < _S_categories_size; ++__l) + { + char* __new = new char[std::strlen(__imp._M_names[__l]) + 1]; + std::strcpy(__new, __imp._M_names[__l]); + _M_names[__l] = __new; + } + } + catch(...) + { + this->~_Impl(); + __throw_exception_again; + } + } - // _GLIBCPP_RESOLVE_LIB_DEFECTS - // According to the resolution of DR 231, about 22.2.2.2.2, p11, - // "str.precision() is specified in the conversion specification". void - __num_base::_S_format_float(const ios_base& __io, char* __fptr, - char __mod, streamsize/* unused post DR 231 */) + locale::_Impl:: + _M_replace_category(const _Impl* __imp, + const locale::id* const* __idpp) { - ios_base::fmtflags __flags = __io.flags(); - *__fptr++ = '%'; - // [22.2.2.2.2] Table 60 - if (__flags & ios_base::showpos) - *__fptr++ = '+'; - if (__flags & ios_base::showpoint) - *__fptr++ = '#'; - - // As per DR 231: _always_, not only when - // __flags & ios_base::fixed || __prec > 0 - *__fptr++ = '.'; - *__fptr++ = '*'; - - if (__mod) - *__fptr++ = __mod; - ios_base::fmtflags __fltfield = __flags & ios_base::floatfield; - // [22.2.2.2.2] Table 58 - if (__fltfield == ios_base::fixed) - *__fptr++ = 'f'; - else if (__fltfield == ios_base::scientific) - *__fptr++ = (__flags & ios_base::uppercase) ? 'E' : 'e'; - else - *__fptr++ = (__flags & ios_base::uppercase) ? 'G' : 'g'; - *__fptr = '\0'; + for (; *__idpp; ++__idpp) + _M_replace_facet(__imp, *__idpp); } void - __num_base::_S_format_int(const ios_base& __io, char* __fptr, char __mod, - char __modl) + locale::_Impl:: + _M_replace_facet(const _Impl* __imp, const locale::id* __idp) { - ios_base::fmtflags __flags = __io.flags(); - *__fptr++ = '%'; - // [22.2.2.2.2] Table 60 - if (__flags & ios_base::showpos) - *__fptr++ = '+'; - if (__flags & ios_base::showbase) - *__fptr++ = '#'; - *__fptr++ = 'l'; - - // For long long types. - if (__modl) - *__fptr++ = __modl; - - ios_base::fmtflags __bsefield = __flags & ios_base::basefield; - if (__bsefield == ios_base::hex) - *__fptr++ = (__flags & ios_base::uppercase) ? 'X' : 'x'; - else if (__bsefield == ios_base::oct) - *__fptr++ = 'o'; - else - *__fptr++ = __mod; - *__fptr = '\0'; + size_t __index = __idp->_M_id(); + if ((__index > (__imp->_M_facets_size - 1)) + || !__imp->_M_facets[__index]) + __throw_runtime_error(__N("locale::_Impl::_M_replace_facet")); + _M_install_facet(__idp, __imp->_M_facets[__index]); + } + + void + locale::_Impl:: + _M_install_facet(const locale::id* __idp, const facet* __fp) + { + if (__fp) + { + size_t __index = __idp->_M_id(); + + // Check size of facet vector to ensure adequate room. + if (__index > _M_facets_size - 1) + { + const size_t __new_size = __index + 4; + + // New facet array. + const facet** __oldf = _M_facets; + const facet** __newf; + __newf = new const facet*[__new_size]; + for (size_t __i = 0; __i < _M_facets_size; ++__i) + __newf[__i] = _M_facets[__i]; + for (size_t __l = _M_facets_size; __l < __new_size; ++__l) + __newf[__l] = 0; + + // New cache array. + const facet** __oldc = _M_caches; + const facet** __newc; + try + { + __newc = new const facet*[__new_size]; + } + catch(...) + { + delete [] __newf; + __throw_exception_again; + } + for (size_t __j = 0; __j < _M_facets_size; ++__j) + __newc[__j] = _M_caches[__j]; + for (size_t __k = _M_facets_size; __k < __new_size; ++__k) + __newc[__k] = 0; + + _M_facets_size = __new_size; + _M_facets = __newf; + _M_caches = __newc; + delete [] __oldf; + delete [] __oldc; + } + + __fp->_M_add_reference(); + const facet*& __fpr = _M_facets[__index]; + if (__fpr) + { + // Replacing an existing facet. Order matters. + __fpr->_M_remove_reference(); + __fpr = __fp; + } + else + { + // Installing a newly created facet into an empty + // _M_facets container, say a newly-constructed, + // swanky-fresh _Impl. + _M_facets[__index] = __fp; + } + + // Ideally, it would be nice to only remove the caches that + // are now incorrect. However, some of the caches depend on + // multiple facets, and we only know about one facet + // here. It's no great loss: the first use of the new facet + // will create a new, correctly cached facet anyway. + for (size_t __i = 0; __i < _M_facets_size; ++__i) + { + const facet* __cpr = _M_caches[__i]; + if (__cpr) + { + __cpr->_M_remove_reference(); + _M_caches[__i] = 0; + } + } + } + } + + + // locale::id + // Definitions for static const data members of locale::id + _Atomic_word locale::id::_S_refcount; // init'd to 0 by linker + + size_t + locale::id::_M_id() const + { + if (!_M_index) + _M_index = 1 + __gnu_cxx::__exchange_and_add(&_S_refcount, 1); + return _M_index - 1; } } // namespace std + |
