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
250 lines
6.2 KiB
C++
250 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 <debug_assert.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 deerived 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;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|