]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - libstdc++-v3/config/locale/gnu/monetary_members.cc
Update copyright years.
[thirdparty/gcc.git] / libstdc++-v3 / config / locale / gnu / monetary_members.cc
index a2aa0c5933a76baec42b900b06cc31caf3058602..75af8e3ce42f917d592916fec1067a66725e61e7 100644 (file)
@@ -1,11 +1,11 @@
 // std::moneypunct implementation details, GNU version -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001-2024 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// 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,
 // 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.
+// 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.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// 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
 #include <locale>
 #include <bits/c++locale_internal.h>
 
-namespace std
+namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+// This file might be compiled twice, but we only want to define the members
+// of money_base once.
+#if ! _GLIBCXX_USE_CXX11_ABI
+
   // 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)
-  { 
+  money_base::_S_construct_pattern(char __precedes, char __space,
+                                  char __posn) throw()
+  {
     pattern __ret;
 
     // This insanely complicated routine attempts to construct a valid
@@ -50,7 +52,7 @@ namespace std
 
     // if (__precedes) symbol -> value
     // else value -> symbol
-    
+
     // if (__space) space
     // else none
 
@@ -135,7 +137,7 @@ namespace std
        if (__precedes)
          {
            __ret.field[0] = sign;
-           __ret.field[1] = symbol;        
+           __ret.field[1] = symbol;
            if (__space)
              {
                __ret.field[2] = space;
@@ -143,7 +145,7 @@ namespace std
              }
            else
              {
-               __ret.field[2] = value;         
+               __ret.field[2] = value;
                __ret.field[3] = none;
              }
          }
@@ -199,18 +201,21 @@ namespace std
          }
        break;
       default:
-       ;
+       __ret = pattern();
       }
     return __ret;
   }
+#endif
+
+  extern char __narrow_multibyte_chars(const char* s, __locale_t cloc);
 
-  template<> 
+  template<>
     void
-    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, 
+    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
                                                     const char*)
     {
       if (!_M_data)
-       _M_data = new __moneypunct_cache<char>;
+       _M_data = new __moneypunct_cache<char, true>;
 
       if (!__cloc)
        {
@@ -218,53 +223,155 @@ namespace std
          _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.
-         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
-                                                       __cloc));
-         _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
+         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
                                                        __cloc));
-         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-         _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         const char* thousands_sep = __nl_langinfo_l(__MON_THOUSANDS_SEP,
+                                                     __cloc);
+         if (thousands_sep[0] != '\0' && thousands_sep[1] != '\0')
+           _M_data->_M_thousands_sep = __narrow_multibyte_chars(thousands_sep,
+                                                                __cloc);
+         else
+           _M_data->_M_thousands_sep = *thousands_sep;
 
-         char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-         if (!__nposn)
-           _M_data->_M_negative_sign = "()";
+         // 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_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, 
-                                                       __cloc);
+           _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
+                                                       __cloc));
 
+         const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc);
+         const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
          // _Intl == true
-         _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-         _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
-                                                     __cloc));
+         const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
+
+         char* __group = 0;
+         char* __ps = 0;
+         char* __ns = 0;
+         const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
+         __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 = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
          char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
          char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
                                                        __pposn);
          char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
          char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
                                                        __nposn);
        }
     }
 
-  template<> 
+  template<>
     void
-    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, 
+    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
                                                      const char*)
     {
       if (!_M_data)
-       _M_data = new __moneypunct_cache<char>;
+       _M_data = new __moneypunct_cache<char, false>;
 
       if (!__cloc)
        {
@@ -272,57 +379,177 @@ namespace std
          _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.
-         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
+         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
                                                        __cloc));
-         _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
+         _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
                                                        __cloc));
-         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-         _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
 
-         char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-         if (!__nposn)
-           _M_data->_M_negative_sign = "()";
+         // 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_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, 
-                                                       __cloc);
+           _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS,
+                                                       __cloc));
 
+         const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc);
+         const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
          // _Intl == false
