Fwd: [WIP][RFC][patch] xlocale support for libstdc++
Václav Zeman
vhaisman@gmail.com
Thu Dec 19 10:46:00 GMT 2013
Hi.
Initially, I have set out to implement better locale support in
libstdc++ for non-Glibc systems like FreeBSD, that support POSIX 2008
locale facilities. Unfortunately, it has turned out that I need
localeconv_l(), which is only available as an extension, so I have
renamed my work to xlocale support.
This is work in progress. The patch compiles for me but it is
untested. It will need some testing, I intend to test on FreeBSD 9.2.
It should work on MacOS X as well, theoretically.
The implementation is based on the GNU locale implementation files.
I would like to ask if something like this would be acceptable, once
it is done. In that case, I would like to ask for necessary license
assignment paperwork.
--
VZ
-------------- next part --------------
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index fcdcd9a..fc3b6fe 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1962,7 +1962,7 @@ dnl
AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
GLIBCXX_ENABLE(clocale,auto,[[[=MODEL]]],
[use MODEL for target locale package],
- [permit generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto])
+ [permit generic|gnu|ieee_1003.1-2001|xlocale|newlib|yes|no|auto])
# Deal with gettext issues. Default to not using it (=no) until we detect
# support for it later. Let the user turn it off via --e/d, but let that
@@ -2131,6 +2131,27 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
CTIME_CC=config/locale/generic/time_members.cc
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
;;
+
+ xlocale)
+ AC_MSG_RESULT(xlocale)
+
+ AC_DEFINE([_GLIBCXX_XLOCALE], [1],
+ [Define to 1 if you are using xlocale.])
+
+ CLOCALE_H=config/locale/xlocale/c_locale.h
+ CLOCALE_CC=config/locale/xlocale/c_locale.cc
+ CCODECVT_CC=config/locale/xlocale/codecvt_members.cc
+ CCOLLATE_CC=config/locale/xlocale/collate_members.cc
+ CCTYPE_CC=config/locale/xlocale/ctype_members.cc
+ CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
+ CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
+ CMONEY_CC=config/locale/xlocale/monetary_members.cc
+ CNUMERIC_CC=config/locale/xlocale/numeric_members.cc
+ CTIME_H=config/locale/xlocale/time_members.h
+ CTIME_CC=config/locale/xlocale/time_members.cc
+ CLOCALE_INTERNAL_H=config/locale/xlocale/c++locale_internal.h
+ ;;
+
newlib)
AC_MSG_RESULT(newlib)
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 4c029d2..9111c88 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -876,6 +876,9 @@
/* Defined if as can handle rdrand. */
#undef _GLIBCXX_X86_RDRAND
+/* Define to 1 if you are using xlocale. */
+#undef _GLIBCXX_XLOCALE
+
/* Define to 1 if mutex_timedlock is available. */
#undef _GTHREAD_USE_MUTEX_TIMEDLOCK
diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
index 668fd37..2c6a002 100644
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
@@ -45,7 +45,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
#ifdef _GLIBCXX_USE_WCHAR_T
template<>
wstring
- messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
+ messages<wchar_t>::do_get(catalog __c, int __setid, int __msgid,
+ const wstring& __dfault) const
{
nl_catd __nlc = reinterpret_cast<nl_catd>(__c);
char* __msg = catgets(__nlc, __setid, __msgid,
diff --git a/libstdc++-v3/config/locale/xlocale/c++locale_internal.h b/libstdc++-v3/config/locale/xlocale/c++locale_internal.h
new file mode 100644
index 0000000..a35ef4c
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/c++locale_internal.h
@@ -0,0 +1,139 @@
+// -*- C++ -*-
+
+// Copyright (C) 2002-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/c++locale_internal.h
+ * This is an internal header file, included by other library headers.
+ * Do not attempt to use it directly. @headername{locale}
+ */
+
+// Written by Jakub Jelinek <jakub@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale
+
+#ifndef __CXXLOCALE_INTERNAL_H_6625d9e4_ee6d_477e_bd69_a85c5a1f6e67
+#define __CXXLOCALE_INTERNAL_H_6625d9e4_ee6d_477e_bd69_a85c5a1f6e67
+
+#include <bits/c++config.h>
+#include <bits/functexcept.h>
+#include <clocale>
+#include <cstdlib>
+#include <cstring>
+#include <cstddef>
+#include <cwchar>
+#include <stdlib.h>
+#include <wchar.h>
+#include <langinfo.h>
+#include <locale.h>
+#include <xlocale.h>
+
+
+namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
+{
+
+ struct _Switch_locale
+ {
+ _Switch_locale(locale_t __cloc)
+ : __old(uselocale(__cloc))
+ { }
+
+ ~_Switch_locale()
+ {
+ uselocale(__old);
+ }
+
+ private:
+ _Switch_locale(_Switch_locale const &);;
+ _Switch_locale & operator=(_Switch_locale const &);
+
+ locale_t __old;
+ };
+
+
+ template<typename _PointerType>
+ struct _Delete_and_null
+ {
+ _Delete_and_null(_PointerType & __p)
+ : __ptr(&__p)
+ { }
+
+ ~_Delete_and_null()
+ {
+ if (__ptr)
+ delete *__ptr;
+ *__ptr = 0;
+ }
+
+ void _Release()
+ {
+ __ptr = 0;
+ }
+
+ _PointerType * __ptr;
+
+ private:
+ _Delete_and_null(_Delete_and_null const &);
+ _Delete_and_null & operator=(_Delete_and_null const &);
+ };
+
+
+ inline wchar_t __mb_to_wchar_t(char const * __src, locale_t __cloc)
+ {
+ wchar_t __wc;
+ int __result = mbtowc_l(&__wc, __src, std::strlen(__src), __cloc);
+ if (__result == -1)
+ std::__throw_runtime_error("mbtowc_l");
+
+ return static_cast<wchar_t>(__wc);
+ }
+
+
+ inline wchar_t * __mbcs_to_wcs_alloc(char const * __str, locale_t __cloc)
+ {
+ std::mbstate_t __state;
+
+ std::memset(&__state, 0, sizeof(__state));
+ char const * __src = __str;
+ std::size_t __count = mbsrtowcs_l(0, &__src, static_cast<std::size_t>(-2),
+ &__state, __cloc);
+ if (__count == static_cast<std::size_t>(-1))
+ std::__throw_runtime_error("mbsrtowcs_l");
+
+ wchar_t * const __result = new wchar_t [__count + 1];
+ __src = __str;
+ std::memset(&__state, 0, sizeof(__state));
+ std::size_t __retval = mbsrtowcs_l(__result, &__src, __count, &__state,
+ __cloc);
+ if (__count == static_cast<std::size_t>(-1))
+ std::__throw_runtime_error("mbsrtowcs_l");
+
+ return __result;
+ }
+
+ inline wchar_t * __nl_langinfo_l_w_alloc(nl_item __item, locale_t __cloc)
+ {
+ return __mbcs_to_wcs_alloc(nl_langinfo_l(__item, __cloc), __cloc);
+ }
+
+} // namespace __gnu_cxx
+
+#endif
diff --git a/libstdc++-v3/config/locale/xlocale/c_locale.cc b/libstdc++-v3/config/locale/xlocale/c_locale.cc
new file mode 100644
index 0000000..3963cf7
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/c_locale.cc
@@ -0,0 +1,203 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.8 Standard locale categories.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for POSIX 2008 locale support
+
+#include <locale>
+#include <stdexcept>
+#include <limits>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ template<>
+ void
+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc) throw()
+ {
+ char* __sanity;
+ __v = strtof_l(__s, &__sanity, __cloc);
+
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 23. Num_get overflow result.
+ if (__sanity == __s || *__sanity != '\0')
+ {
+ __v = 0.0f;
+ __err = ios_base::failbit;
+ }
+ else if (__v == numeric_limits<float>::infinity())
+ {
+ __v = numeric_limits<float>::max();
+ __err = ios_base::failbit;
+ }
+ else if (__v == -numeric_limits<float>::infinity())
+ {
+ __v = -numeric_limits<float>::max();
+ __err = ios_base::failbit;
+ }
+ }
+
+ template<>
+ void
+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc) throw()
+ {
+ char* __sanity;
+ __v = strtod_l(__s, &__sanity, __cloc);
+
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 23. Num_get overflow result.
+ if (__sanity == __s || *__sanity != '\0')
+ {
+ __v = 0.0;
+ __err = ios_base::failbit;
+ }
+ else if (__v == numeric_limits<double>::infinity())
+ {
+ __v = numeric_limits<double>::max();
+ __err = ios_base::failbit;
+ }
+ else if (__v == -numeric_limits<double>::infinity())
+ {
+ __v = -numeric_limits<double>::max();
+ __err = ios_base::failbit;
+ }
+ }
+
+ template<>
+ void
+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc) throw()
+ {
+ char* __sanity;
+ __v = strtold_l(__s, &__sanity, __cloc);
+
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 23. Num_get overflow result.
+ if (__sanity == __s || *__sanity != '\0')
+ {
+ __v = 0.0l;
+ __err = ios_base::failbit;
+ }
+ else if (__v == numeric_limits<long double>::infinity())
+ {
+ __v = numeric_limits<long double>::max();
+ __err = ios_base::failbit;
+ }
+ else if (__v == -numeric_limits<long double>::infinity())
+ {
+ __v = -numeric_limits<long double>::max();
+ __err = ios_base::failbit;
+ }
+ }
+
+ void
+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
+ __c_locale __old)
+ {
+ __cloc = newlocale(1 << LC_ALL, __s, __old);
+ if (!__cloc)
+ {
+ // This named locale is not supported by the underlying OS.
+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
+ "name not valid"));
+ }
+ }
+
+ void
+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
+ {
+ if (__cloc && _S_get_c_locale() != __cloc)
+ freelocale(__cloc);
+ }
+
+ __c_locale
+ locale::facet::_S_clone_c_locale(__c_locale& __cloc) throw()
+ { return duplocale(__cloc); }
+
+ __c_locale
+ locale::facet::_S_lc_ctype_c_locale(__c_locale __cloc, const char* __s)
+ {
+ __c_locale __dup = duplocale(__cloc);
+ if (__dup == __c_locale(0))
+ __throw_runtime_error(__N("locale::facet::_S_lc_ctype_c_locale "
+ "duplocale error"));
+ __c_locale __changed = newlocale(LC_CTYPE_MASK, __s, __dup);
+ if (__changed == __c_locale(0))
+ {
+ freelocale(__dup);
+ __throw_runtime_error(__N("locale::facet::_S_lc_ctype_c_locale "
+ "newlocale error"));
+ }
+ return __changed;
+ }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
+ {
+ "LC_CTYPE",
+ "LC_NUMERIC",
+ "LC_TIME",
+ "LC_COLLATE",
+ "LC_MONETARY",
+ "LC_MESSAGES",
+ "LC_PAPER",
+ "LC_NAME",
+ "LC_ADDRESS",
+ "LC_TELEPHONE",
+ "LC_MEASUREMENT",
+ "LC_IDENTIFICATION"
+ };
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+ extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct);
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
diff --git a/libstdc++-v3/config/locale/xlocale/c_locale.h b/libstdc++-v3/config/locale/xlocale/c_locale.h
new file mode 100644
index 0000000..215f56f
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/c_locale.h
@@ -0,0 +1,83 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/c++locale.h
+ * This is an internal header file, included by other library headers.
+ * Do not attempt to use it directly. @headername{locale}
+ */
+
+//
+// ISO C++ 14882: 22.8 Standard locale categories.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale support
+
+#ifndef _GLIBCXX_CXX_LOCALE_H
+#define _GLIBCXX_CXX_LOCALE_H 1
+
+#pragma GCC system_header
+
+#include <clocale>
+#include <nl_types.h> // For messages
+#include <bits/c++locale_internal.h>
+
+#define _GLIBCXX_NUM_CATEGORIES 6
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ typedef locale_t __c_locale;
+
+ // Convert numeric value of type double and long double to string and
+ // return length of string. If vsnprintf is available use it, otherwise
+ // fall back to the unsafe vsprintf which, in general, can be dangerous
+ // and should be avoided.
+ inline int
+ __convert_from_v(const __c_locale& __cloc,
+ char* __out,
+ const int __size __attribute__ ((__unused__)),
+ const char* __fmt, ...)
+ {
+ __gnu_cxx::_Switch_locale __guard(__cloc);
+
+ __builtin_va_list __args;
+ __builtin_va_start(__args, __fmt);
+
+#ifdef _GLIBCXX_USE_C99
+ const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
+#else
+ const int __ret = __builtin_vsprintf(__out, __fmt, __args);
+#endif
+
+ __builtin_va_end(__args);
+
+ return __ret;
+ }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+#endif
diff --git a/libstdc++-v3/config/locale/xlocale/codecvt_members.cc b/libstdc++-v3/config/locale/xlocale/codecvt_members.cc
new file mode 100644
index 0000000..7835923
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/codecvt_members.cc
@@ -0,0 +1,281 @@
+// std::codecvt implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2002-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale support
+
+#include <locale>
+#include <cstdlib> // For MB_CUR_MAX
+#include <climits> // For MB_LEN_MAX
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ // Specializations.
+#ifdef _GLIBCXX_USE_WCHAR_T
+ codecvt_base::result
+ codecvt<wchar_t, char, mbstate_t>::
+ do_out(state_type& __state, const intern_type* __from,
+ const intern_type* __from_end, const intern_type*& __from_next,
+ extern_type* __to, extern_type* __to_end,
+ extern_type*& __to_next) const
+ {
+ result __ret = ok;
+ state_type __tmp_state(__state);
+
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_codecvt);
+
+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
+ // in case we fall back to wcrtomb and then continue, in a loop.
+ // NB: wcsnrtombs is a GNU extension
+ for (__from_next = __from, __to_next = __to;
+ __from_next < __from_end && __to_next < __to_end
+ && __ret == ok;)
+ {
+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
+ __from_end - __from_next);
+ if (!__from_chunk_end)
+ __from_chunk_end = __from_end;
+
+ __from = __from_next;
+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
+ __from_chunk_end - __from_next,
+ __to_end - __to_next, &__state);
+ if (__conv == static_cast<size_t>(-1))
+ {
+ // In case of error, in order to stop at the exact place we
+ // have to start again from the beginning with a series of
+ // wcrtomb.
+ for (; __from < __from_next; ++__from)
+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
+ __state = __tmp_state;
+ __ret = error;
+ }
+ else if (__from_next && __from_next < __from_chunk_end)
+ {
+ __to_next += __conv;
+ __ret = partial;
+ }
+ else
+ {
+ __from_next = __from_chunk_end;
+ __to_next += __conv;
+ }
+
+ if (__from_next < __from_end && __ret == ok)
+ {
+ extern_type __buf[MB_LEN_MAX];
+ __tmp_state = __state;
+ const size_t __conv2 = wcrtomb(__buf, *__from_next, &__tmp_state);
+ if (__conv2 > static_cast<size_t>(__to_end - __to_next))
+ __ret = partial;
+ else
+ {
+ memcpy(__to_next, __buf, __conv2);
+ __state = __tmp_state;
+ __to_next += __conv2;
+ ++__from_next;
+ }
+ }
+ }
+
+ return __ret;
+ }
+
+ codecvt_base::result
+ codecvt<wchar_t, char, mbstate_t>::
+ do_in(state_type& __state, const extern_type* __from,
+ const extern_type* __from_end, const extern_type*& __from_next,
+ intern_type* __to, intern_type* __to_end,
+ intern_type*& __to_next) const
+ {
+ result __ret = ok;
+ state_type __tmp_state(__state);
+
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_codecvt);
+
+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
+ // in case we store a L'\0' and then continue, in a loop.
+ // NB: mbsnrtowcs is a GNU extension
+ for (__from_next = __from, __to_next = __to;
+ __from_next < __from_end && __to_next < __to_end
+ && __ret == ok;)
+ {
+ const extern_type* __from_chunk_end;
+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
+ __from_end
+ - __from_next));
+ if (!__from_chunk_end)
+ __from_chunk_end = __from_end;
+
+ __from = __from_next;
+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
+ __from_chunk_end - __from_next,
+ __to_end - __to_next, &__state);
+ if (__conv == static_cast<size_t>(-1))
+ {
+ // In case of error, in order to stop at the exact place we
+ // have to start again from the beginning with a series of
+ // mbrtowc.
+ for (;; ++__to_next, __from += __conv)
+ {
+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
+ &__tmp_state);
+ if (__conv == static_cast<size_t>(-1)
+ || __conv == static_cast<size_t>(-2))
+ break;
+ }
+ __from_next = __from;
+ __state = __tmp_state;
+ __ret = error;
+ }
+ else if (__from_next && __from_next < __from_chunk_end)
+ {
+ // It is unclear what to return in this case (see DR 382).
+ __to_next += __conv;
+ __ret = partial;
+ }
+ else
+ {
+ __from_next = __from_chunk_end;
+ __to_next += __conv;
+ }
+
+ if (__from_next < __from_end && __ret == ok)
+ {
+ if (__to_next < __to_end)
+ {
+ // XXX Probably wrong for stateful encodings
+ __tmp_state = __state;
+ ++__from_next;
+ *__to_next++ = L'\0';
+ }
+ else
+ __ret = partial;
+ }
+ }
+
+ return __ret;
+ }
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_encoding() const throw()
+ {
+ // XXX This implementation assumes that the encoding is
+ // stateless and is either single-byte or variable-width.
+ int __ret = 0;
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_codecvt);
+ if (MB_CUR_MAX == 1)
+ __ret = 1;
+
+ return __ret;
+ }
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_max_length() const throw()
+ {
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_codecvt);
+ // XXX Probably wrong for stateful encodings.
+ int __ret = MB_CUR_MAX;
+ return __ret;
+ }
+
+ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_length(state_type& __state, const extern_type* __from,
+ const extern_type* __end, size_t __max) const
+ {
+ int __ret = 0;
+ state_type __tmp_state(__state);
+
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_codecvt);
+
+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
+ // in case we advance past it and then continue, in a loop.
+ // NB: mbsnrtowcs is a GNU extension
+
+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
+ // its fourth parameter (it wouldn't with NULL as first parameter).
+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
+ * __max));
+ while (__from < __end && __max)
+ {
+ const extern_type* __from_chunk_end;
+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
+ __end
+ - __from));
+ if (!__from_chunk_end)
+ __from_chunk_end = __end;
+
+ const extern_type* __tmp_from = __from;
+ size_t __conv = mbsnrtowcs(__to, &__from,
+ __from_chunk_end - __from,
+ __max, &__state);
+ if (__conv == static_cast<size_t>(-1))
+ {
+ // In case of error, in order to stop at the exact place we
+ // have to start again from the beginning with a series of
+ // mbrtowc.
+ for (__from = __tmp_from;; __from += __conv)
+ {
+ __conv = mbrtowc(0, __from, __end - __from,
+ &__tmp_state);
+ if (__conv == static_cast<size_t>(-1)
+ || __conv == static_cast<size_t>(-2))
+ break;
+ }
+ __state = __tmp_state;
+ __ret += __from - __tmp_from;
+ break;
+ }
+ if (!__from)
+ __from = __from_chunk_end;
+
+ __ret += __from - __tmp_from;
+ __max -= __conv;
+
+ if (__from < __end && __max)
+ {
+ // XXX Probably wrong for stateful encodings
+ __tmp_state = __state;
+ ++__from;
+ ++__ret;
+ --__max;
+ }
+ }
+
+ return __ret;
+ }
+#endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/collate_members.cc b/libstdc++-v3/config/locale/xlocale/collate_members.cc
new file mode 100644
index 0000000..1e8fc94
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/collate_members.cc
@@ -0,0 +1,74 @@
+// std::collate implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale support
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ // These are basically extensions to char_traits, and perhaps should
+ // be put there instead of here.
+ template<>
+ int
+ collate<char>::_M_compare(const char* __one,
+ const char* __two) const throw()
+ {
+ int __cmp = strcoll_l(__one, __two, _M_c_locale_collate);
+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
+ }
+
+ template<>
+ size_t
+ collate<char>::_M_transform(char* __to, const char* __from,
+ size_t __n) const throw()
+ { return strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template<>
+ int
+ collate<wchar_t>::_M_compare(const wchar_t* __one,
+ const wchar_t* __two) const throw()
+ {
+ int __cmp = wcscoll_l(__one, __two, _M_c_locale_collate);
+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
+ }
+
+ template<>
+ size_t
+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
+ size_t __n) const throw()
+ { return wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
+#endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/ctype_members.cc b/libstdc++-v3/config/locale/xlocale/ctype_members.cc
new file mode 100644
index 0000000..798e582
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/ctype_members.cc
@@ -0,0 +1,275 @@
+// std::ctype implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale support
+
+#include <locale>
+#include <cstdio>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ // NB: The other ctype<char> specializations are in src/locale.cc and
+ // various /config/os/* files.
+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
+ : ctype<char>(0, false, __refs)
+ {
+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
+ {
+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
+ }
+ }
+
+ ctype_byname<char>::~ctype_byname()
+ { }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ ctype<wchar_t>::__wmask_type
+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw()
+ {
+ __wmask_type __ret;
+ switch (__m)
+ {
+ case space:
+ __ret = wctype_l("space", _M_c_locale_ctype);
+ break;
+ case print:
+ __ret = wctype_l("print", _M_c_locale_ctype);
+ break;
+ case cntrl:
+ __ret = wctype_l("cntrl", _M_c_locale_ctype);
+ break;
+ case upper:
+ __ret = wctype_l("upper", _M_c_locale_ctype);
+ break;
+ case lower:
+ __ret = wctype_l("lower", _M_c_locale_ctype);
+ break;
+ case alpha:
+ __ret = wctype_l("alpha", _M_c_locale_ctype);
+ break;
+ case digit:
+ __ret = wctype_l("digit", _M_c_locale_ctype);
+ break;
+ case punct:
+ __ret = wctype_l("punct", _M_c_locale_ctype);
+ break;
+ case xdigit:
+ __ret = wctype_l("xdigit", _M_c_locale_ctype);
+ break;
+ case alnum:
+ __ret = wctype_l("alnum", _M_c_locale_ctype);
+ break;
+ case graph:
+ __ret = wctype_l("graph", _M_c_locale_ctype);
+ break;
+ default:
+ __ret = __wmask_type();
+ }
+ return __ret;
+ }
+
+ wchar_t
+ ctype<wchar_t>::do_toupper(wchar_t __c) const
+ { return towupper_l(__c, _M_c_locale_ctype); }
+
+ const wchar_t*
+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
+ {
+ while (__lo < __hi)
+ {
+ *__lo = towupper_l(*__lo, _M_c_locale_ctype);
+ ++__lo;
+ }
+ return __hi;
+ }
+
+ wchar_t
+ ctype<wchar_t>::do_tolower(wchar_t __c) const
+ { return towlower_l(__c, _M_c_locale_ctype); }
+
+ const wchar_t*
+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
+ {
+ while (__lo < __hi)
+ {
+ *__lo = towlower_l(*__lo, _M_c_locale_ctype);
+ ++__lo;
+ }
+ return __hi;
+ }
+
+ bool
+ ctype<wchar_t>::
+ do_is(mask __m, wchar_t __c) const
+ {
+ bool __ret = false;
+ // Highest bitmask in ctype_base == 10, but extra in "C"
+ // library for blank.
+ const size_t __bitmasksize = 15;
+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
+ if (__m & _M_bit[__bitcur])
+ {
+ if (iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
+ {
+ __ret = true;
+ break;
+ }
+ }
+
+ return __ret;
+ }
+
+ const wchar_t*
+ ctype<wchar_t>::
+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
+ {
+ for (; __lo < __hi; ++__vec, ++__lo)
+ {
+ const size_t __bitmasksize = 15;
+ mask __m = 0;
+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
+ if (iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
+ __m |= _M_bit[__bitcur];
+ *__vec = __m;
+ }
+ return __hi;
+ }
+
+ const wchar_t*
+ ctype<wchar_t>::
+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
+ {
+ while (__lo < __hi && !this->do_is(__m, *__lo))
+ ++__lo;
+ return __lo;
+ }
+
+ const wchar_t*
+ ctype<wchar_t>::
+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
+ {
+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
+ ++__lo;
+ return __lo;
+ }
+
+ wchar_t
+ ctype<wchar_t>::
+ do_widen(char __c) const
+ { return _M_widen[static_cast<unsigned char>(__c)]; }
+
+ const char*
+ ctype<wchar_t>::
+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
+ {
+ while (__lo < __hi)
+ {
+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
+ ++__lo;
+ ++__dest;
+ }
+ return __hi;
+ }
+
+ char
+ ctype<wchar_t>::
+ do_narrow(wchar_t __wc, char __dfault) const
+ {
+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
+ return _M_narrow[__wc];
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_ctype);
+ const int __c = wctob(__wc);
+ return (__c == EOF ? __dfault : static_cast<char>(__c));
+ }
+
+ const wchar_t*
+ ctype<wchar_t>::
+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
+ char* __dest) const
+ {
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_ctype);
+ if (_M_narrow_ok)
+ while (__lo < __hi)
+ {
+ if (*__lo >= 0 && *__lo < 128)
+ *__dest = _M_narrow[*__lo];
+ else
+ {
+ const int __c = wctob(*__lo);
+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
+ }
+ ++__lo;
+ ++__dest;
+ }
+ else
+ while (__lo < __hi)
+ {
+ const int __c = wctob(*__lo);
+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
+ ++__lo;
+ ++__dest;
+ }
+ return __hi;
+ }
+
+ void
+ ctype<wchar_t>::_M_initialize_ctype() throw()
+ {
+ __gnu_cxx::_Switch_locale __guard(_M_c_locale_ctype);
+ wint_t __i;
+ for (__i = 0; __i < 128; ++__i)
+ {
+ const int __c = wctob(__i);
+ if (__c == EOF)
+ break;
+ else
+ _M_narrow[__i] = static_cast<char>(__c);
+ }
+ if (__i == 128)
+ _M_narrow_ok = true;
+ else
+ _M_narrow_ok = false;
+ for (size_t __j = 0;
+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
+ _M_widen[__j] = btowc(__j);
+
+ for (size_t __k = 0; __k <= 15; ++__k)
+ {
+ _M_bit[__k] = static_cast<mask>(1 << __k);
+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
+ }
+ }
+#endif // _GLIBCXX_USE_WCHAR_T
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/monetary_members.cc b/libstdc++-v3/config/locale/xlocale/monetary_members.cc
new file mode 100644
index 0000000..a78f16e
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/monetary_members.cc
@@ -0,0 +1,893 @@
+// std::moneypunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for POSIX 2008 locale support
+
+#include <locale>
+#include <memory>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ // Construct and return valid pattern consisting of some combination of:
+ // space none symbol sign value
+ money_base::pattern
+ money_base::_S_construct_pattern(char __precedes, char __space,
+ char __posn) throw()
+ {
+ pattern __ret;
+
+ // This insanely complicated routine attempts to construct a valid
+ // pattern for use with monyepunct. A couple of invariants:
+
+ // if (__precedes) symbol -> value
+ // else value -> symbol
+
+ // if (__space) space
+ // else none
+
+ // none == never first
+ // space never first or last
+
+ // Any elegant implementations of this are welcome.
+ switch (__posn)
+ {
+ case 0:
+ case 1:
+ // 1 The sign precedes the value and symbol.
+ __ret.field[0] = sign;
+ if (__space)
+ {
+ // Pattern starts with sign.
+ if (__precedes)
+ {
+ __ret.field[1] = symbol;
+ __ret.field[3] = value;
+ }
+ else
+ {
+ __ret.field[1] = value;
+ __ret.field[3] = symbol;
+ }
+ __ret.field[2] = space;
+ }
+ else
+ {
+ // Pattern starts with sign and ends with none.
+ if (__precedes)
+ {
+ __ret.field[1] = symbol;
+ __ret.field[2] = value;
+ }
+ else
+ {
+ __ret.field[1] = value;
+ __ret.field[2] = symbol;
+ }
+ __ret.field[3] = none;
+ }
+ break;
+ case 2:
+ // 2 The sign follows the value and symbol.
+ if (__space)
+ {
+ // Pattern either ends with sign.
+ if (__precedes)
+ {
+ __ret.field[0] = symbol;
+ __ret.field[2] = value;
+ }
+ else
+ {
+ __ret.field[0] = value;
+ __ret.field[2] = symbol;
+ }
+ __ret.field[1] = space;
+ __ret.field[3] = sign;
+ }
+ else
+ {
+ // Pattern ends with sign then none.
+ if (__precedes)
+ {
+ __ret.field[0] = symbol;
+ __ret.field[1] = value;
+ }
+ else
+ {
+ __ret.field[0] = value;
+ __ret.field[1] = symbol;
+ }
+ __ret.field[2] = sign;
+ __ret.field[3] = none;
+ }
+ break;
+ case 3:
+ // 3 The sign immediately precedes the symbol.
+ if (__precedes)
+ {
+ __ret.field[0] = sign;
+ __ret.field[1] = symbol;
+ if (__space)
+ {
+ __ret.field[2] = space;
+ __ret.field[3] = value;
+ }
+ else
+ {
+ __ret.field[2] = value;
+ __ret.field[3] = none;
+ }
+ }
+ else
+ {
+ __ret.field[0] = value;
+ if (__space)
+ {
+ __ret.field[1] = space;
+ __ret.field[2] = sign;
+ __ret.field[3] = symbol;
+ }
+ else
+ {
+ __ret.field[1] = sign;
+ __ret.field[2] = symbol;
+ __ret.field[3] = none;
+ }
+ }
+ break;
+ case 4:
+ // 4 The sign immediately follows the symbol.
+ if (__precedes)
+ {
+ __ret.field[0] = symbol;
+ __ret.field[1] = sign;
+ if (__space)
+ {
+ __ret.field[2] = space;
+ __ret.field[3] = value;
+ }
+ else
+ {
+ __ret.field[2] = value;
+ __ret.field[3] = none;
+ }
+ }
+ else
+ {
+ __ret.field[0] = value;
+ if (__space)
+ {
+ __ret.field[1] = space;
+ __ret.field[2] = symbol;
+ __ret.field[3] = sign;
+ }
+ else
+ {
+ __ret.field[1] = symbol;
+ __ret.field[2] = sign;
+ __ret.field[3] = none;
+ }
+ }
+ break;
+ default:
+ __ret = pattern();
+ }
+ return __ret;
+ }
+
+ template<>
+ void
+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
+ _M_data = new __moneypunct_cache<char, true>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_decimal_point = '.';
+ _M_data->_M_thousands_sep = ',';
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_curr_symbol = "";
+ _M_data->_M_curr_symbol_size = 0;
+ _M_data->_M_positive_sign = "";
+ _M_data->_M_positive_sign_size = 0;
+ _M_data->_M_negative_sign = "";
+ _M_data->_M_negative_sign_size = 0;
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_pos_format = money_base::_S_default_pattern;
+ _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
+ }
+ else
+ {
+ // Named locale.
+
+ struct lconv * __conv = localeconv_l(__cloc);
+ if (! __conv)
+ std::__throw_runtime_error(__N("localeconv_l"));
+
+ _M_data->_M_decimal_point = *__conv->mon_decimal_point;
+ _M_data->_M_thousands_sep = *__conv->mon_thousands_sep;
+
+ // Check for NULL, which implies no fractional digits.
+ if (_M_data->_M_decimal_point == '\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_decimal_point = '.';
+ }
+ else
+ _M_data->_M_frac_digits = __conv->int_frac_digits;
+
+ const char* __cgroup = __conv->mon_grouping;
+ const char* __cpossign = __conv->positive_sign;
+ const char* __cnegsign = __conv->negative_sign;
+ // _Intl == true
+ const char* __ccurr = __conv->int_curr_symbol;
+
+ char* __group = 0;
+ char* __ps = 0;
+ char* __ns = 0;
+ const char __nposn = __conv->int_n_sign_posn;
+
+ __try
+ {
+ size_t __len;
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == '\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = ',';
+ }
+ else
+ {
+ __len = strlen(__cgroup);
+ if (__len)
+ {
+ __group = new char[__len + 1];
+ memcpy(__group, __cgroup, __len + 1);
+ _M_data->_M_grouping = __group;
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+
+ __len = strlen(__cpossign);
+ if (__len)
+ {
+ __ps = new char[__len + 1];
+ memcpy(__ps, __cpossign, __len + 1);
+ _M_data->_M_positive_sign = __ps;
+ }
+ else
+ _M_data->_M_positive_sign = "";
+ _M_data->_M_positive_sign_size = __len;
+
+ if (!__nposn)
+ {
+ _M_data->_M_negative_sign = "()";
+ _M_data->_M_negative_sign_size = 2;
+ }
+ else
+ {
+ __len = strlen(__cnegsign);
+ if (__len)
+ {
+ __ns = new char[__len + 1];
+ memcpy(__ns, __cnegsign, __len + 1);
+ _M_data->_M_negative_sign = __ns;
+ }
+ else
+ _M_data->_M_negative_sign = "";
+ _M_data->_M_negative_sign_size = __len;
+ }
+
+ __len = strlen(__ccurr);
+ if (__len)
+ {
+ char* __curr = new char[__len + 1];
+ memcpy(__curr, __ccurr, __len + 1);
+ _M_data->_M_curr_symbol = __curr;
+ }
+ else
+ _M_data->_M_curr_symbol = "";
+ _M_data->_M_curr_symbol_size = __len;
+ }
+ __catch(...)
+ {
+ delete _M_data;
+ _M_data = 0;
+ delete [] __group;
+ delete [] __ps;
+ delete [] __ns;
+ __throw_exception_again;
+ }
+
+ char __pprecedes = __conv->int_p_cs_precedes;
+ char __pspace = __conv->int_p_sep_by_space;
+ char __pposn = __conv->int_p_sign_posn;
+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
+ __pposn);
+ char __nprecedes = __conv->int_n_cs_precedes;
+ char __nspace = __conv->int_n_sep_by_space;
+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
+ template<>
+ void
+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
+ _M_data = new __moneypunct_cache<char, false>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_decimal_point = '.';
+ _M_data->_M_thousands_sep = ',';
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_curr_symbol = "";
+ _M_data->_M_curr_symbol_size = 0;
+ _M_data->_M_positive_sign = "";
+ _M_data->_M_positive_sign_size = 0;
+ _M_data->_M_negative_sign = "";
+ _M_data->_M_negative_sign_size = 0;
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_pos_format = money_base::_S_default_pattern;
+ _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
+ }
+ else
+ {
+ // Named locale.
+
+ struct lconv * __conv = localeconv_l(__cloc);
+ if (! __conv)
+ std::__throw_runtime_error(__N("localeconv_l"));
+
+ // XXX _M_decimal_point is _CharT but the lconv structure contains a
+ // C string in its mon_decimal_point. Change representation in
+ // __moneypunct_cache?
+ _M_data->_M_decimal_point = *__conv->mon_decimal_point;
+ _M_data->_M_thousands_sep = *__conv->mon_thousands_sep;
+
+ // Check for NULL, which implies no fractional digits.
+ if (_M_data->_M_decimal_point == '\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_decimal_point = '.';
+ }
+ else
+ _M_data->_M_frac_digits = __conv->frac_digits;
+
+ const char* __cgroup = __conv->mon_grouping;
+ const char* __cpossign = __conv->positive_sign;
+ const char* __cnegsign = __conv->negative_sign;
+ // _Intl == false
+ const char* __ccurr = __conv->currency_symbol;
+
+ char* __group = 0;
+ char* __ps = 0;
+ char* __ns = 0;
+ const char __nposn = __conv->n_sign_posn;
+ __try
+ {
+ size_t __len;
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == '\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = ',';
+ }
+ else
+ {
+ __len = strlen(__cgroup);
+ if (__len)
+ {
+ __group = new char[__len + 1];
+ memcpy(__group, __cgroup, __len + 1);
+ _M_data->_M_grouping = __group;
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+
+ __len = strlen(__cpossign);
+ if (__len)
+ {
+ __ps = new char[__len + 1];
+ memcpy(__ps, __cpossign, __len + 1);
+ _M_data->_M_positive_sign = __ps;
+ }
+ else
+ _M_data->_M_positive_sign = "";
+ _M_data->_M_positive_sign_size = __len;
+
+ if (!__nposn)
+ {
+ _M_data->_M_negative_sign = "()";
+ _M_data->_M_negative_sign_size = 2;
+ }
+ else
+ {
+ __len = strlen(__cnegsign);
+ if (__len)
+ {
+ __ns = new char[__len + 1];
+ memcpy(__ns, __cnegsign, __len + 1);
+ _M_data->_M_negative_sign = __ns;
+ }
+ else
+ _M_data->_M_negative_sign = "";
+ _M_data->_M_negative_sign_size = __len;
+ }
+
+ __len = strlen(__ccurr);
+ if (__len)
+ {
+ char* __curr = new char[__len + 1];
+ memcpy(__curr, __ccurr, __len + 1);
+ _M_data->_M_curr_symbol = __curr;
+ }
+ else
+ _M_data->_M_curr_symbol = "";
+ _M_data->_M_curr_symbol_size = __len;
+ }
+ __catch(...)
+ {
+ delete _M_data;
+ _M_data = 0;
+ delete [] __group;
+ delete [] __ps;
+ delete [] __ns;
+ __throw_exception_again;
+ }
+
+ char __pprecedes = __conv->p_cs_precedes;
+ char __pspace = __conv->p_sep_by_space;
+ char __pposn = __conv->p_sign_posn;
+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
+ __pposn);
+ char __nprecedes = __conv->n_cs_precedes;
+ char __nspace = __conv->n_sep_by_space;
+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
+ template<>
+ moneypunct<char, true>::~moneypunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ if (_M_data->_M_positive_sign_size)
+ delete [] _M_data->_M_positive_sign;
+ if (_M_data->_M_negative_sign_size
+ && strcmp(_M_data->_M_negative_sign, "()") != 0)
+ delete [] _M_data->_M_negative_sign;
+ if (_M_data->_M_curr_symbol_size)
+ delete [] _M_data->_M_curr_symbol;
+ delete _M_data;
+ }
+
+ template<>
+ moneypunct<char, false>::~moneypunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ if (_M_data->_M_positive_sign_size)
+ delete [] _M_data->_M_positive_sign;
+ if (_M_data->_M_negative_sign_size
+ && strcmp(_M_data->_M_negative_sign, "()") != 0)
+ delete [] _M_data->_M_negative_sign;
+ if (_M_data->_M_curr_symbol_size)
+ delete [] _M_data->_M_curr_symbol;
+ delete _M_data;
+ }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template<>
+ void
+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
+ _M_data = new __moneypunct_cache<wchar_t, true>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_decimal_point = L'.';
+ _M_data->_M_thousands_sep = L',';
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_curr_symbol = L"";
+ _M_data->_M_curr_symbol_size = 0;
+ _M_data->_M_positive_sign = L"";
+ _M_data->_M_positive_sign_size = 0;
+ _M_data->_M_negative_sign = L"";
+ _M_data->_M_negative_sign_size = 0;
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_pos_format = money_base::_S_default_pattern;
+ _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+ // Use ctype::widen code without the facet...
+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+ _M_data->_M_atoms[__i] =
+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
+ }
+ else
+ {
+ // Named locale.
+
+ struct lconv * __conv = localeconv_l(__cloc);
+
+ _M_data->_M_decimal_point
+ = __gnu_cxx::__mb_to_wchar_t(__conv->mon_decimal_point, __cloc);
+ _M_data->_M_thousands_sep
+ = __gnu_cxx::__mb_to_wchar_t(__conv->mon_thousands_sep, __cloc);
+
+ // Check for NULL, which implies no fractional digits.
+ if (_M_data->_M_decimal_point == L'\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_decimal_point = L'.';
+ }
+ else
+ _M_data->_M_frac_digits = __conv->int_frac_digits;
+
+ const char* __cgroup = __conv->mon_grouping;
+ const char* __cpossign = __conv->positive_sign;
+ const char* __cnegsign = __conv->negative_sign;
+ const char* __ccurr = __conv->int_curr_symbol;
+
+ std::unique_ptr<char[]> __group = 0;
+ wchar_t* __wcs_ps = 0;
+ wchar_t* __wcs_ns = 0;
+ const char __nposn = __conv->n_sign_posn;
+
+ __gnu_cxx::_Delete_and_null<decltype(_M_data)> __data_guard(_M_data);
+ __try
+ {
+ size_t __len;
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == L'\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = L',';
+ }
+ else
+ {
+ __len = strlen(__cgroup);
+ if (__len)
+ {
+ __group.reset(new char[__len + 1]);
+ memcpy(__group.get(), __cgroup, __len + 1);
+ _M_data->_M_grouping = __group.get();
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+
+ mbstate_t __state;
+ __len = strlen(__cpossign);
+ if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ __wcs_ps = new wchar_t[__len + 1];
+ mbsrtowcs(__wcs_ps, &__cpossign, __len + 1, &__state);
+ _M_data->_M_positive_sign = __wcs_ps;
+ }
+ else
+ _M_data->_M_positive_sign = L"";
+ _M_data->_M_positive_sign_size =
+ wcslen(_M_data->_M_positive_sign);
+
+ __len = strlen(__cnegsign);
+ if (!__nposn)
+ _M_data->_M_negative_sign = L"()";
+ else if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ __wcs_ns = new wchar_t[__len + 1];
+ mbsrtowcs(__wcs_ns, &__cnegsign, __len + 1, &__state);
+ _M_data->_M_negative_sign = __wcs_ns;
+ }
+ else
+ _M_data->_M_negative_sign = L"";
+ _M_data->_M_negative_sign_size =
+ wcslen(_M_data->_M_negative_sign);
+
+ // _Intl == true.
+ __len = strlen(__ccurr);
+ if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ wchar_t* __wcs = new wchar_t[__len + 1];
+ mbsrtowcs(__wcs, &__ccurr, __len + 1, &__state);
+ _M_data->_M_curr_symbol = __wcs;
+ }
+ else
+ _M_data->_M_curr_symbol = L"";
+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
+ }
+ __catch(...)
+ {
+ delete [] __wcs_ps;
+ delete [] __wcs_ns;
+ __throw_exception_again;
+ }
+ __data_guard._Release();
+
+ char __pprecedes = __conv->int_p_cs_precedes;
+ char __pspace = __conv->int_p_sep_by_space;
+ char __pposn = __conv->int_p_sign_posn;
+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
+ __pposn);
+ char __nprecedes = __conv->int_n_cs_precedes;
+ char __nspace = __conv->int_n_sep_by_space;
+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
+ template<>
+ void
+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
+ _M_data = new __moneypunct_cache<wchar_t, false>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_decimal_point = L'.';
+ _M_data->_M_thousands_sep = L',';
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_curr_symbol = L"";
+ _M_data->_M_curr_symbol_size = 0;
+ _M_data->_M_positive_sign = L"";
+ _M_data->_M_positive_sign_size = 0;
+ _M_data->_M_negative_sign = L"";
+ _M_data->_M_negative_sign_size = 0;
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_pos_format = money_base::_S_default_pattern;
+ _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+ // Use ctype::widen code without the facet...
+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+ _M_data->_M_atoms[__i] =
+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
+ }
+ else
+ {
+ // Named locale.
+ struct lconv * __conv = localeconv_l(__cloc);
+
+ _M_data->_M_allocated = true;
+
+ _M_data->_M_decimal_point
+ = __gnu_cxx::__mb_to_wchar_t(__conv->mon_decimal_point, __cloc);
+ _M_data->_M_thousands_sep
+ = __gnu_cxx::__mb_to_wchar_t(__conv->mon_thousands_sep, __cloc);
+
+ // Check for NULL, which implies no fractional digits.
+ if (_M_data->_M_decimal_point == L'\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_frac_digits = 0;
+ _M_data->_M_decimal_point = L'.';
+ }
+ else
+ _M_data->_M_frac_digits = __conv->frac_digits;
+
+ const char* __cgroup = __conv->mon_grouping;
+ const char* __cpossign = __conv->positive_sign;
+ const char* __cnegsign = __conv->negative_sign;
+ const char* __ccurr = __conv->currency_symbol;
+
+ char* __group = 0;
+ wchar_t* __wcs_ps = 0;
+ wchar_t* __wcs_ns = 0;
+ const char __nposn = __conv->n_sign_posn;
+ __try
+ {
+ size_t __len;
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == L'\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = L',';
+ }
+ else
+ {
+ __len = strlen(__cgroup);
+ if (__len)
+ {
+ __group = new char[__len + 1];
+ memcpy(__group, __cgroup, __len + 1);
+ _M_data->_M_grouping = __group;
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+
+ mbstate_t __state;
+ __len = strlen(__cpossign);
+ if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ __wcs_ps = new wchar_t[__len + 1];
+ mbsrtowcs_l(__wcs_ps, &__cpossign, __len + 1, &__state,
+ __cloc);
+ _M_data->_M_positive_sign = __wcs_ps;
+ }
+ else
+ _M_data->_M_positive_sign = L"";
+ _M_data->_M_positive_sign_size =
+ wcslen(_M_data->_M_positive_sign);
+
+ __len = strlen(__cnegsign);
+ if (!__nposn)
+ _M_data->_M_negative_sign = L"()";
+ else if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ __wcs_ns = new wchar_t[__len + 1];
+ mbsrtowcs_l(__wcs_ns, &__cnegsign, __len + 1, &__state,
+ __cloc);
+ _M_data->_M_negative_sign = __wcs_ns;
+ }
+ else
+ _M_data->_M_negative_sign = L"";
+ _M_data->_M_negative_sign_size =
+ wcslen(_M_data->_M_negative_sign);
+
+ // _Intl == true.
+ __len = strlen(__ccurr);
+ if (__len)
+ {
+ memset(&__state, 0, sizeof(mbstate_t));
+ wchar_t* __wcs = new wchar_t[__len + 1];
+ mbsrtowcs_l(__wcs, &__ccurr, __len + 1, &__state, __cloc);
+ _M_data->_M_curr_symbol = __wcs;
+ }
+ else
+ _M_data->_M_curr_symbol = L"";
+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
+ }
+ __catch(...)
+ {
+ delete _M_data;
+ _M_data = 0;
+ delete [] __group;
+ delete [] __wcs_ps;
+ delete [] __wcs_ns;
+ __throw_exception_again;
+ }
+
+ char __pprecedes = __conv->p_cs_precedes;
+ char __pspace = __conv->p_sep_by_space;
+ char __pposn = __conv->p_sign_posn;
+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
+ __pposn);
+ char __nprecedes = __conv->n_cs_precedes;
+ char __nspace = __conv->n_sep_by_space;
+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
+ template<>
+ moneypunct<wchar_t, true>::~moneypunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ if (_M_data->_M_positive_sign_size)
+ delete [] _M_data->_M_positive_sign;
+ if (_M_data->_M_negative_sign_size
+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
+ delete [] _M_data->_M_negative_sign;
+ if (_M_data->_M_curr_symbol_size)
+ delete [] _M_data->_M_curr_symbol;
+ delete _M_data;
+ }
+
+ template<>
+ moneypunct<wchar_t, false>::~moneypunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ if (_M_data->_M_positive_sign_size)
+ delete [] _M_data->_M_positive_sign;
+ if (_M_data->_M_negative_sign_size
+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
+ delete [] _M_data->_M_negative_sign;
+ if (_M_data->_M_curr_symbol_size)
+ delete [] _M_data->_M_curr_symbol;
+ delete _M_data;
+ }
+#endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/numeric_members.cc b/libstdc++-v3/config/locale/xlocale/numeric_members.cc
new file mode 100644
index 0000000..8e9f75c
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/numeric_members.cc
@@ -0,0 +1,219 @@
+// std::numpunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for xlocale support
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ template<>
+ void
+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
+ {
+ if (!_M_data)
+ _M_data = new __numpunct_cache<char>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _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];
+
+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
+ }
+ else
+ {
+ // Named locale.
+
+ struct lconv * __conv = localeconv_l(__cloc);
+
+ _M_data->_M_decimal_point = *__conv->decimal_point;
+ _M_data->_M_thousands_sep = *__conv->thousands_sep;
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == '\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = ',';
+ }
+ else
+ {
+ const char* __src = __conv->grouping;
+ const size_t __len = strlen(__src);
+ if (__len)
+ {
+ __try
+ {
+ char* __dst = new char[__len + 1];
+ memcpy(__dst, __src, __len + 1);
+ _M_data->_M_grouping = __dst;
+ }
+ __catch(...)
+ {
+ delete _M_data;
+ _M_data = 0;
+ __throw_exception_again;
+ }
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+ }
+
+ // NB: There is no way to extact this info from posix locales.
+ // _M_truename = nl_langinfo_l(YESSTR, __cloc);
+ _M_data->_M_truename = "true";
+ _M_data->_M_truename_size = 4;
+ // _M_falsename = nl_langinfo_l(NOSTR, __cloc);
+ _M_data->_M_falsename = "false";
+ _M_data->_M_falsename_size = 5;
+ }
+
+ template<>
+ numpunct<char>::~numpunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ delete _M_data;
+ }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template<>
+ void
+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
+ {
+ if (!_M_data)
+ _M_data = new __numpunct_cache<wchar_t>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _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...
+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
+ _M_data->_M_atoms_out[__i] =
+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
+
+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
+ _M_data->_M_atoms_in[__j] =
+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
+ }
+ else
+ {
+ // Named locale.
+
+ struct lconv * __conv = localeconv_l(__cloc);
+
+ _M_data->_M_decimal_point
+ = __gnu_cxx::__mb_to_wchar_t(__conv->decimal_point, __cloc);
+ _M_data->_M_thousands_sep
+ = __gnu_cxx::__mb_to_wchar_t(__conv->thousands_sep, __cloc);
+
+ // Check for NULL, which implies no grouping.
+ if (_M_data->_M_thousands_sep == L'\0')
+ {
+ // Like in "C" locale.
+ _M_data->_M_grouping = "";
+ _M_data->_M_grouping_size = 0;
+ _M_data->_M_use_grouping = false;
+ _M_data->_M_thousands_sep = L',';
+ }
+ else
+ {
+ const char* __src = __conv->grouping;
+ const size_t __len = strlen(__src);
+ if (__len)
+ {
+ __try
+ {
+ char* __dst = new char[__len + 1];
+ memcpy(__dst, __src, __len + 1);
+ _M_data->_M_grouping = __dst;
+ }
+ __catch(...)
+ {
+ delete _M_data;
+ _M_data = 0;
+ __throw_exception_again;
+ }
+ }
+ else
+ {
+ _M_data->_M_grouping = "";
+ _M_data->_M_use_grouping = false;
+ }
+ _M_data->_M_grouping_size = __len;
+ }
+ }
+
+ // NB: There is no way to extact this info from posix locales.
+ // _M_truename = nl_langinfo_l(YESSTR, __cloc);
+ _M_data->_M_truename = L"true";
+ _M_data->_M_truename_size = 4;
+ // _M_falsename = nl_langinfo_l(NOSTR, __cloc);
+ _M_data->_M_falsename = L"false";
+ _M_data->_M_falsename_size = 5;
+ }
+
+ template<>
+ numpunct<wchar_t>::~numpunct()
+ {
+ if (_M_data->_M_grouping_size)
+ delete [] _M_data->_M_grouping;
+ delete _M_data;
+ }
+ #endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/time_members.cc b/libstdc++-v3/config/locale/xlocale/time_members.cc
new file mode 100644
index 0000000..dfe0a0c
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/time_members.cc
@@ -0,0 +1,371 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+// Modified by Vaclav Zeman <vhaisman@gmail.com> for POSIX 2008 locale support
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ template<>
+ void
+ __timepunct<char>::
+ _M_put(char* __s, size_t __maxlen, const char* __format,
+ const tm* __tm) const throw()
+ {
+ const size_t __len = strftime_l(__s, __maxlen, __format, __tm,
+ _M_c_locale_timepunct);
+ // Make sure __s is null terminated.
+ if (__len == 0)
+ __s[0] = '\0';
+ }
+
+ template<>
+ void
+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
+ {
+ if (!_M_data)
+ _M_data = new __timepunct_cache<char>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_c_locale_timepunct = _S_get_c_locale();
+
+ _M_data->_M_date_format = "%m/%d/%y";
+ _M_data->_M_date_era_format = "%m/%d/%y";
+ _M_data->_M_time_format = "%H:%M:%S";
+ _M_data->_M_time_era_format = "%H:%M:%S";
+ _M_data->_M_date_time_format = "";
+ _M_data->_M_date_time_era_format = "";
+ _M_data->_M_am = "AM";
+ _M_data->_M_pm = "PM";
+ _M_data->_M_am_pm_format = "";
+
+ // Day names, starting with "C"'s Sunday.
+ _M_data->_M_day1 = "Sunday";
+ _M_data->_M_day2 = "Monday";
+ _M_data->_M_day3 = "Tuesday";
+ _M_data->_M_day4 = "Wednesday";
+ _M_data->_M_day5 = "Thursday";
+ _M_data->_M_day6 = "Friday";
+ _M_data->_M_day7 = "Saturday";
+
+ // Abbreviated day names, starting with "C"'s Sun.
+ _M_data->_M_aday1 = "Sun";
+ _M_data->_M_aday2 = "Mon";
+ _M_data->_M_aday3 = "Tue";
+ _M_data->_M_aday4 = "Wed";
+ _M_data->_M_aday5 = "Thu";
+ _M_data->_M_aday6 = "Fri";
+ _M_data->_M_aday7 = "Sat";
+
+ // Month names, starting with "C"'s January.
+ _M_data->_M_month01 = "January";
+ _M_data->_M_month02 = "February";
+ _M_data->_M_month03 = "March";
+ _M_data->_M_month04 = "April";
+ _M_data->_M_month05 = "May";
+ _M_data->_M_month06 = "June";
+ _M_data->_M_month07 = "July";
+ _M_data->_M_month08 = "August";
+ _M_data->_M_month09 = "September";
+ _M_data->_M_month10 = "October";
+ _M_data->_M_month11 = "November";
+ _M_data->_M_month12 = "December";
+
+ // Abbreviated month names, starting with "C"'s Jan.
+ _M_data->_M_amonth01 = "Jan";
+ _M_data->_M_amonth02 = "Feb";
+ _M_data->_M_amonth03 = "Mar";
+ _M_data->_M_amonth04 = "Apr";
+ _M_data->_M_amonth05 = "May";
+ _M_data->_M_amonth06 = "Jun";
+ _M_data->_M_amonth07 = "Jul";
+ _M_data->_M_amonth08 = "Aug";
+ _M_data->_M_amonth09 = "Sep";
+ _M_data->_M_amonth10 = "Oct";
+ _M_data->_M_amonth11 = "Nov";
+ _M_data->_M_amonth12 = "Dec";
+ }
+ else
+ {
+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
+
+ _M_data->_M_date_format = nl_langinfo_l(D_FMT, __cloc);
+ _M_data->_M_date_era_format = nl_langinfo_l(ERA_D_FMT, __cloc);
+ _M_data->_M_time_format = nl_langinfo_l(T_FMT, __cloc);
+ _M_data->_M_time_era_format = nl_langinfo_l(ERA_T_FMT, __cloc);
+ _M_data->_M_date_time_format = nl_langinfo_l(D_T_FMT, __cloc);
+ _M_data->_M_date_time_era_format = nl_langinfo_l(ERA_D_T_FMT,
+ __cloc);
+ _M_data->_M_am = nl_langinfo_l(AM_STR, __cloc);
+ _M_data->_M_pm = nl_langinfo_l(PM_STR, __cloc);
+ _M_data->_M_am_pm_format = nl_langinfo_l(T_FMT_AMPM, __cloc);
+
+ // Day names, starting with "C"'s Sunday.
+ _M_data->_M_day1 = nl_langinfo_l(DAY_1, __cloc);
+ _M_data->_M_day2 = nl_langinfo_l(DAY_2, __cloc);
+ _M_data->_M_day3 = nl_langinfo_l(DAY_3, __cloc);
+ _M_data->_M_day4 = nl_langinfo_l(DAY_4, __cloc);
+ _M_data->_M_day5 = nl_langinfo_l(DAY_5, __cloc);
+ _M_data->_M_day6 = nl_langinfo_l(DAY_6, __cloc);
+ _M_data->_M_day7 = nl_langinfo_l(DAY_7, __cloc);
+
+ // Abbreviated day names, starting with "C"'s Sun.
+ _M_data->_M_aday1 = nl_langinfo_l(ABDAY_1, __cloc);
+ _M_data->_M_aday2 = nl_langinfo_l(ABDAY_2, __cloc);
+ _M_data->_M_aday3 = nl_langinfo_l(ABDAY_3, __cloc);
+ _M_data->_M_aday4 = nl_langinfo_l(ABDAY_4, __cloc);
+ _M_data->_M_aday5 = nl_langinfo_l(ABDAY_5, __cloc);
+ _M_data->_M_aday6 = nl_langinfo_l(ABDAY_6, __cloc);
+ _M_data->_M_aday7 = nl_langinfo_l(ABDAY_7, __cloc);
+
+ // Month names, starting with "C"'s January.
+ _M_data->_M_month01 = nl_langinfo_l(MON_1, __cloc);
+ _M_data->_M_month02 = nl_langinfo_l(MON_2, __cloc);
+ _M_data->_M_month03 = nl_langinfo_l(MON_3, __cloc);
+ _M_data->_M_month04 = nl_langinfo_l(MON_4, __cloc);
+ _M_data->_M_month05 = nl_langinfo_l(MON_5, __cloc);
+ _M_data->_M_month06 = nl_langinfo_l(MON_6, __cloc);
+ _M_data->_M_month07 = nl_langinfo_l(MON_7, __cloc);
+ _M_data->_M_month08 = nl_langinfo_l(MON_8, __cloc);
+ _M_data->_M_month09 = nl_langinfo_l(MON_9, __cloc);
+ _M_data->_M_month10 = nl_langinfo_l(MON_10, __cloc);
+ _M_data->_M_month11 = nl_langinfo_l(MON_11, __cloc);
+ _M_data->_M_month12 = nl_langinfo_l(MON_12, __cloc);
+
+ // Abbreviated month names, starting with "C"'s Jan.
+ _M_data->_M_amonth01 = nl_langinfo_l(ABMON_1, __cloc);
+ _M_data->_M_amonth02 = nl_langinfo_l(ABMON_2, __cloc);
+ _M_data->_M_amonth03 = nl_langinfo_l(ABMON_3, __cloc);
+ _M_data->_M_amonth04 = nl_langinfo_l(ABMON_4, __cloc);
+ _M_data->_M_amonth05 = nl_langinfo_l(ABMON_5, __cloc);
+ _M_data->_M_amonth06 = nl_langinfo_l(ABMON_6, __cloc);
+ _M_data->_M_amonth07 = nl_langinfo_l(ABMON_7, __cloc);
+ _M_data->_M_amonth08 = nl_langinfo_l(ABMON_8, __cloc);
+ _M_data->_M_amonth09 = nl_langinfo_l(ABMON_9, __cloc);
+ _M_data->_M_amonth10 = nl_langinfo_l(ABMON_10, __cloc);
+ _M_data->_M_amonth11 = nl_langinfo_l(ABMON_11, __cloc);
+ _M_data->_M_amonth12 = nl_langinfo_l(ABMON_12, __cloc);
+ }
+ }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template<>
+ void
+ __timepunct<wchar_t>::
+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
+ const tm* __tm) const throw()
+ {
+ const size_t __len = wcsftime_l(__s, __maxlen, __format, __tm,
+ _M_c_locale_timepunct);
+ // Make sure __s is null terminated.
+ if (__len == 0)
+ __s[0] = L'\0';
+ }
+
+ template<>
+ void
+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
+ {
+ if (!_M_data)
+ _M_data = new __timepunct_cache<wchar_t>;
+
+ if (!__cloc)
+ {
+ // "C" locale
+ _M_c_locale_timepunct = _S_get_c_locale();
+
+ _M_data->_M_date_format = L"%m/%d/%y";
+ _M_data->_M_date_era_format = L"%m/%d/%y";
+ _M_data->_M_time_format = L"%H:%M:%S";
+ _M_data->_M_time_era_format = L"%H:%M:%S";
+ _M_data->_M_date_time_format = L"";
+ _M_data->_M_date_time_era_format = L"";
+ _M_data->_M_am = L"AM";
+ _M_data->_M_pm = L"PM";
+ _M_data->_M_am_pm_format = L"";
+
+ // Day names, starting with "C"'s Sunday.
+ _M_data->_M_day1 = L"Sunday";
+ _M_data->_M_day2 = L"Monday";
+ _M_data->_M_day3 = L"Tuesday";
+ _M_data->_M_day4 = L"Wednesday";
+ _M_data->_M_day5 = L"Thursday";
+ _M_data->_M_day6 = L"Friday";
+ _M_data->_M_day7 = L"Saturday";
+
+ // Abbreviated day names, starting with "C"'s Sun.
+ _M_data->_M_aday1 = L"Sun";
+ _M_data->_M_aday2 = L"Mon";
+ _M_data->_M_aday3 = L"Tue";
+ _M_data->_M_aday4 = L"Wed";
+ _M_data->_M_aday5 = L"Thu";
+ _M_data->_M_aday6 = L"Fri";
+ _M_data->_M_aday7 = L"Sat";
+
+ // Month names, starting with "C"'s January.
+ _M_data->_M_month01 = L"January";
+ _M_data->_M_month02 = L"February";
+ _M_data->_M_month03 = L"March";
+ _M_data->_M_month04 = L"April";
+ _M_data->_M_month05 = L"May";
+ _M_data->_M_month06 = L"June";
+ _M_data->_M_month07 = L"July";
+ _M_data->_M_month08 = L"August";
+ _M_data->_M_month09 = L"September";
+ _M_data->_M_month10 = L"October";
+ _M_data->_M_month11 = L"November";
+ _M_data->_M_month12 = L"December";
+
+ // Abbreviated month names, starting with "C"'s Jan.
+ _M_data->_M_amonth01 = L"Jan";
+ _M_data->_M_amonth02 = L"Feb";
+ _M_data->_M_amonth03 = L"Mar";
+ _M_data->_M_amonth04 = L"Apr";
+ _M_data->_M_amonth05 = L"May";
+ _M_data->_M_amonth06 = L"Jun";
+ _M_data->_M_amonth07 = L"Jul";
+ _M_data->_M_amonth08 = L"Aug";
+ _M_data->_M_amonth09 = L"Sep";
+ _M_data->_M_amonth10 = L"Oct";
+ _M_data->_M_amonth11 = L"Nov";
+ _M_data->_M_amonth12 = L"Dec";
+ }
+ else
+ {
+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
+
+ // TODO: Use _Delete_and_null here on _M_data.
+
+ _M_data->_M_allocated = true;
+ _M_data->_M_date_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(D_FMT, __cloc);
+ _M_data->_M_date_era_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ERA_D_FMT, __cloc);
+ _M_data->_M_time_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(T_FMT, __cloc);
+ _M_data->_M_time_era_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ERA_T_FMT, __cloc);
+ _M_data->_M_date_time_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(D_T_FMT, __cloc);
+ _M_data->_M_date_time_era_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ERA_D_T_FMT, __cloc);
+ _M_data->_M_am = __gnu_cxx::__nl_langinfo_l_w_alloc(AM_STR, __cloc);
+ _M_data->_M_pm = __gnu_cxx::__nl_langinfo_l_w_alloc(PM_STR, __cloc);
+ _M_data->_M_am_pm_format
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(T_FMT_AMPM, __cloc);
+
+ // Day names, starting with "C"'s Sunday.
+ _M_data->_M_day1 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_1, __cloc);
+ _M_data->_M_day2 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_2, __cloc);
+ _M_data->_M_day3 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_3, __cloc);
+ _M_data->_M_day4 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_4, __cloc);
+ _M_data->_M_day5 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_5, __cloc);
+ _M_data->_M_day6 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_6, __cloc);
+ _M_data->_M_day7 = __gnu_cxx::__nl_langinfo_l_w_alloc(DAY_7, __cloc);
+
+ // Abbreviated day names, starting with "C"'s Sun.
+ _M_data->_M_aday1
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_1, __cloc);
+ _M_data->_M_aday2
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_2, __cloc);
+ _M_data->_M_aday3
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_3, __cloc);
+ _M_data->_M_aday4
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_4, __cloc);
+ _M_data->_M_aday5
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_5, __cloc);
+ _M_data->_M_aday6
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_6, __cloc);
+ _M_data->_M_aday7
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABDAY_7, __cloc);
+
+ // Month names, starting with "C"'s January.
+ _M_data->_M_month01
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_1, __cloc);
+ _M_data->_M_month02
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_2, __cloc);
+ _M_data->_M_month03
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_3, __cloc);
+ _M_data->_M_month04
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_4, __cloc);
+ _M_data->_M_month05
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_5, __cloc);
+ _M_data->_M_month06
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_6, __cloc);
+ _M_data->_M_month07
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_7, __cloc);
+ _M_data->_M_month08
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_8, __cloc);
+ _M_data->_M_month09
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_9, __cloc);
+ _M_data->_M_month10
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_10, __cloc);
+ _M_data->_M_month11
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_11, __cloc);
+ _M_data->_M_month12
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(MON_12, __cloc);
+
+ // Abbreviated month names, starting with "C"'s Jan.
+ _M_data->_M_amonth01
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_1, __cloc);
+ _M_data->_M_amonth02
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_2, __cloc);
+ _M_data->_M_amonth03
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_3, __cloc);
+ _M_data->_M_amonth04
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_4, __cloc);
+ _M_data->_M_amonth05
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_5, __cloc);
+ _M_data->_M_amonth06
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_6, __cloc);
+ _M_data->_M_amonth07
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_7, __cloc);
+ _M_data->_M_amonth08
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_8, __cloc);
+ _M_data->_M_amonth09
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_9, __cloc);
+ _M_data->_M_amonth10
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_10, __cloc);
+ _M_data->_M_amonth11
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_11, __cloc);
+ _M_data->_M_amonth12
+ = __gnu_cxx::__nl_langinfo_l_w_alloc(ABMON_12, __cloc);
+ }
+ }
+#endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/locale/xlocale/time_members.h b/libstdc++-v3/config/locale/xlocale/time_members.h
new file mode 100644
index 0000000..07b3cc2
--- /dev/null
+++ b/libstdc++-v3/config/locale/xlocale/time_members.h
@@ -0,0 +1,89 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
+// Copyright (C) 2001-2013 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 3, 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/time_members.h
+ * This is an internal header file, included by other library headers.
+ * Do not attempt to use it directly. @headername{locale}
+ */
+
+//
+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+ template<typename _CharT>
+ __timepunct<_CharT>::__timepunct(size_t __refs)
+ : facet(__refs), _M_data(0), _M_c_locale_timepunct(0),
+ _M_name_timepunct(_S_get_c_name())
+ { _M_initialize_timepunct(); }
+
+ template<typename _CharT>
+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0),
+ _M_name_timepunct(_S_get_c_name())
+ { _M_initialize_timepunct(); }
+
+ template<typename _CharT>
+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
+ size_t __refs)
+ : facet(__refs), _M_data(0), _M_c_locale_timepunct(0),
+ _M_name_timepunct(0)
+ {
+ if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
+ {
+ const size_t __len = __builtin_strlen(__s) + 1;
+ char* __tmp = new char[__len];
+ __builtin_memcpy(__tmp, __s, __len);
+ _M_name_timepunct = __tmp;
+ }
+ else
+ _M_name_timepunct = _S_get_c_name();
+
+ __try
+ { _M_initialize_timepunct(__cloc); }
+ __catch(...)
+ {
+ if (_M_name_timepunct != _S_get_c_name())
+ delete [] _M_name_timepunct;
+ __throw_exception_again;
+ }
+ }
+
+ template<typename _CharT>
+ __timepunct<_CharT>::~__timepunct()
+ {
+ if (_M_name_timepunct != _S_get_c_name())
+ delete [] _M_name_timepunct;
+ delete _M_data;
+ _S_destroy_c_locale(_M_c_locale_timepunct);
+ }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git a/libstdc++-v3/config/os/bsd/freebsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/freebsd/ctype_inline.h
index 7c51e09..9e2c397 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/ctype_inline.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/ctype_inline.h
@@ -34,6 +34,7 @@
// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
// functions go in ctype.cc
+#if ! defined (_GLIBCXX_XLOCALE)
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -148,3 +149,5 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
+
+#endif
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 448bee3..ae4bd36 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15811,7 +15811,7 @@ $as_echo "stdio" >&6; }
if test "${enable_clocale+set}" = set; then :
enableval=$enable_clocale;
case "$enableval" in
- generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto) ;;
+ generic|gnu|ieee_1003.1-2001|xlocale|newlib|yes|no|auto) ;;
*) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
esac
@@ -16083,6 +16083,29 @@ $as_echo "IEEE 1003.1" >&6; }
CTIME_CC=config/locale/generic/time_members.cc
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
;;
+
+ xlocale)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: xlocale" >&5
+$as_echo "xlocale" >&6; }
+
+
+$as_echo "#define _GLIBCXX_XLOCALE 1" >>confdefs.h
+
+
+ CLOCALE_H=config/locale/xlocale/c_locale.h
+ CLOCALE_CC=config/locale/xlocale/c_locale.cc
+ CCODECVT_CC=config/locale/xlocale/codecvt_members.cc
+ CCOLLATE_CC=config/locale/xlocale/collate_members.cc
+ CCTYPE_CC=config/locale/xlocale/ctype_members.cc
+ CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
+ CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
+ CMONEY_CC=config/locale/xlocale/monetary_members.cc
+ CNUMERIC_CC=config/locale/xlocale/numeric_members.cc
+ CTIME_H=config/locale/xlocale/time_members.h
+ CTIME_CC=config/locale/xlocale/time_members.cc
+ CLOCALE_INTERNAL_H=config/locale/xlocale/c++locale_internal.h
+ ;;
+
newlib)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: newlib" >&5
$as_echo "newlib" >&6; }
diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am
index 7dda948..664af1b 100644
--- a/libstdc++-v3/src/c++11/Makefile.am
+++ b/libstdc++-v3/src/c++11/Makefile.am
@@ -27,6 +27,14 @@ noinst_LTLIBRARIES = libc++11convenience.la
headers =
+# Source files linked in via configuration/make substitution for a
+# particular host.
+host_sources = \
+ monetary_members.cc
+
+monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
+
sources = \
chrono.cc \
condition_variable.cc \
@@ -44,7 +52,8 @@ sources = \
shared_ptr.cc \
snprintf_lite.cc \
system_error.cc \
- thread.cc
+ thread.cc \
+ ${host_sources}
if ENABLE_EXTERN_TEMPLATE
# XTEMPLATE_FLAGS = -fno-implicit-templates
@@ -62,7 +71,7 @@ vpath % $(top_srcdir)/src/c++11
libc__11convenience_la_SOURCES = $(sources) $(inst_sources)
# Use special rules for the hashtable.cc file so that all
-# the generated template functions are also instantiated.
+# the generated template functions are also instantiated.
hashtable_c++0x.lo: hashtable_c++0x.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $<
hashtable_c++0x.o: hashtable_c++0x.cc
@@ -96,7 +105,7 @@ AM_MAKEFLAGS = \
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use.
-#
+#
# The second tag argument, `--tag disable-shared` means that libtool
# only compiles each source once, for static objects. In actuality,
# glibcxx_lt_pic_flag and glibcxx_compiler_shared_flag are added to
diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
index 83b7bd1..db51cd5 100644
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -67,14 +67,15 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libc__11convenience_la_LIBADD =
-am__objects_1 = chrono.lo condition_variable.lo debug.lo \
+am__objects_1 = monetary_members.lo
+am__objects_2 = chrono.lo condition_variable.lo debug.lo \
functexcept.lo functional.lo future.lo hash_c++0x.lo \
hashtable_c++0x.lo limits.lo mutex.lo placeholders.lo \
random.lo regex.lo shared_ptr.lo snprintf_lite.lo \
- system_error.lo thread.lo
-@ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_2 = fstream-inst.lo \
+ system_error.lo thread.lo $(am__objects_1)
+@ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_3 = fstream-inst.lo \
@ENABLE_EXTERN_TEMPLATE_TRUE@ string-inst.lo wstring-inst.lo
-am_libc__11convenience_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+am_libc__11convenience_la_OBJECTS = $(am__objects_2) $(am__objects_3)
libc__11convenience_la_OBJECTS = $(am_libc__11convenience_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp =
@@ -310,6 +311,12 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Convenience library for C++11 runtime.
noinst_LTLIBRARIES = libc++11convenience.la
headers =
+
+# Source files linked in via configuration/make substitution for a
+# particular host.
+host_sources = \
+ monetary_members.cc
+
sources = \
chrono.cc \
condition_variable.cc \
@@ -327,7 +334,8 @@ sources = \
shared_ptr.cc \
snprintf_lite.cc \
system_error.cc \
- thread.cc
+ thread.cc \
+ ${host_sources}
# XTEMPLATE_FLAGS =
@ENABLE_EXTERN_TEMPLATE_FALSE@inst_sources =
@@ -369,7 +377,7 @@ AM_MAKEFLAGS = \
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use.
-#
+#
# The second tag argument, `--tag disable-shared` means that libtool
# only compiles each source once, for static objects. In actuality,
# glibcxx_lt_pic_flag and glibcxx_compiler_shared_flag are added to
@@ -634,10 +642,13 @@ uninstall-am:
pdf pdf-am ps ps-am tags uninstall uninstall-am
+monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
+
vpath % $(top_srcdir)/src/c++11
# Use special rules for the hashtable.cc file so that all
-# the generated template functions are also instantiated.
+# the generated template functions are also instantiated.
hashtable_c++0x.lo: hashtable_c++0x.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $<
hashtable_c++0x.o: hashtable_c++0x.cc
diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am
index 8ebff1a..17f3cb1 100644
--- a/libstdc++-v3/src/c++98/Makefile.am
+++ b/libstdc++-v3/src/c++98/Makefile.am
@@ -23,7 +23,7 @@
include $(top_srcdir)/fragment.am
# Convenience library for C++98 runtime.
-noinst_LTLIBRARIES = libc++98convenience.la
+noinst_LTLIBRARIES = libc++98convenience.la
headers =
@@ -36,7 +36,6 @@ host_sources = \
ctype_configure_char.cc \
ctype_members.cc \
messages_members.cc \
- monetary_members.cc \
numeric_members.cc \
time_members.cc
@@ -55,9 +54,6 @@ ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
-monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
- $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
-
numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
$(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
@@ -159,7 +155,7 @@ concept-inst.o: concept-inst.cc
$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
# Use special rules for parallel mode compilation.
-PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
+PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
parallel_settings.lo: parallel_settings.cc
$(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $<
parallel_settings.o: parallel_settings.cc
@@ -192,7 +188,7 @@ AM_MAKEFLAGS = \
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use.
-#
+#
# The second tag argument, `--tag disable-shared` means that libtool
# only compiles each source once, for static objects. In actuality,
# glibcxx_lt_pic_flag and glibcxx_compiler_shared_flag are added to
diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in
index cf9cda5..dd87ddc 100644
--- a/libstdc++-v3/src/c++98/Makefile.in
+++ b/libstdc++-v3/src/c++98/Makefile.in
@@ -69,7 +69,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libc__98convenience_la_LIBADD =
am__objects_1 = atomicity.lo codecvt_members.lo collate_members.lo \
ctype_configure_char.lo ctype_members.lo messages_members.lo \
- monetary_members.lo numeric_members.lo time_members.lo
+ numeric_members.lo time_members.lo
@ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_2 = allocator-inst.lo \
@ENABLE_EXTERN_TEMPLATE_TRUE@ concept-inst.lo ext-inst.lo \
@ENABLE_EXTERN_TEMPLATE_TRUE@ ios-inst.lo iostream-inst.lo \
@@ -323,7 +323,7 @@ WARN_CXXFLAGS = \
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Convenience library for C++98 runtime.
-noinst_LTLIBRARIES = libc++98convenience.la
+noinst_LTLIBRARIES = libc++98convenience.la
headers =
# Source files linked in via configuration/make substitution for a
@@ -335,7 +335,6 @@ host_sources = \
ctype_configure_char.cc \
ctype_members.cc \
messages_members.cc \
- monetary_members.cc \
numeric_members.cc \
time_members.cc
@@ -409,7 +408,7 @@ libc__98convenience_la_SOURCES = $(sources)
GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include
# Use special rules for parallel mode compilation.
-PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
+PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
# modified in a per-library or per-sub-library way. Need to manually
@@ -439,7 +438,7 @@ AM_MAKEFLAGS = \
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use.
-#
+#
# The second tag argument, `--tag disable-shared` means that libtool
# only compiles each source once, for static objects. In actuality,
# glibcxx_lt_pic_flag and glibcxx_compiler_shared_flag are added to
@@ -719,9 +718,6 @@ ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
-monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
- $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
-
numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
$(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
More information about the Libstdc++
mailing list