mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-19 04:18:56 +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
242 lines
6.2 KiB
C++
242 lines
6.2 KiB
C++
// 2000-08-31 Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
// Copyright (C) 2000 Free Software Foundation
|
|
//
|
|
// 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.
|
|
|
|
// 22.1.1.1.2 - class locale::facet [lib.locale.facet]
|
|
|
|
#include <cwchar> // for mbstate_t
|
|
#include <locale>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include <iterator>
|
|
#include <testsuite_hooks.h>
|
|
|
|
// 1 a class if a facet if it is publicly derived from another facet
|
|
typedef std::istreambuf_iterator<char> input_iterator;
|
|
typedef std::ostreambuf_iterator<char> output_iterator;
|
|
|
|
class gnu_collate: public std::collate<char> { };
|
|
class gnu_ctype: public std::ctype<char> { };
|
|
class gnu_codecvt: public std::codecvt<char, char, std::mbstate_t> { };
|
|
class gnu_moneypunct: public std::moneypunct<char> { };
|
|
class gnu_moneypunct_true: public std::moneypunct<char, true> { };
|
|
class gnu_money_get: public std::money_get<char> { };
|
|
class gnu_money_put: public std::money_put<char> { };
|
|
class gnu_numpunct: public std::numpunct<char> { };
|
|
class gnu_num_get: public std::num_get<char> { };
|
|
class gnu_num_put: public std::num_put<char> { };
|
|
class gnu_time_get: public std::time_get<char> { };
|
|
class gnu_time_put: public std::time_put<char> { };
|
|
class gnu_messages: public std::messages<char> { };
|
|
|
|
class gnu_collate_byname: public std::collate_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_collate_byname(const char* c, size_t refs = 0)
|
|
: std::collate_byname<char>(c, refs) { }
|
|
};
|
|
|
|
class gnu_ctype_byname: public std::ctype_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_ctype_byname(const char* c, size_t refs = 0)
|
|
: std::ctype_byname<char>(c, refs) { }
|
|
};
|
|
|
|
class gnu_moneypunct_byname_true: public std::moneypunct_byname<char, true>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_moneypunct_byname_true(const char* c, size_t refs = 0)
|
|
: std::moneypunct_byname<char, true>(c, refs) { }
|
|
};
|
|
|
|
class gnu_moneypunct_byname_false: public std::moneypunct_byname<char, false>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_moneypunct_byname_false(const char* c, size_t refs = 0)
|
|
: std::moneypunct_byname<char, false>(c, refs) { }
|
|
};
|
|
|
|
|
|
class gnu_money_get_in: public std::money_get<char, input_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_money_get_in(size_t refs = 0)
|
|
: std::money_get<char, input_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_money_put_out: public std::money_put<char, output_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_money_put_out(size_t refs = 0)
|
|
: std::money_put<char, output_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_numpunct_byname: public std::numpunct_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_numpunct_byname(const char* c, size_t refs = 0)
|
|
: std::numpunct_byname<char>(c, refs) { }
|
|
};
|
|
|
|
class gnu_num_get_in: public std::num_get<char, input_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_num_get_in(size_t refs = 0)
|
|
: std::num_get<char, input_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_num_put_out: public std::num_put<char, output_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_num_put_out(size_t refs = 0)
|
|
: std::num_put<char, output_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_time_get_byname: public std::time_get_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_time_get_byname(const char* c, size_t refs = 0)
|
|
: std::time_get_byname<char>(c, refs) { }
|
|
};
|
|
|
|
class gnu_time_get_in: public std::time_get<char, input_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_time_get_in(size_t refs = 0)
|
|
: std::time_get<char, input_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_time_put_byname: public std::time_put_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_time_put_byname(const char* c, size_t refs = 0)
|
|
: std::time_put_byname<char>(c, refs) { }
|
|
};
|
|
|
|
class gnu_time_put_out: public std::time_put<char, output_iterator>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_time_put_out(size_t refs = 0)
|
|
: std::time_put<char, output_iterator>(refs) { }
|
|
};
|
|
|
|
class gnu_messages_byname: public std::messages_byname<char>
|
|
{
|
|
public:
|
|
explicit
|
|
gnu_messages_byname(const char* c, size_t refs = 0)
|
|
: std::messages_byname<char>(c, refs) { }
|
|
};
|
|
|
|
|
|
// 2 or if it is a class derived from locale:;facet and containing a
|
|
// publicly-accessible declaration as follows:
|
|
class gnu_facet: public std::locale::facet
|
|
{
|
|
public:
|
|
static std::locale::id id;
|
|
};
|
|
|
|
std::locale::id gnu_facet::id;
|
|
|
|
void test01()
|
|
{
|
|
bool test = true;
|
|
const std::string name_no("*");
|
|
const std::string name_c("C");
|
|
|
|
try
|
|
{
|
|
gnu_collate obj01;
|
|
gnu_ctype obj02;
|
|
gnu_codecvt obj03;
|
|
gnu_moneypunct obj04;
|
|
gnu_moneypunct_true obj05;
|
|
gnu_money_get obj06;
|
|
gnu_money_put obj07;
|
|
gnu_numpunct obj08;
|
|
gnu_num_get obj09;
|
|
gnu_num_put obj10;
|
|
gnu_time_get obj11;
|
|
gnu_time_put obj12;
|
|
gnu_messages obj13;
|
|
gnu_time_put_out obj14(0);
|
|
gnu_time_put_byname obj15("C", 0);
|
|
gnu_time_get_in obj16(0);
|
|
gnu_time_get_byname obj17("C", 0);
|
|
gnu_num_put_out obj18(0);
|
|
gnu_num_get_in obj19(0);
|
|
gnu_numpunct_byname obj20("C", 0);
|
|
gnu_money_put_out obj21(0);
|
|
gnu_money_get_in obj22(0);
|
|
gnu_moneypunct_byname_false obj23("C", 0);
|
|
gnu_moneypunct_byname_true obj24("C", 0);
|
|
gnu_ctype_byname obj25("C", 0);
|
|
gnu_collate_byname obj26("C", 0);
|
|
gnu_messages_byname obj27("C", 0);
|
|
}
|
|
catch (std::runtime_error& obj)
|
|
{
|
|
// named locale not valid
|
|
VERIFY( false );
|
|
}
|
|
catch (std::exception& obj)
|
|
{
|
|
// some other error
|
|
VERIFY( false );
|
|
}
|
|
|
|
// 2
|
|
try
|
|
{
|
|
gnu_facet obj28;
|
|
}
|
|
catch (std::runtime_error& obj)
|
|
{
|
|
// named locale not valid
|
|
VERIFY( false );
|
|
}
|
|
catch (std::exception& obj)
|
|
{
|
|
// some other error
|
|
VERIFY( false );
|
|
}
|
|
}
|
|
|
|
int main ()
|
|
{
|
|
test01();
|
|
|
|
return 0;
|
|
}
|