-         _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-         _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
+         const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
+
+         char* __group = 0;
+         char* __ps = 0;
+         char* __ns = 0;
+         const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
+         __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 = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
          char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
          char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
                                                        __pposn);
          char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
          char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
                                                        __nposn);
        }
     }
 
-  template<> 
+  template<>
     moneypunct<char, true>::~moneypunct()
-    { delete _M_data; }
+    {
+      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<> 
+  template<>
     moneypunct<char, false>::~moneypunct()
-    { delete _M_data; }
+    {
+      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<> 
+  template<>
     void
-    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, 
+    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
                                                        const char*)
 #else
@@ -330,7 +557,7 @@ namespace std
 #endif
     {
       if (!_M_data)
-       _M_data = new __moneypunct_cache<wchar_t>;
+       _M_data = new __moneypunct_cache<wchar_t, true>;
 
       if (!__cloc)
        {
@@ -338,12 +565,22 @@ namespace std
          _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
        {
@@ -352,104 +589,148 @@ namespace std
          __c_locale __old = __uselocale(__cloc);
 #else
          // Switch to named locale so that mbsrtowcs will work.
-         char* __old = strdup(setlocale(LC_ALL, NULL));
+         char* __old = setlocale(LC_ALL, 0);
+          const size_t __llen = strlen(__old) + 1;
+          char* __sav = new char[__llen];
+          memcpy(__sav, __old, __llen);
          setlocale(LC_ALL, __name);
 #endif
 
-         union __s_and_w { const char *__s; unsigned int __w; } __u;
-         __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-         _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
+         union { char *__s; wchar_t __w; } __u;
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
+         _M_data->_M_decimal_point = __u.__w;
 
-         __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-         _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w);
-         _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
+         _M_data->_M_thousands_sep = __u.__w;
 
+         // 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 = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
+                                                       __cloc));
+
+         const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc);
          const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
          const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
          const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
 
+         char* __group = 0;
          wchar_t* __wcs_ps = 0;
          wchar_t* __wcs_ns = 0;
          const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-         try
+         __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;
-             size_t __len = strlen(__cpossign);
+             __len = strlen(__cpossign);
              if (__len)
                {
-                 ++__len;
                  memset(&__state, 0, sizeof(mbstate_t));
-                 __wcs_ps = new wchar_t[__len];
-                 mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
+                 __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)
-               { 
-                 ++__len;
+               {
                  memset(&__state, 0, sizeof(mbstate_t));
-                 __wcs_ns = new wchar_t[__len];
-                 mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
+                 __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)
                {
-                 ++__len;
                  memset(&__state, 0, sizeof(mbstate_t));
-                 wchar_t* __wcs = new wchar_t[__len];
-                 mbsrtowcs(__wcs, &__ccurr, __len, &__state);
+                 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 (...)
+         __catch(...)
            {
              delete _M_data;
              _M_data = 0;
-             delete __wcs_ps;
-             delete __wcs_ns;        
+             delete [] __group;
+             delete [] __wcs_ps;
+             delete [] __wcs_ns;
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
              __uselocale(__old);
 #else
-             setlocale(LC_ALL, __old);
-             free(__old);
+             setlocale(LC_ALL, __sav);
+             delete [] __sav;
 #endif
              __throw_exception_again;
-           } 
-         
-         _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
-                                                     __cloc));
+           }
+
          char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
          char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
          char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
                                                        __pposn);
          char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
          char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
                                                        __nposn);
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
          __uselocale(__old);
 #else
-         setlocale(LC_ALL, __old);
-         free(__old);
+         setlocale(LC_ALL, __sav);
+         delete [] __sav;
 #endif
        }
     }
 
-  template<> 
+  template<>
   void
   moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
