fe932e504b
2004-02-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.h (class money_base): Add { _S_minus,
_S_zero, _S_end } enum, _S_atoms.
(struct __moneypunct_cache<>): Parameterize on _Intl too; add
_M_grouping_size, _M_curr_symbol_size, _M_positive_sign_size,
_M_negative_sign_size, _M_atoms; tweak constructor consistently.
(__moneypunct_cache<>::~__moneypunct_cache): Update.
(__moneypunct_cache<>::_M_cache): Fill the cache.
(class moneypunct): Tweak __cache_type typedef.
(class money_put): Inherit from money_base too; tweak declaration
of _M_insert, now parameterized on _Intl.
* include/bits/locale_facets.tcc
(struct __use_cache<__moneypunct_cache<_CharT, _Intl> >): New.
(money_put<>::_M_insert): Update definition to use the cache;
call reserve on __res to avoid multiple reallocations.
(money_put<>::do_put(long double),
money_put<>::do_put(const string_type&): Update calls of _M_insert.
* config/locale/generic/monetary_members.cc
(moneypunct<char, true>::_M_initialize_moneypunct,
moneypunct<char, false>::_M_initialize_moneypunct,
moneypunct<wchar_t, true>::_M_initialize_moneypunct,
moneypunct<wchar_t, false>::_M_initialize_moneypunct): Update.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/monetary_members.cc
(moneypunct<wchar_t, true>::~moneypunct(),
moneypunct<wchar_t, false>::~moneypunct()): Likewise.
* src/globals_locale.cc: Tweak fake_money_cache_c.
* src/locale-inst.cc: Add instantiations for
money_put::_M_insert<false> and money_put::_M_insert<true> and
__moneypunct_cache<C, false>, __moneypunct_cache<C, true>.
* src/locale_facets.cc: Define money_base::_S_atoms.
* src/locale_init.cc: Update placement new of
__moneypunct_cache<char, false>, __moneypunct_cache<char, true>,
__moneypunct_cache<wchar_t, false>, __moneypunct_cache<wchar_T, true>.
* config/locale/generic/numeric_members.cc: Clean up.
* config/locale/gnu/numeric_members.cc: Likewise.
* testsuite/22_locale/money_put/put/char/1.cc: Likewise.
* testsuite/22_locale/money_put/put/char/2.cc: Likewise.
* testsuite/22_locale/money_put/put/char/3.cc: Likewise.
* testsuite/22_locale/money_put/put/wchar_t/1.cc: Likewise.
* testsuite/22_locale/money_put/put/wchar_t/2.cc: Likewise.
* testsuite/22_locale/money_put/put/wchar_t/3.cc: Likewise.
From-SVN: r78216
94 lines
3.3 KiB
C++
94 lines
3.3 KiB
C++
// 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
|
|
// 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.
|
|
|
|
#include <locale>
|
|
|
|
namespace std
|
|
{
|
|
// Definitions for static const data members of time_base.
|
|
template<>
|
|
const char*
|
|
__timepunct_cache<char>::_S_timezones[14] =
|
|
{
|
|
"GMT", "HST", "AKST", "PST", "MST", "CST", "EST", "AST", "NST", "CET",
|
|
"IST", "EET", "CST", "JST"
|
|
};
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
template<>
|
|
const wchar_t*
|
|
__timepunct_cache<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
|
|
|
|
// Definitions for static const data members of money_base.
|
|
const money_base::pattern
|
|
money_base::_S_default_pattern = { {symbol, sign, none, value} };
|
|
|
|
const char* money_base::_S_atoms = "-0123456789";
|
|
|
|
const char* __num_base::_S_atoms_in = "-+xX0123456789abcdefABCDEF";
|
|
const char* __num_base::_S_atoms_out ="-+xX0123456789abcdef0123456789ABCDEF";
|
|
|
|
// _GLIBCXX_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)
|
|
{
|
|
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';
|
|
}
|
|
} // namespace std
|
|
|