mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-03-08 08:16:46 +08:00
215f9e283a
2003-06-26 Benjamin Kosnik <bkoz@redhat.com> * include/bits/ios_base.h (ios_base::_M_getloc): Return reference to the imbued locale. * include/bits/locale_facets.tcc (num_put::_M_convert_int): Use _M_getloc. (num_put::_M_convert_float): Use. 2003-06-26 Benjamin Kosnik <bkoz@redhat.com> Jerry Quinn <jlquinn@optonline.net> * config/linker-map.gnu: Add __numpunct_cache. * config/locale/gnu/numeric_members.cc (numpunct::_M_initialize_numpunct): Account for _M_data, fill in all elements for "C" locale. (numpunct::~numpunct): Delete _M_data. * config/locale/generic/numeric_members.cc: Same. * include/bits/basic_ios.tcc (basic_ios::init): Remove __locale_cache bits. (basic_ios::_M_cache_locale): Same. * include/bits/ios_base.h: Same. Tweaks. * include/bits/locale_classes.h: Tweaks. Reorder classes. (__use_cache): Make friends with _Impl, locale. (_Impl::_M_caches): Add. (_Impl::_M_install_cache): Add. * include/bits/locale_facets.h (__numpunct_cache): New. (numpunct): Encapsulate data members in __numpunct_cache member, _M_data. Adjust virtuals. (numpunct::numpunct): New ctor for the same. (__locale_cache_base): Remove. (__locale_cache): Remove. * include/bits/locale_facets.tcc (__use_cache): New function, specializations. (num_put::_M_convert_int, _M_convert_float, do_put): Use it. * src/globals.cc: Add cache_vec, numpunct_cache_c, numpunct_cache_w. * src/ios.cc (ios_base::ios_base): Remove __locale_cache. * src/locale-inst.cc: Same. Add __numpunct_cache. * src/locale.cc: Tweak inlines. (__use_cache): Define specializations. * src/localename.cc: Use global bits. (_Impl::~Impl): Deal with __numpunct_cache destruction. (_Impl::_Impl): Same. Pre-cache standard numpunct facets. (_Impl::_M_init_facet): Take into account __numpunct_cache. * testsuite/27_io/ios_base/cons/assign_neg.cc: Update line numbers. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. Co-Authored-By: Jerry Quinn <jlquinn@optonline.net> From-SVN: r68558
110 lines
3.4 KiB
C++
110 lines
3.4 KiB
C++
// std::numpunct implementation details, generic version -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002, 2003 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.3.1.2 numpunct virtual functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <locale>
|
|
|
|
namespace std
|
|
{
|
|
template<>
|
|
void
|
|
numpunct<char>::_M_initialize_numpunct(__c_locale)
|
|
{
|
|
// "C" locale
|
|
if (!_M_data)
|
|
_M_data = new __numpunct_cache<char>;
|
|
|
|
_M_data->_M_grouping = "";
|
|
_M_data->_M_use_grouping = false;
|
|
|
|
_M_data->_M_decimal_point = '.';
|
|
_M_data->_M_thousands_sep = ',';
|
|
|
|
for (size_t i = 0; i < __num_base::_S_oend; ++i)
|
|
_M_data->_M_atoms_out[i] = __num_base::_S_atoms_out[i];
|
|
_M_data->_M_atoms_out[__num_base::_S_oend] = wchar_t();
|
|
|
|
for (size_t i = 0; i < __num_base::_S_iend; ++i)
|
|
_M_data->_M_atoms_in[i] = __num_base::_S_atoms_in[i];
|
|
_M_data->_M_atoms_in[__num_base::_S_iend] = wchar_t();
|
|
|
|
_M_data->_M_truename = "true";
|
|
_M_data->_M_falsename = "false";
|
|
}
|
|
|
|
template<>
|
|
numpunct<char>::~numpunct()
|
|
{ delete _M_data; }
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template<>
|
|
void
|
|
numpunct<wchar_t>::_M_initialize_numpunct(__c_locale)
|
|
{
|
|
// "C" locale
|
|
if (!_M_data)
|
|
_M_data = new __numpunct_cache<wchar_t>;
|
|
|
|
_M_data->_M_grouping = "";
|
|
_M_data->_M_use_grouping = false;
|
|
|
|
_M_data->_M_decimal_point = L'.';
|
|
_M_data->_M_thousands_sep = L',';
|
|
|
|
// Use ctype::widen code without the facet...
|
|
unsigned char uc;
|
|
for (size_t i = 0; i < __num_base::_S_oend; ++i)
|
|
{
|
|
uc = static_cast<unsigned char>(__num_base::_S_atoms_out[i]);
|
|
_M_data->_M_atoms_out[i] = btowc(uc);
|
|
}
|
|
_M_data->_M_atoms_out[__num_base::_S_oend] = wchar_t();
|
|
|
|
for (size_t i = 0; i < __num_base::_S_iend; ++i)
|
|
{
|
|
uc = static_cast<unsigned char>(__num_base::_S_atoms_in[i]);
|
|
_M_data->_M_atoms_in[i] = btowc(uc);
|
|
}
|
|
_M_data->_M_atoms_in[__num_base::_S_iend] = wchar_t();
|
|
|
|
_M_data->_M_truename = L"true";
|
|
_M_data->_M_falsename = L"false";
|
|
}
|
|
|
|
template<>
|
|
numpunct<wchar_t>::~numpunct()
|
|
{ delete _M_data; }
|
|
#endif
|
|
}
|