@@ -459,7 +740,7 @@ namespace std
 #endif
   {
     if (!_M_data)
-      _M_data = new __moneypunct_cache<wchar_t>;
+      _M_data = new __moneypunct_cache<wchar_t, false>;
 
     if (!__cloc)
        {
@@ -467,12 +748,22 @@ namespace std
          _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
        {
@@ -481,127 +772,177 @@ namespace std
          __c_locale __old = __uselocale(__cloc);
 #else
          // Switch to named locale so that mbsrtowcs will work.
-         char* __old = strdup(setlocale(LC_ALL, NULL));
+         char* __old = setlocale(LC_ALL, 0);
+          const size_t __llen = strlen(__old) + 1;
+          char* __sav = new char[__llen];
+          memcpy(__sav, __old, __llen);
          setlocale(LC_ALL, __name);
 #endif
 
-         union __s_and_w { const char *__s; unsigned int __w; } __u;
-         __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-         _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
+          union { char *__s; wchar_t __w; } __u;
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
+         _M_data->_M_decimal_point = __u.__w;
 
-         __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-         _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w);
-         _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
+         _M_data->_M_thousands_sep = __u.__w;
 
+         // 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 = *(__nl_langinfo_l(__FRAC_DIGITS,
+                                                       __cloc));
+
+         const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc);
          const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
          const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
          const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
 
+         char* __group = 0;
          wchar_t* __wcs_ps = 0;
          wchar_t* __wcs_ns = 0;
          const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-         try
+         __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;
-              size_t __len;
               __len = strlen(__cpossign);
               if (__len)
                 {
-                 ++__len;
                  memset(&__state, 0, sizeof(mbstate_t));
-                 __wcs_ps = new wchar_t[__len];
-                 mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
+                 __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)
-               { 
-                 ++__len;
+               {
                  memset(&__state, 0, sizeof(mbstate_t));
-                 __wcs_ns = new wchar_t[__len];
-                 mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
+                 __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)
                {
-                 ++__len;
                  memset(&__state, 0, sizeof(mbstate_t));
-                 wchar_t* __wcs = new wchar_t[__len];
-                 mbsrtowcs(__wcs, &__ccurr, __len, &__state);
+                 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 (...)
+          __catch(...)
            {
              delete _M_data;
               _M_data = 0;
-             delete __wcs_ps;
-             delete __wcs_ns;        
+             delete [] __group;
+             delete [] __wcs_ps;
+             delete [] __wcs_ns;
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
              __uselocale(__old);
 #else
-             setlocale(LC_ALL, __old);
-             free(__old);
+             setlocale(LC_ALL, __sav);
+             delete [] __sav;
 #endif
               __throw_exception_again;
            }
 
-         _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
          char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
          char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
          char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
                                                        __pposn);
          char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
          char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
                                                        __nposn);
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
          __uselocale(__old);
 #else
-         setlocale(LC_ALL, __old);
-         free(__old);
+         setlocale(LC_ALL, __sav);
+         delete [] __sav;
 #endif
        }
     }
 
-  template<> 
+  template<>
     moneypunct<wchar_t, true>::~moneypunct()
     {
-      if (wcslen(_M_data->_M_positive_sign))
+      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 (wcslen(_M_data->_M_negative_sign) 
-       && (wcscmp(_M_data->_M_negative_sign, L"()") != 0))
+      if (_M_data->_M_negative_sign_size
+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
        delete [] _M_data->_M_negative_sign;
-      if (wcslen(_M_data->_M_curr_symbol))
+      if (_M_data->_M_curr_symbol_size)
        delete [] _M_data->_M_curr_symbol;
       delete _M_data;
     }
 
-  template<> 
+  template<>
     moneypunct<wchar_t, false>::~moneypunct()
     {
-      if (wcslen(_M_data->_M_positive_sign))
+      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 (wcslen(_M_data->_M_negative_sign) 
-       && (wcscmp(_M_data->_M_negative_sign, L"()") != 0))
+      if (_M_data->_M_negative_sign_size
+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
        delete [] _M_data->_M_negative_sign;
-      if (wcslen(_M_data->_M_curr_symbol))
+      if (_M_data->_M_curr_symbol_size)
        delete [] _M_data->_M_curr_symbol;
       delete _M_data;
     }
 #endif
-}
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace