OSDN Git Service

2004-11-18 Paolo Carlini <pcarlini@suse.de>
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / locale_facets.tcc
index 0503c70..b503c95 100644 (file)
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 
 #pragma GCC system_header
 
-#include <cerrno>
-#include <clocale>             // For localeconv
-#include <cstdlib>             // For strof, strtold
-#include <cmath>               // For ceil
-#include <cctype>              // For isspace
-#include <limits>              // For numeric_limits
-#include <typeinfo>            // For bad_cast.
+#include <limits>              // For numeric_limits
+#include <typeinfo>            // For bad_cast.
 #include <bits/streambuf_iterator.h>
 
 namespace std
@@ -74,20 +69,44 @@ namespace std
                                __s2.data(), __s2.data() + __s2.length()) < 0);
     }
 
+  /**
+   *  @brief  Test for the presence of a facet.
+   *
+   *  has_facet tests the locale argument for the presence of the facet type
+   *  provided as the template parameter.  Facets derived from the facet
+   *  parameter will also return true.
+   *
+   *  @param  Facet  The facet type to test the presence of.
+   *  @param  locale  The locale to test.
+   *  @return  true if locale contains a facet of type Facet, else false.
+  */
   template<typename _Facet>
     inline bool
     has_facet(const locale& __loc) throw()
     {
-      size_t __i = _Facet::id._M_id();
+      const size_t __i = _Facet::id._M_id();
       const locale::facet** __facets = __loc._M_impl->_M_facets;
       return (__i < __loc._M_impl->_M_facets_size && __facets[__i]);
     }
 
+  /**
+   *  @brief  Return a facet.
+   *
+   *  use_facet looks for and returns a reference to a facet of type Facet
+   *  where Facet is the template parameter.  If has_facet(locale) is true,
+   *  there is a suitable facet to return.  It throws std::bad_cast if the
+   *  locale doesn't contain a facet of type Facet.
+   *
+   *  @param  Facet  The facet type to access.
+   *  @param  locale  The locale to use.
+   *  @return  Reference to facet of type Facet.
+   *  @throw  std::bad_cast if locale doesn't contain a facet of type Facet.
+  */
   template<typename _Facet>
     inline const _Facet&
     use_facet(const locale& __loc)
     {
-      size_t __i = _Facet::id._M_id();
+      const size_t __i = _Facet::id._M_id();
       const locale::facet** __facets = __loc._M_impl->_M_facets;
       if (!(__i < __loc._M_impl->_M_facets_size && __facets[__i]))
         __throw_bad_cast();
@@ -103,13 +122,14 @@ namespace std
       operator() (const locale& __loc) const;
     };
 
+  // Specializations.
   template<typename _CharT>
     struct __use_cache<__numpunct_cache<_CharT> >
     {
       const __numpunct_cache<_CharT>*
       operator() (const locale& __loc) const
       {
-       size_t __i = numpunct<_CharT>::id._M_id();
+       const size_t __i = numpunct<_CharT>::id._M_id();
        const locale::facet** __caches = __loc._M_impl->_M_caches;
        if (!__caches[__i])
          {
@@ -130,6 +150,123 @@ namespace std
       }
     };
 
+  template<typename _CharT, bool _Intl>
+    struct __use_cache<__moneypunct_cache<_CharT, _Intl> >
+    {
+      const __moneypunct_cache<_CharT, _Intl>*
+      operator() (const locale& __loc) const
+      {
+       const size_t __i = moneypunct<_CharT, _Intl>::id._M_id();
+       const locale::facet** __caches = __loc._M_impl->_M_caches;
+       if (!__caches[__i])
+         {
+           __moneypunct_cache<_CharT, _Intl>* __tmp = NULL;
+           try
+             {
+               __tmp = new __moneypunct_cache<_CharT, _Intl>;
+               __tmp->_M_cache(__loc);
+             }
+           catch(...)
+             {
+               delete __tmp;
+               __throw_exception_again;
+             }
+           __loc._M_impl->_M_install_cache(__tmp, __i);
+         }
+       return static_cast<
+         const __moneypunct_cache<_CharT, _Intl>*>(__caches[__i]);
+      }
+    };
+
+  template<typename _CharT>
+    void
+    __numpunct_cache<_CharT>::_M_cache(const locale& __loc)
+    {
+      _M_allocated = true;
+
+      const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
+
+      _M_grouping_size = __np.grouping().size();
+      char* __grouping = new char[_M_grouping_size];
+      __np.grouping().copy(__grouping, _M_grouping_size);
+      _M_grouping = __grouping;
+      _M_use_grouping = _M_grouping_size && __np.grouping()[0] != 0;
+
+      _M_truename_size = __np.truename().size();
+      _CharT* __truename = new _CharT[_M_truename_size];
+      __np.truename().copy(__truename, _M_truename_size);
+      _M_truename = __truename;
+
+      _M_falsename_size = __np.falsename().size();
+      _CharT* __falsename = new _CharT[_M_falsename_size];
+      __np.falsename().copy(__falsename, _M_falsename_size);
+      _M_falsename = __falsename;
+
+      _M_decimal_point = __np.decimal_point();
+      _M_thousands_sep = __np.thousands_sep();
+
+      const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
+      __ct.widen(__num_base::_S_atoms_out,
+                __num_base::_S_atoms_out + __num_base::_S_oend, _M_atoms_out);
+      __ct.widen(__num_base::_S_atoms_in,
+                __num_base::_S_atoms_in + __num_base::_S_iend, _M_atoms_in);
+    }
+
+  template<typename _CharT, bool _Intl>
+    void
+    __moneypunct_cache<_CharT, _Intl>::_M_cache(const locale& __loc)
+    {
+      _M_allocated = true;
+
+      const moneypunct<_CharT, _Intl>& __mp =
+       use_facet<moneypunct<_CharT, _Intl> >(__loc);
+
+      _M_grouping_size = __mp.grouping().size();
+      char* __grouping = new char[_M_grouping_size];
+      __mp.grouping().copy(__grouping, _M_grouping_size);
+      _M_grouping = __grouping;
+      _M_use_grouping = _M_grouping_size && __mp.grouping()[0] != 0;
+      
+      _M_decimal_point = __mp.decimal_point();
+      _M_thousands_sep = __mp.thousands_sep();
+      _M_frac_digits = __mp.frac_digits();
+      
+      _M_curr_symbol_size = __mp.curr_symbol().size();
+      _CharT* __curr_symbol = new _CharT[_M_curr_symbol_size];
+      __mp.curr_symbol().copy(__curr_symbol, _M_curr_symbol_size);
+      _M_curr_symbol = __curr_symbol;
+      
+      _M_positive_sign_size = __mp.positive_sign().size();
+      _CharT* __positive_sign = new _CharT[_M_positive_sign_size];
+      __mp.positive_sign().copy(__positive_sign, _M_positive_sign_size);
+      _M_positive_sign = __positive_sign;
+
+      _M_negative_sign_size = __mp.negative_sign().size();
+      _CharT* __negative_sign = new _CharT[_M_negative_sign_size];
+      __mp.negative_sign().copy(__negative_sign, _M_negative_sign_size);
+      _M_negative_sign = __negative_sign;
+      
+      _M_pos_format = __mp.pos_format();
+      _M_neg_format = __mp.neg_format();
+
+      const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
+      __ct.widen(money_base::_S_atoms,
+                money_base::_S_atoms + money_base::_S_end, _M_atoms);
+    }
+
+
+  // Used by both numeric and monetary facets.
+  // Check to make sure that the __grouping_tmp string constructed in
+  // money_get or num_get matches the canonical grouping for a given
+  // locale.
+  // __grouping_tmp is parsed L to R
+  // 1,222,444 == __grouping_tmp of "\1\3\3"
+  // __grouping is parsed R to L
+  // 1,222,444 == __grouping of "\3" == "\3\3\3"
+  static bool
+  __verify_grouping(const char* __grouping, size_t __grouping_size,
+                   const string& __grouping_tmp);
+
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
@@ -137,284 +274,390 @@ namespace std
                     ios_base::iostate& __err, string& __xtrc) const
     {
       typedef char_traits<_CharT>                      __traits_type;
-      typedef typename numpunct<_CharT>::__cache_type          __cache_type;
+      typedef typename numpunct<_CharT>::__cache_type  __cache_type;
       __use_cache<__cache_type> __uc;
       const locale& __loc = __io._M_getloc();
       const __cache_type* __lc = __uc(__loc);
       const _CharT* __lit = __lc->_M_atoms_in;
+      char_type __c = char_type();
+
+      // True if __beg becomes equal to __end.
+      bool __testeof = __beg == __end;
 
       // First check for sign.
-      int __pos = 0;
-      char_type  __c = *__beg;
-      const bool __plus = __traits_type::eq(__c, __lit[_S_iplus]);
-      if ((__plus || __traits_type::eq(__c, __lit[_S_iminus])) 
-         && __beg != __end)
+      if (!__testeof)
        {
-         __xtrc += __plus ? _S_atoms_in[_S_iplus] : _S_atoms_in[_S_iminus];
-         ++__pos;
-         __c = *(++__beg);
+         __c = *__beg;
+         const bool __plus = __c == __lit[__num_base::_S_iplus];
+         if ((__plus || __c == __lit[__num_base::_S_iminus])
+             && !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
+             && !(__c == __lc->_M_decimal_point))
+           {
+             __xtrc += __plus ? '+' : '-';
+             if (++__beg != __end)
+               __c = *__beg;
+             else
+               __testeof = true;
+           }
        }
 
-      // Next, strip leading zeros.
-      bool __found_zero = false;
-      while (__traits_type::eq(__c, __lit[_S_izero]) && __beg != __end)
-       {
-         __c = *(++__beg);
-         __found_zero = true;
-       }
-      if (__found_zero)
+      // Next, look for leading zeros.
+      bool __found_mantissa = false;
+      while (!__testeof)
        {
-         __xtrc += _S_atoms_in[_S_izero];
-         ++__pos;
+         if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep
+             || __c == __lc->_M_decimal_point)
+           break;
+         else if (__c == __lit[__num_base::_S_izero])
+           {
+             if (!__found_mantissa)
+               {
+                 __xtrc += '0';
+                 __found_mantissa = true;
+               }
+             if (++__beg != __end)
+               __c = *__beg;
+             else
+               __testeof = true;
+           }
+         else
+           break;
        }
 
       // Only need acceptable digits for floating point numbers.
       bool __found_dec = false;
       bool __found_sci = false;
       string __found_grouping;
-      const size_t __len = _S_iE - _S_izero + 1;
+      if (__lc->_M_use_grouping)
+       __found_grouping.reserve(32);
       int __sep_pos = 0;
-      bool __e;
-      while (__beg != __end)
+      const char_type* __q;
+      const char_type* __lit_zero = __lit + __num_base::_S_izero;
+      while (!__testeof)
         {
-         // Only look in digits.
-          const char_type* __p = __traits_type::find(__lit + _S_izero, 10, 
-                                                    __c);
-
-          // NB: strchr returns true for __c == 0x0
-          if (__p && !__traits_type::eq(__c, char_type()))
-           {
-             // Try first for acceptable digit; record it if found.
-             ++__pos;
-             __xtrc += _S_atoms_in[__p - __lit];
-             ++__sep_pos;
-             __c = *(++__beg);
-           }
-          else if (__traits_type::eq(__c, __lc->_M_thousands_sep) 
-                  &&  __lc->_M_use_grouping && !__found_dec)
+         // According to 22.2.2.1.2, p8-9, first look for thousands_sep
+         // and decimal_point.
+          if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
            {
-              // NB: Thousands separator at the beginning of a string
-              // is a no-no, as is two consecutive thousands separators.
-              if (__sep_pos)
-                {
-                  __found_grouping += static_cast<char>(__sep_pos);
-                  __sep_pos = 0;
-                 __c = *(++__beg);
-                }
-              else
+             if (!__found_dec && !__found_sci)
                {
-                 __err |= ios_base::failbit;
-                 break;
+                 // NB: Thousands separator at the beginning of a string
+                 // is a no-no, as is two consecutive thousands separators.
+                 if (__sep_pos)
+                   {
+                     __found_grouping += static_cast<char>(__sep_pos);
+                     __sep_pos = 0;
+                   }
+                 else
+                   {
+                     __err |= ios_base::failbit;
+                     break;
+                   }
                }
+             else
+               break;
             }
-         else if (__traits_type::eq(__c, __lc->_M_decimal_point) 
-                  && !__found_dec)
+         else if (__c == __lc->_M_decimal_point)
            {
-             // According to the standard, if no grouping chars are seen,
-             // no grouping check is applied. Therefore __found_grouping
-             // must be adjusted only if __dec comes after some __sep.
-             if (__found_grouping.size())
-               __found_grouping += static_cast<char>(__sep_pos);
-             ++__pos;
-             __xtrc += '.';
-             __c = *(++__beg);
-             __found_dec = true;
+             if (!__found_dec && !__found_sci)
+               {
+                 // If no grouping chars are seen, no grouping check
+                 // is applied. Therefore __found_grouping is adjusted
+                 // only if decimal_point comes after some thousands_sep.
+                 if (__found_grouping.size())
+                   __found_grouping += static_cast<char>(__sep_pos);
+                 __xtrc += '.';
+                 __found_dec = true;
+               }
+             else
+               break;
+           }
+          else if ((__q = __traits_type::find(__lit_zero, 10, __c)))
+           {
+             __xtrc += __num_base::_S_atoms_in[__q - __lit];
+             __found_mantissa = true;
+             ++__sep_pos;
            }
-         else if ((__e = __traits_type::eq(__c, __lit[_S_ie]) 
-                   || __traits_type::eq(__c, __lit[_S_iE])) 
-                  && !__found_sci && __pos)
+         else if ((__c == __lit[__num_base::_S_ie] 
+                   || __c == __lit[__num_base::_S_iE])
+                  && __found_mantissa && !__found_sci)
            {
              // Scientific notation.
-             ++__pos;
-             __xtrc += __e ? _S_atoms_in[_S_ie] : _S_atoms_in[_S_iE];
-             __c = *(++__beg);
+             if (__found_grouping.size() && !__found_dec)
+               __found_grouping += static_cast<char>(__sep_pos);
+             __xtrc += 'e';
+             __found_sci = true;
 
              // Remove optional plus or minus sign, if they exist.
-             const bool __plus = __traits_type::eq(__c, __lit[_S_iplus]);
-             if (__plus || __traits_type::eq(__c, __lit[_S_iminus]))
+             if (++__beg != __end)
                {
-                 ++__pos;
-                 __xtrc += __plus ? _S_atoms_in[_S_iplus] 
-                                  : _S_atoms_in[_S_iminus];
-                 __c = *(++__beg);
+                 __c = *__beg;
+                 const bool __plus = __c == __lit[__num_base::_S_iplus];
+                 if ((__plus || __c == __lit[__num_base::_S_iminus])
+                     && !(__lc->_M_use_grouping
+                          && __c == __lc->_M_thousands_sep)
+                     && !(__c == __lc->_M_decimal_point))
+                   __xtrc += __plus ? '+' : '-';
+                 else
+                   continue;
+               }
+             else
+               {
+                 __testeof = true;
+                 break;
                }
-             __found_sci = true;
            }
          else
            // Not a valid input item.
            break;
+
+         if (++__beg != __end)
+           __c = *__beg;
+         else
+           __testeof = true;
         }
 
       // Digit grouping is checked. If grouping and found_grouping don't
       // match, then get very very upset, and set failbit.
-      if (__lc->_M_use_grouping && __found_grouping.size())
+      if (__found_grouping.size())
         {
-          // Add the ending grouping if a decimal wasn't found.
-         if (!__found_dec)
+          // Add the ending grouping if a decimal or 'e'/'E' wasn't found.
+         if (!__found_dec && !__found_sci)
            __found_grouping += static_cast<char>(__sep_pos);
 
-         const string __grouping = __lc->_M_grouping;
-          if (!std::__verify_grouping(__grouping, __found_grouping))
+          if (!std::__verify_grouping(__lc->_M_grouping, 
+                                     __lc->_M_grouping_size,
+                                     __found_grouping))
            __err |= ios_base::failbit;
         }
 
       // Finish up.
-      __xtrc += char();
-      if (__beg == __end)
+      if (__testeof)
         __err |= ios_base::eofbit;
       return __beg;
     }
 
   template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    _M_extract_int(_InIter __beg, _InIter __end, ios_base& __io,
-                  ios_base::iostate& __err, string& __xtrc, int& __base) const
-    {
-      typedef char_traits<_CharT>                      __traits_type;
-      typedef typename numpunct<_CharT>::__cache_type          __cache_type;
-      __use_cache<__cache_type> __uc;
-      const locale& __loc = __io._M_getloc();
-      const __cache_type* __lc = __uc(__loc);
-      const _CharT* __lit = __lc->_M_atoms_in;
-      // NB: Iff __basefield == 0, this can change based on contents.
-      ios_base::fmtflags __basefield = __io.flags() & ios_base::basefield;
-      if (__basefield == ios_base::oct)
-        __base = 8;
-      else if (__basefield == ios_base::hex)
-        __base = 16;
-      else
-       __base = 10;
+    template<typename _ValueT>
+      _InIter
+      num_get<_CharT, _InIter>::
+      _M_extract_int(_InIter __beg, _InIter __end, ios_base& __io,
+                    ios_base::iostate& __err, _ValueT& __v) const
+      {
+        typedef char_traits<_CharT>                    __traits_type;
+       typedef typename numpunct<_CharT>::__cache_type __cache_type;
+       __use_cache<__cache_type> __uc;
+       const locale& __loc = __io._M_getloc();
+       const __cache_type* __lc = __uc(__loc);
+       const _CharT* __lit = __lc->_M_atoms_in;
+       char_type __c = char_type();
 
-      // First check for sign.
-      int __pos = 0;
-      char_type  __c = *__beg;
-      const bool __plus = __traits_type::eq(__c, __lit[_S_iplus]);
-      if ((__plus || __traits_type::eq(__c, __lit[_S_iminus])) 
-         && __beg != __end)
-       {
-         __xtrc += __plus ? _S_atoms_in[_S_iplus] : _S_atoms_in[_S_iminus];
-         ++__pos;
-         __c = *(++__beg);
-       }
+       // NB: Iff __basefield == 0, __base can change based on contents.
+       const ios_base::fmtflags __basefield = __io.flags()
+                                              & ios_base::basefield;
+       const bool __oct = __basefield == ios_base::oct;
+       int __base = __oct ? 8 : (__basefield == ios_base::hex ? 16 : 10);
 
-      // Next, strip leading zeros and check required digits for base formats.
-      if (__base == 10)
-       {
-         bool __found_zero = false;
-         while (__traits_type::eq(__c, __lit[_S_izero]) && __beg != __end)
-           {
-             __c = *(++__beg);
+       // True if __beg becomes equal to __end.
+       bool __testeof = __beg == __end;
+
+       // First check for sign.
+       bool __negative = false;
+       if (!__testeof)
+         {
+           __c = *__beg;
+           if (numeric_limits<_ValueT>::is_signed)
+             __negative = __c == __lit[__num_base::_S_iminus];
+           if ((__negative || __c == __lit[__num_base::_S_iplus])
+               && !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
+               && !(__c == __lc->_M_decimal_point))
+             {
+               if (++__beg != __end)
+                 __c = *__beg;
+               else
+                 __testeof = true;
+             }
+         }
+
+       // Next, look for leading zeros and check required digits
+       // for base formats.
+       bool __found_zero = false;
+       while (!__testeof)
+         {
+           if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep
+               || __c == __lc->_M_decimal_point)
+             break;
+           else if (__c == __lit[__num_base::_S_izero] 
+                    && (!__found_zero || __base == 10))
              __found_zero = true;
-           }
-         if (__found_zero)
-           {
-             __xtrc += _S_atoms_in[_S_izero];
-             ++__pos;
-             if (__basefield == 0)
-               {             
-                 const bool __x = __traits_type::eq(__c, __lit[_S_ix]);
-                 const bool __X = __traits_type::eq(__c, __lit[_S_iX]);
-                 if ((__x || __X) && __beg != __end)
-                   {
-                     __xtrc += __x ? _S_atoms_in[_S_ix] : _S_atoms_in[_S_iX];
-                     ++__pos;
-                     __c = *(++__beg);
+           else if (__found_zero)
+             {
+               if (__c == __lit[__num_base::_S_ix] 
+                   || __c == __lit[__num_base::_S_iX])
+                 {
+                   if (__basefield == 0)
                      __base = 16;
-                   }
-                 else 
-                   __base = 8;
-               }
-           }
-       }
-      else if (__base == 16)
-       {
-         if (__traits_type::eq(__c, __lit[_S_izero]) && __beg != __end)
-           {
-             __xtrc += _S_atoms_in[_S_izero];
-             ++__pos;
-             __c = *(++__beg); 
-
-             const bool __x = __traits_type::eq(__c, __lit[_S_ix]);
-             const bool __X = __traits_type::eq(__c, __lit[_S_iX]);
-             if ((__x || __X) && __beg != __end)
-               {
-                 __xtrc += __x ? _S_atoms_in[_S_ix] : _S_atoms_in[_S_iX];
-                 ++__pos;
-                 __c = *(++__beg);
-               }
-           }
-       }
+                   if (__base == 16)
+                     __found_zero = false;
+                   else
+                     break;
+                 }
+               else
+                 {
+                   if (__basefield == 0)
+                     __base = 8;
+                   break;
+                 }
+             }
+           else
+             break;
 
-      // At this point, base is determined. If not hex, only allow
-      // base digits as valid input.
-      size_t __len;
-      if (__base == 16)
-       __len = _S_iend;
-      else
-       __len = __base;
+           if (++__beg != __end)
+             {
+               __c = *__beg;
+               if (!__found_zero)
+                 break;
+             }
+           else
+             __testeof = true;
+         }
+       
+       // At this point, base is determined. If not hex, only allow
+       // base digits as valid input.
+       const size_t __len = (__base == 16 ? __num_base::_S_iend
+                             - __num_base::_S_izero : __base);
 
-      // Extract.
-      string __found_grouping;
-      const char_type __sep = __lc->_M_thousands_sep;
-      int __sep_pos = 0;
-      while (__beg != __end)
-        {
-          const char_type* __p = __traits_type::find(__lit + _S_izero, 
-                                                    __len,  __c);
+       // Extract.
+       string __found_grouping;
+       if (__lc->_M_use_grouping)
+         __found_grouping.reserve(32);
+       int __sep_pos = 0;
+       bool __overflow = false;
+       _ValueT __result = 0;
+       const char_type* __q;
+       const char_type* __lit_zero = __lit + __num_base::_S_izero;
+       if (__negative)
+         {
+           const _ValueT __min = numeric_limits<_ValueT>::min() / __base;
+           while (!__testeof)
+             {
+               // According to 22.2.2.1.2, p8-9, first look for thousands_sep
+               // and decimal_point.
+               if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
+                 {
+                   // NB: Thousands separator at the beginning of a string
+                   // is a no-no, as is two consecutive thousands separators.
+                   if (__sep_pos)
+                     {
+                       __found_grouping += static_cast<char>(__sep_pos);
+                       __sep_pos = 0;
+                     }
+                   else
+                     {
+                       __err |= ios_base::failbit;
+                       break;
+                     }
+                 }
+               else if (__c == __lc->_M_decimal_point)
+                 break;
+               else if ((__q = __traits_type::find(__lit_zero, __len, __c)))
+                 {
+                   int __digit = __q - __lit_zero;
+                   if (__digit > 15)
+                     __digit -= 6;
+                   if (__result < __min)
+                     __overflow = true;
+                   else
+                     {
+                       const _ValueT __new_result = (__result * __base
+                                                     - __digit);
+                       __overflow |= __new_result > __result;
+                       __result = __new_result;
+                       ++__sep_pos;
+                     }
+                 }
+               else
+                 // Not a valid input item.
+                 break;
 
-          // NB: strchr returns true for __c == 0x0
-          if (__p && !__traits_type::eq(__c, char_type()))
-           {
-             // Try first for acceptable digit; record it if found.
-             __xtrc += _S_atoms_in[__p - __lit];
-             ++__pos;
-             ++__sep_pos;
-             __c = *(++__beg);
-           }
-          else if (__traits_type::eq(__c, __sep) && __lc->_M_use_grouping)
-           {
-              // NB: Thousands separator at the beginning of a string
-              // is a no-no, as is two consecutive thousands separators.
-              if (__sep_pos)
-                {
-                  __found_grouping += static_cast<char>(__sep_pos);
-                  __sep_pos = 0;
-                 __c = *(++__beg);
-                }
-              else
-               {
-                 __err |= ios_base::failbit;
+               if (++__beg != __end)
+                 __c = *__beg;
+               else
+                 __testeof = true;
+             }
+         }
+       else
+         {
+           const _ValueT __max = numeric_limits<_ValueT>::max() / __base;
+           while (!__testeof)
+             {
+               if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
+                 {
+                   if (__sep_pos)
+                     {
+                       __found_grouping += static_cast<char>(__sep_pos);
+                       __sep_pos = 0;
+                     }
+                   else
+                     {
+                       __err |= ios_base::failbit;
+                       break;
+                     }
+                 }
+               else if (__c == __lc->_M_decimal_point)
+                 break;
+               else if ((__q = __traits_type::find(__lit_zero, __len, __c)))
+                 {
+                   int __digit = __q - __lit_zero;
+                   if (__digit > 15)
+                     __digit -= 6;
+                   if (__result > __max)
+                     __overflow = true;
+                   else
+                     {
+                       const _ValueT __new_result = (__result * __base
+                                                     + __digit);
+                       __overflow |= __new_result < __result;
+                       __result = __new_result;
+                       ++__sep_pos;
+                     }
+                 }
+               else
                  break;
-               }
-            }
-         else
-           // Not a valid input item.
-           break;
-        }
 
-      // Digit grouping is checked. If grouping and found_grouping don't
-      // match, then get very very upset, and set failbit.
-      if (__lc->_M_use_grouping && __found_grouping.size())
-        {
-          // Add the ending grouping.
-          __found_grouping += static_cast<char>(__sep_pos);
+               if (++__beg != __end)
+                 __c = *__beg;
+               else
+                 __testeof = true;
+             }
+         }
 
-         const string __grouping = __lc->_M_grouping;
-          if (!std::__verify_grouping(__grouping, __found_grouping))
-           __err |= ios_base::failbit;
-        }
+       // Digit grouping is checked. If grouping and found_grouping don't
+       // match, then get very very upset, and set failbit.
+       if (__found_grouping.size())
+         {
+           // Add the ending grouping.
+           __found_grouping += static_cast<char>(__sep_pos);
 
-      // Finish up.
-      __xtrc += char();
-      if (__beg == __end)
-        __err |= ios_base::eofbit;
-      return __beg;
-    }
+           if (!std::__verify_grouping(__lc->_M_grouping,
+                                       __lc->_M_grouping_size,
+                                       __found_grouping))
+             __err |= ios_base::failbit;
+         }
 
-#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
-  //17.  Bad bool parsing
+       if (!(__err & ios_base::failbit) && !__overflow
+           && (__sep_pos || __found_zero || __found_grouping.size()))
+         __v = __result;
+       else
+         __err |= ios_base::failbit;
+
+       if (__testeof)
+         __err |= ios_base::eofbit;
+       return __beg;
+      }
+
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 17.  Bad bool parsing
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
@@ -423,135 +666,90 @@ namespace std
     {
       if (!(__io.flags() & ios_base::boolalpha))
         {
-         // Parse bool values as unsigned long.
+         // Parse bool values as long.
           // NB: We can't just call do_get(long) here, as it might
           // refer to a derived class.
-          string __xtrc;
-          int __base;
-          __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-
-         unsigned long __ul; 
-         std::__convert_to_v(__xtrc.c_str(), __ul, __err, 
-                             _S_get_c_locale(), __base);
-         if (!(__err & ios_base::failbit) && __ul <= 1)
-           __v = __ul;
-         else 
+         long __l = -1;
+          __beg = _M_extract_int(__beg, __end, __io, __err, __l);
+         if (__l == 0 || __l == 1)
+           __v = __l;
+         else
             __err |= ios_base::failbit;
         }
       else
         {
          // Parse bool values as alphanumeric.
-         typedef char_traits<_CharT>           __traits_type;
-         typedef typename numpunct<_CharT>::__cache_type       __cache_type;
+         typedef typename numpunct<_CharT>::__cache_type __cache_type;
          __use_cache<__cache_type> __uc;
          const locale& __loc = __io._M_getloc();
          const __cache_type* __lc = __uc(__loc);
-          const size_t __tn = __traits_type::length(__lc->_M_truename) - 1;
-          const size_t __fn = __traits_type::length(__lc->_M_falsename) - 1;
 
-         bool __testf = false;
-         bool __testt = false;
-          for (size_t __n = 0; __beg != __end; ++__n)
+         bool __testf = true;
+         bool __testt = true;
+         size_t __n;
+         bool __testeof = __beg == __end;
+          for (__n = 0; !__testeof; ++__n)
             {
-              const char_type __c = *__beg;
-             ++__beg;
+             const char_type __c = *__beg;
 
-             if (__n <= __fn)
-               __testf = __traits_type::eq(__c, __lc->_M_falsename[__n]);
-
-             if (__n <= __tn)
-               __testt = __traits_type::eq(__c, __lc->_M_truename[__n]);
-
-              if (!(__testf || __testt))
-                {
-                  __err |= ios_base::failbit;
-                  break;
-                }
-              else if (__testf && __n == __fn)
-                {
-                  __v = 0;
-                  break;
-                }
-              else if (__testt && __n == __tn)
-                {
-                  __v = 1;
-                  break;
-                }
+             if (__testf)
+               if (__n < __lc->_M_falsename_size)
+                 __testf = __c == __lc->_M_falsename[__n];
+               else
+                 break;
+
+             if (__testt)
+               if (__n < __lc->_M_truename_size)
+                 __testt = __c == __lc->_M_truename[__n];
+               else
+                 break;
+
+             if (!__testf && !__testt)
+               break;
+             
+             if (++__beg == __end)
+               __testeof = true;
             }
-          if (__beg == __end)
+         if (__testf && __n == __lc->_M_falsename_size)
+           __v = 0;
+         else if (__testt && __n == __lc->_M_truename_size)
+           __v = 1;
+         else
+           __err |= ios_base::failbit;
+
+          if (__testeof)
             __err |= ios_base::eofbit;
         }
       return __beg;
     }
-#endif
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, long& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err,
-                         _S_get_c_locale(), __base);
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, unsigned short& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      unsigned long __ul;
-      std::__convert_to_v(__xtrc.c_str(), __ul, __err,
-                         _S_get_c_locale(), __base);
-      if (!(__err & ios_base::failbit) 
-         && __ul <= numeric_limits<unsigned short>::max())
-       __v = static_cast<unsigned short>(__ul);
-      else 
-       __err |= ios_base::failbit;
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, unsigned int& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      unsigned long __ul;
-      std::__convert_to_v(__xtrc.c_str(), __ul, __err,
-                         _S_get_c_locale(), __base);
-      if (!(__err & ios_base::failbit) 
-         && __ul <= numeric_limits<unsigned int>::max())
-       __v = static_cast<unsigned int>(__ul);
-      else 
-       __err |= ios_base::failbit;
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, unsigned long& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err,
-                         _S_get_c_locale(), __base);
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
 #ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _InIter>
@@ -559,41 +757,26 @@ namespace std
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, long long& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err,
-                         _S_get_c_locale(), __base);
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
     do_get(iter_type __beg, iter_type __end, ios_base& __io,
            ios_base::iostate& __err, unsigned long long& __v) const
-    {
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err,
-                         _S_get_c_locale(), __base);
-      return __beg;
-    }
+    { return _M_extract_int(__beg, __end, __io, __err, __v); }
 #endif
 
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io, 
+    do_get(iter_type __beg, iter_type __end, ios_base& __io,
           ios_base::iostate& __err, float& __v) const
     {
       string __xtrc;
       __xtrc.reserve(32);
       __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err,
-                         _S_get_c_locale());
+      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
       return __beg;
     }
 
@@ -631,25 +814,17 @@ namespace std
     {
       // Prepare for hex formatted input.
       typedef ios_base::fmtflags        fmtflags;
-      fmtflags __fmt = __io.flags();
-      fmtflags __fmtmask = ~(ios_base::showpos | ios_base::basefield
-                             | ios_base::uppercase | ios_base::internal);
-      __io.flags(__fmt & __fmtmask | (ios_base::hex | ios_base::showbase));
+      const fmtflags __fmt = __io.flags();
+      __io.flags(__fmt & ~ios_base::basefield | ios_base::hex);
 
-      string __xtrc;
-      int __base;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __xtrc, __base);
+      unsigned long __ul;
+      __beg = _M_extract_int(__beg, __end, __io, __err, __ul);
 
       // Reset from hex formatted input.
       __io.flags(__fmt);
 
-      unsigned long __ul;
-      std::__convert_to_v(__xtrc.c_str(), __ul, __err,
-                         _S_get_c_locale(), __base);
       if (!(__err & ios_base::failbit))
        __v = reinterpret_cast<void*>(__ul);
-      else 
-       __err |= ios_base::failbit;
       return __beg;
     }
 
@@ -658,12 +833,12 @@ namespace std
   template<typename _CharT, typename _OutIter>
     void
     num_put<_CharT, _OutIter>::
-    _M_pad(_CharT __fill, streamsize __w, ios_base& __io, 
+    _M_pad(_CharT __fill, streamsize __w, ios_base& __io,
           _CharT* __new, const _CharT* __cs, int& __len) const
     {
       // [22.2.2.2.2] Stage 3.
       // If necessary, pad.
-      __pad<_CharT, char_traits<_CharT> >::_S_pad(__io, __fill, __new, __cs, 
+      __pad<_CharT, char_traits<_CharT> >::_S_pad(__io, __fill, __new, __cs,
                                                  __w, __len, true);
       __len = static_cast<int>(__w);
     }
@@ -671,82 +846,86 @@ namespace std
   // Forwarding functions to peel signed from unsigned integer types.
   template<typename _CharT>
     inline int
-    __int_to_char(_CharT* __out, const int __size, long __v,
-                 const _CharT* __lit, ios_base::fmtflags __flags)
+    __int_to_char(_CharT* __bufend, long __v, const _CharT* __lit,
+                 ios_base::fmtflags __flags)
     {
       unsigned long __ul = static_cast<unsigned long>(__v);
       bool __neg = false;
-      if (__v < 0) 
+      if (__v < 0)
        {
          __ul = -__ul;
          __neg = true;
        }
-      return __int_to_char(__out, __size, __ul, __lit, __flags, __neg); 
+      return __int_to_char(__bufend, __ul, __lit, __flags, __neg);
     }
 
   template<typename _CharT>
     inline int
-    __int_to_char(_CharT* __out, const int __size, unsigned long __v,
-                 const _CharT* __lit, ios_base::fmtflags __flags)
-    { return __int_to_char(__out, __size, __v, __lit, __flags, false); }
+    __int_to_char(_CharT* __bufend, unsigned long __v, const _CharT* __lit,
+                 ios_base::fmtflags __flags)
+    {
+      // About showpos, see Table 60 and C99 7.19.6.1, p6 (+).
+      return __int_to_char(__bufend, __v, __lit,
+                          __flags & ~ios_base::showpos, false);
+    }
 
 #ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT>
     inline int
-    __int_to_char(_CharT* __out, const int __size, long long __v,
-                 const _CharT* __lit, ios_base::fmtflags __flags)
-    { 
+    __int_to_char(_CharT* __bufend, long long __v, const _CharT* __lit,
+                 ios_base::fmtflags __flags)
+    {
       unsigned long long __ull = static_cast<unsigned long long>(__v);
       bool __neg = false;
-      if (__v < 0) 
+      if (__v < 0)
        {
          __ull = -__ull;
          __neg = true;
        }
-      return __int_to_char(__out, __size, __ull, __lit, __flags, __neg); 
+      return __int_to_char(__bufend, __ull, __lit, __flags, __neg);
     }
 
   template<typename _CharT>
     inline int
-    __int_to_char(_CharT* __out, const int __size, unsigned long long __v,
+    __int_to_char(_CharT* __bufend, unsigned long long __v, 
                  const _CharT* __lit, ios_base::fmtflags __flags)
-    { return __int_to_char(__out, __size, __v, __lit, __flags, false); }
+    { return __int_to_char(__bufend, __v, __lit,
+                          __flags & ~ios_base::showpos, false); }
 #endif
-      
+
   template<typename _CharT, typename _ValueT>
     int
-    __int_to_char(_CharT* __out, const int __size, _ValueT __v,
-                 const _CharT* __lit, ios_base::fmtflags __flags, bool __neg)
+    __int_to_char(_CharT* __bufend, _ValueT __v, const _CharT* __lit,
+                 ios_base::fmtflags __flags, bool __neg)
     {
       // Don't write base if already 0.
       const bool __showbase = (__flags & ios_base::showbase) && __v;
       const ios_base::fmtflags __basefield = __flags & ios_base::basefield;
-      _CharT* __buf = __out + __size - 1;
-      _CharT* __bufend = __out + __size;
+      _CharT* __buf = __bufend - 1;
 
       if (__builtin_expect(__basefield != ios_base::oct &&
                           __basefield != ios_base::hex, true))
        {
          // Decimal.
-         do 
+         do
            {
              *__buf-- = __lit[(__v % 10) + __num_base::_S_odigits];
              __v /= 10;
-           } 
+           }
          while (__v != 0);
          if (__neg)
            *__buf-- = __lit[__num_base::_S_ominus];
          else if (__flags & ios_base::showpos)
            *__buf-- = __lit[__num_base::_S_oplus];
        }
-       else if (__basefield == ios_base::oct)
+      else if (__basefield == ios_base::oct)
        {
          // Octal.
-         do 
+         do
            {
              *__buf-- = __lit[(__v & 0x7) + __num_base::_S_odigits];
              __v >>= 3;
-           } 
+           }
          while (__v != 0);
          if (__showbase)
            *__buf-- = __lit[__num_base::_S_odigits];
@@ -755,13 +934,13 @@ namespace std
        {
          // Hex.
          const bool __uppercase = __flags & ios_base::uppercase;
-         int __case_offset = __uppercase ? __num_base::_S_oudigits 
-                                         : __num_base::_S_odigits;
-         do 
+         const int __case_offset = __uppercase ? __num_base::_S_oudigits
+                                               : __num_base::_S_odigits;
+         do
            {
              *__buf-- = __lit[(__v & 0xf) + __case_offset];
              __v >>= 4;
-           } 
+           }
          while (__v != 0);
          if (__showbase)
            {
@@ -771,40 +950,38 @@ namespace std
              *__buf-- = __lit[__num_base::_S_odigits];
            }
        }
-      int __ret = __bufend - __buf - 1;
-      return __ret;
+      return __bufend - __buf - 1;
     }
 
   template<typename _CharT, typename _OutIter>
     void
     num_put<_CharT, _OutIter>::
-    _M_group_int(const string& __grouping, _CharT __sep, ios_base& __io, 
-                _CharT* __new, _CharT* __cs, int& __len) const
+    _M_group_int(const char* __grouping, size_t __grouping_size, _CharT __sep,
+                ios_base& __io, _CharT* __new, _CharT* __cs, int& __len) const
     {
-      // By itself __add_grouping cannot deal correctly with __ws when
+      // By itself __add_grouping cannot deal correctly with __cs when
       // ios::showbase is set and ios_base::oct || ios_base::hex.
       // Therefore we take care "by hand" of the initial 0, 0x or 0X.
       // However, remember that the latter do not occur if the number
       // printed is '0' (__len == 1).
       streamsize __off = 0;
-      const ios_base::fmtflags __basefield = __io.flags() 
+      const ios_base::fmtflags __basefield = __io.flags()
                                             & ios_base::basefield;
       if ((__io.flags() & ios_base::showbase) && __len > 1)
        if (__basefield == ios_base::oct)
          {
            __off = 1;
-           *__new = *__cs;
+           __new[0] = __cs[0];
          }
        else if (__basefield == ios_base::hex)
          {
            __off = 2;
-           *__new = *__cs;
-           *(__new + 1) = *(__cs + 1);
+           __new[0] = __cs[0];
+           __new[1] = __cs[1];
          }
-      _CharT* __p;
-      __p = std::__add_grouping(__new + __off, __sep, __grouping.c_str(), 
-                               __grouping.c_str() + __grouping.size(),
-                               __cs + __off, __cs + __len);
+      _CharT* __p = std::__add_grouping(__new + __off, __sep, __grouping,
+                                       __grouping_size, __cs + __off,
+                                       __cs + __len);
       __len = __p - __new;
     }
 
@@ -812,8 +989,8 @@ namespace std
     template<typename _ValueT>
       _OutIter
       num_put<_CharT, _OutIter>::
-      _M_insert_int(_OutIter __s, ios_base& __io, _CharT __fill, 
-                    _ValueT __v) const
+      _M_insert_int(_OutIter __s, ios_base& __io, _CharT __fill,
+                   _ValueT __v) const
       {
        typedef typename numpunct<_CharT>::__cache_type __cache_type;
        __use_cache<__cache_type> __uc;
@@ -821,36 +998,35 @@ namespace std
        const __cache_type* __lc = __uc(__loc);
        const _CharT* __lit = __lc->_M_atoms_out;
 
-       // Long enough to hold hex, dec, and octal representations.
-       int __ilen = 4 * sizeof(_ValueT);
-       _CharT* __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
+       // Long enough to hold hex, dec, and octal representations.
+       const int __ilen = 4 * sizeof(_ValueT);
+       _CharT* __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
                                                             * __ilen));
+
        // [22.2.2.2.2] Stage 1, numeric conversion to character.
        // Result is returned right-justified in the buffer.
        int __len;
-       __len = __int_to_char(&__cs[0], __ilen, __v, __lit, __io.flags());
-       __cs = __cs + __ilen - __len;
-       
-       // Add grouping, if necessary. 
-       _CharT* __cs2;
+       __len = __int_to_char(__cs + __ilen, __v, __lit, __io.flags());
+       __cs += __ilen - __len;
+
+       // Add grouping, if necessary.
        if (__lc->_M_use_grouping)
          {
            // Grouping can add (almost) as many separators as the
            // number of digits, but no more.
-           __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
-                                                         * __len * 2));
-           _M_group_int(__lc->_M_grouping, __lc->_M_thousands_sep, __io, 
-                        __cs2, __cs, __len);
+           _CharT* __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                                 * __len * 2));
+           _M_group_int(__lc->_M_grouping, __lc->_M_grouping_size,
+                        __lc->_M_thousands_sep, __io, __cs2, __cs, __len);
            __cs = __cs2;
          }
-       
+
        // Pad.
-       _CharT* __cs3;
-       streamsize __w = __io.width();
+       const streamsize __w = __io.width();
        if (__w > static_cast<streamsize>(__len))
          {
-           __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
-                                                         * __w));
+           _CharT* __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                                 * __w));
            _M_pad(__fill, __w, __io, __cs3, __cs, __len);
            __cs = __cs3;
          }
@@ -859,32 +1035,31 @@ namespace std
        // [22.2.2.2.2] Stage 4.
        // Write resulting, fully-formatted string to output iterator.
        return std::__write(__s, __cs, __len);
-      } 
+      }
 
   template<typename _CharT, typename _OutIter>
     void
     num_put<_CharT, _OutIter>::
-    _M_group_float(const string& __grouping, _CharT __sep, const _CharT* __p, 
-                  _CharT* __new, _CharT* __cs, int& __len) const
+    _M_group_float(const char* __grouping, size_t __grouping_size,
+                  _CharT __sep, const _CharT* __p, _CharT* __new,
+                  _CharT* __cs, int& __len) const
     {
-#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
-      //282. What types does numpunct grouping refer to?
-      // Add grouping, if necessary. 
-      _CharT* __p2;
-      int __declen = __p ? __p - __cs : __len;
-      __p2 = std::__add_grouping(__new, __sep, __grouping.c_str(),
-                                __grouping.c_str() + __grouping.size(),
-                                __cs, __cs + __declen);
-      
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 282. What types does numpunct grouping refer to?
+      // Add grouping, if necessary.
+      const int __declen = __p ? __p - __cs : __len;
+      _CharT* __p2 = std::__add_grouping(__new, __sep, __grouping,
+                                        __grouping_size,
+                                        __cs, __cs + __declen);
+
       // Tack on decimal part.
       int __newlen = __p2 - __new;
       if (__p)
        {
          char_traits<_CharT>::copy(__p2, __p, __len - __declen);
          __newlen += __len - __declen;
-       }    
+       }
       __len = __newlen;
-#endif
     }
 
   // The following code uses snprintf (or sprintf(), when
@@ -909,41 +1084,32 @@ namespace std
        const locale& __loc = __io._M_getloc();
        const __cache_type* __lc = __uc(__loc);
 
-       // Note: digits10 is rounded down: add 1 to ensure the maximum
-       // available precision.  Then, in general, one more 1 needs to
-       // be added since, when the %{g,G} conversion specifiers are
-       // chosen inside _S_format_float, the precision field is "the
-       // maximum number of significant digits", *not* the "number of
-       // digits to appear after the decimal point", as happens for
-       // %{e,E,f,F} (C99, 7.19.6.1,4).
-       const int __max_digits = numeric_limits<_ValueT>::digits10 + 2;
-
        // Use default precision if out of range.
        streamsize __prec = __io.precision();
-       if (__prec > static_cast<streamsize>(__max_digits))
-         __prec = static_cast<streamsize>(__max_digits);
-       else if (__prec < static_cast<streamsize>(0))
+       if (__prec < static_cast<streamsize>(0))
          __prec = static_cast<streamsize>(6);
 
+       const int __max_digits = numeric_limits<_ValueT>::digits10;
+
        // [22.2.2.2.2] Stage 1, numeric conversion to character.
        int __len;
        // Long enough for the max format spec.
        char __fbuf[16];
 
 #ifdef _GLIBCXX_USE_C99
-       // First try a buffer perhaps big enough (for sure sufficient
+       // First try a buffer perhaps big enough (most probably sufficient
        // for non-ios_base::fixed outputs)
        int __cs_size = __max_digits * 3;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
 
-       _S_format_float(__io, __fbuf, __mod);
+       __num_base::_S_format_float(__io, __fbuf, __mod);
        __len = std::__convert_from_v(__cs, __cs_size, __fbuf, __v,
                                      _S_get_c_locale(), __prec);
 
        // If the buffer was not large enough, try again with the correct size.
        if (__len >= __cs_size)
          {
-           __cs_size = __len + 1; 
+           __cs_size = __len + 1;
            __cs = static_cast<char*>(__builtin_alloca(__cs_size));
            __len = std::__convert_from_v(__cs, __cs_size, __fbuf, __v,
                                          _S_get_c_locale(), __prec);
@@ -954,17 +1120,17 @@ namespace std
        const int __max_exp = numeric_limits<_ValueT>::max_exponent10;
 
        // The size of the output string is computed as follows.
-       // ios_base::fixed outputs may need up to __max_exp+1 chars
-       // for the integer part + up to __max_digits chars for the
-       // fractional part + 3 chars for sign, decimal point, '\0'. On
-       // the other hand, for non-fixed outputs __max_digits*3 chars
-       // are largely sufficient.
-       const int __cs_size = __fixed ? __max_exp + __max_digits + 4 
-                                     : __max_digits * 3;
+       // ios_base::fixed outputs may need up to __max_exp + 1 chars
+       // for the integer part + __prec chars for the fractional part
+       // + 3 chars for sign, decimal point, '\0'. On the other hand,
+       // for non-fixed outputs __max_digits * 2 + __prec chars are
+       // largely sufficient.
+       const int __cs_size = __fixed ? __max_exp + __prec + 4
+                                     : __max_digits * 2 + __prec;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
 
-       _S_format_float(__io, __fbuf, __mod);
-       __len = std::__convert_from_v(__cs, 0, __fbuf, __v, 
+       __num_base::_S_format_float(__io, __fbuf, __mod);
+       __len = std::__convert_from_v(__cs, 0, __fbuf, __v,
                                      _S_get_c_locale(), __prec);
 #endif
 
@@ -972,41 +1138,40 @@ namespace std
       // numpunct.decimal_point() values for '.' and adding grouping.
       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
 
-      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
+      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
                                                           * __len));
       __ctype.widen(__cs, __cs + __len, __ws);
-      
+
       // Replace decimal point.
       const _CharT __cdec = __ctype.widen('.');
       const _CharT __dec = __lc->_M_decimal_point;
-      const _CharT* __p;
-      if (__p = char_traits<_CharT>::find(__ws, __len, __cdec))
+      const _CharT* __p = char_traits<_CharT>::find(__ws, __len, __cdec);
+      if (__p)
        __ws[__p - __ws] = __dec;
 
-      // Add grouping, if necessary. 
-      _CharT* __ws2;
+      // Add grouping, if necessary.
       if (__lc->_M_use_grouping)
        {
-           // Grouping can add (almost) as many separators as the
-           // number of digits, but no more.
-           __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
-                                                         * __len * 2));
-           _M_group_float(__lc->_M_grouping, __lc->_M_thousands_sep, __p,
-                          __ws2, __ws, __len);
-           __ws = __ws2;
+         // Grouping can add (almost) as many separators as the
+         // number of digits, but no more.
+         _CharT* __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                               * __len * 2));
+         _M_group_float(__lc->_M_grouping, __lc->_M_grouping_size,
+                        __lc->_M_thousands_sep, __p, __ws2, __ws, __len);
+         __ws = __ws2;
        }
 
       // Pad.
-      _CharT* __ws3;
-      streamsize __w = __io.width();
+      const streamsize __w = __io.width();
       if (__w > static_cast<streamsize>(__len))
        {
-         __ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __w));
+         _CharT* __ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                               * __w));
          _M_pad(__fill, __w, __io, __ws3, __ws, __len);
          __ws = __ws3;
        }
       __io.width(0);
-      
+
       // [22.2.2.2.2] Stage 4.
       // Write resulting, fully-formatted string to output iterator.
       return std::__write(__s, __ws, __len);
@@ -1017,11 +1182,11 @@ namespace std
     num_put<_CharT, _OutIter>::
     do_put(iter_type __s, ios_base& __io, char_type __fill, bool __v) const
     {
-      ios_base::fmtflags __flags = __io.flags();
+      const ios_base::fmtflags __flags = __io.flags();
       if ((__flags & ios_base::boolalpha) == 0)
         {
-          unsigned long __uv = __v;
-          __s = _M_insert_int(__s, __io, __fill, __uv);
+          const long __l = __v;
+          __s = _M_insert_int(__s, __io, __fill, __l);
         }
       else
         {
@@ -1030,19 +1195,17 @@ namespace std
          const locale& __loc = __io._M_getloc();
          const __cache_type* __lc = __uc(__loc);
 
-         const _CharT* __name;
-          if (__v)
-           __name = __lc->_M_truename;
-          else
-           __name = __lc->_M_falsename;
-         int __len = char_traits<_CharT>::length(__name);
+         const _CharT* __name = __v ? __lc->_M_truename
+                                    : __lc->_M_falsename;
+         int __len = __v ? __lc->_M_truename_size
+                         : __lc->_M_falsename_size;
 
-         _CharT* __cs;
-         streamsize __w = __io.width();
+         const streamsize __w = __io.width();
          if (__w > static_cast<streamsize>(__len))
            {
-             __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
-                                                           * __w));
+             _CharT* __cs
+               = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                       * __w));
              _M_pad(__fill, __w, __io, __cs, __name, __len);
              __name = __cs;
            }
@@ -1089,7 +1252,7 @@ namespace std
   template<typename _CharT, typename _OutIter>
     _OutIter
     num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, 
+    do_put(iter_type __s, ios_base& __io, char_type __fill,
           long double __v) const
     { return _M_insert_float(__s, __io, __fill, 'L', __v); }
 
@@ -1099,287 +1262,478 @@ namespace std
     do_put(iter_type __s, ios_base& __io, char_type __fill,
            const void* __v) const
     {
-      ios_base::fmtflags __flags = __io.flags();
-      ios_base::fmtflags __fmt = ~(ios_base::showpos | ios_base::basefield
-                                  | ios_base::uppercase | ios_base::internal);
+      const ios_base::fmtflags __flags = __io.flags();
+      const ios_base::fmtflags __fmt = ~(ios_base::basefield
+                                        | ios_base::uppercase
+                                        | ios_base::internal);
       __io.flags(__flags & __fmt | (ios_base::hex | ios_base::showbase));
-      try 
-       {
-         __s = _M_insert_int(__s, __io, __fill, 
-                             reinterpret_cast<unsigned long>(__v));
-         __io.flags(__flags);
-       }
-      catch (...) 
-       {
-         __io.flags(__flags);
-         __throw_exception_again;
-       }
+
+      __s = _M_insert_int(__s, __io, __fill,
+                         reinterpret_cast<unsigned long>(__v));
+      __io.flags(__flags);
       return __s;
     }
 
+  template<typename _CharT, typename _InIter>
+    template<bool _Intl>
+      _InIter
+      money_get<_CharT, _InIter>::
+      _M_extract(iter_type __beg, iter_type __end, ios_base& __io,
+                ios_base::iostate& __err, string& __units) const
+      {
+       typedef char_traits<_CharT>                       __traits_type;
+       typedef typename string_type::size_type           size_type;    
+       typedef money_base::part                          part;
+       typedef moneypunct<_CharT, _Intl>                 __moneypunct_type;
+       typedef typename __moneypunct_type::__cache_type  __cache_type;
+       
+       const locale& __loc = __io._M_getloc();
+       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+
+       __use_cache<__cache_type> __uc;
+       const __cache_type* __lc = __uc(__loc);
+       const char_type* __lit = __lc->_M_atoms;
+
+       // Deduced sign.
+       bool __negative = false;
+       // Sign size.
+       size_type __sign_size = 0;
+       // True if sign is mandatory.
+       const bool __mandatory_sign = (__lc->_M_positive_sign_size
+                                      && __lc->_M_negative_sign_size);
+       // String of grouping info from thousands_sep plucked from __units.
+       string __grouping_tmp;
+       if (__lc->_M_use_grouping)
+         __grouping_tmp.reserve(32);
+       // Last position before the decimal point.
+       int __last_pos = 0;
+       // Separator positions, then, possibly, fractional digits.
+       int __n = 0;
+       // If input iterator is in a valid state.
+       bool __testvalid = true;
+       // Flag marking when a decimal point is found.
+       bool __testdecfound = false;
+
+       // The tentative returned string is stored here.
+       string __res;
+       __res.reserve(32);
+
+       const char_type* __lit_zero = __lit + money_base::_S_zero;
+       const money_base::pattern __p = __lc->_M_neg_format;
+       for (int __i = 0; __i < 4 && __testvalid; ++__i)
+         {
+           const part __which = static_cast<part>(__p.field[__i]);
+           switch (__which)
+             {
+             case money_base::symbol:
+               // According to 22.2.6.1.2, p2, symbol is required
+               // if (__io.flags() & ios_base::showbase), otherwise
+               // is optional and consumed only if other characters
+               // are needed to complete the format.
+               if (__io.flags() & ios_base::showbase || __sign_size > 1
+                   || __i == 0
+                   || (__i == 1 && (__mandatory_sign
+                                    || (static_cast<part>(__p.field[0])
+                                        == money_base::sign)
+                                    || (static_cast<part>(__p.field[2])
+                                        == money_base::space)))
+                   || (__i == 2 && ((static_cast<part>(__p.field[3])
+                                     == money_base::value)
+                                    || __mandatory_sign
+                                    && (static_cast<part>(__p.field[3])
+                                        == money_base::sign))))
+                 {
+                   const size_type __len = __lc->_M_curr_symbol_size;
+                   size_type __j = 0;
+                   for (; __beg != __end && __j < __len
+                          && *__beg == __lc->_M_curr_symbol[__j];
+                        ++__beg, ++__j);
+                   if (__j != __len
+                       && (__j || __io.flags() & ios_base::showbase))
+                     __testvalid = false;
+                 }
+               break;
+             case money_base::sign:
+               // Sign might not exist, or be more than one character long.
+               if (__lc->_M_positive_sign_size && __beg != __end
+                   && *__beg == __lc->_M_positive_sign[0])
+                 {
+                   __sign_size = __lc->_M_positive_sign_size;
+                   ++__beg;
+                 }
+               else if (__lc->_M_negative_sign_size && __beg != __end
+                        && *__beg == __lc->_M_negative_sign[0])
+                 {
+                   __negative = true;
+                   __sign_size = __lc->_M_negative_sign_size;
+                   ++__beg;
+                 }
+               else if (__lc->_M_positive_sign_size
+                        && !__lc->_M_negative_sign_size)
+                 // "... if no sign is detected, the result is given the sign
+                 // that corresponds to the source of the empty string"
+                 __negative = true;
+               else if (__mandatory_sign)
+                 __testvalid = false;
+               break;
+             case money_base::value:
+               // Extract digits, remove and stash away the
+               // grouping of found thousands separators.
+               for (; __beg != __end; ++__beg)
+                 {
+                   const char_type __c = *__beg;
+                   const char_type* __q = __traits_type::find(__lit_zero, 
+                                                              10, __c);
+                   if (__q != 0)
+                     {
+                       __res += money_base::_S_atoms[__q - __lit];
+                       ++__n;
+                     }
+                   else if (__c == __lc->_M_decimal_point 
+                            && !__testdecfound)
+                     {
+                       __last_pos = __n;
+                       __n = 0;
+                       __testdecfound = true;
+                     }
+                   else if (__lc->_M_use_grouping
+                            && __c == __lc->_M_thousands_sep
+                            && !__testdecfound)
+                     {
+                       if (__n)
+                         {
+                           // Mark position for later analysis.
+                           __grouping_tmp += static_cast<char>(__n);
+                           __n = 0;
+                         }
+                       else
+                         {
+                           __testvalid = false;
+                           break;
+                         }
+                     }
+                   else
+                     break;
+                 }
+               if (__res.empty())
+                 __testvalid = false;
+               break;
+             case money_base::space:
+               // At least one space is required.
+               if (__beg != __end && __ctype.is(ctype_base::space, *__beg))
+                 ++__beg;
+               else
+                 __testvalid = false;
+             case money_base::none:
+               // Only if not at the end of the pattern.
+               if (__i != 3)
+                 for (; __beg != __end
+                        && __ctype.is(ctype_base::space, *__beg); ++__beg);
+               break;
+             }
+         }
+
+       // Need to get the rest of the sign characters, if they exist.
+       if (__sign_size > 1 && __testvalid)
+         {
+           const char_type* __sign = __negative ? __lc->_M_negative_sign
+                                                : __lc->_M_positive_sign;
+           size_type __i = 1;
+           for (; __beg != __end && __i < __sign_size
+                  && *__beg == __sign[__i]; ++__beg, ++__i);
+           
+           if (__i != __sign_size)
+             __testvalid = false;
+         }
+
+       if (__testvalid)
+         {
+           // Strip leading zeros.
+           if (__res.size() > 1)
+             {
+               const size_type __first = __res.find_first_not_of('0');
+               const bool __only_zeros = __first == string::npos;
+               if (__first)
+                 __res.erase(0, __only_zeros ? __res.size() - 1 : __first);
+             }
+
+           // 22.2.6.1.2, p4
+           if (__negative && __res[0] != '0')
+             __res.insert(__res.begin(), '-');
+           
+           // Test for grouping fidelity.
+           if (__grouping_tmp.size())
+             {
+               // Add the ending grouping.
+               __grouping_tmp += static_cast<char>(__testdecfound ? __last_pos
+                                                                  : __n);
+               if (!std::__verify_grouping(__lc->_M_grouping,
+                                           __lc->_M_grouping_size,
+                                           __grouping_tmp))
+                 __testvalid = false;
+             }
+           
+           // Iff not enough digits were supplied after the decimal-point.
+           if (__testdecfound && __lc->_M_frac_digits > 0
+               && __n != __lc->_M_frac_digits)
+             __testvalid = false;
+         }
+       
+       // Iff valid sequence is not recognized.
+       if (!__testvalid)
+         __err |= ios_base::failbit;
+       else
+         __units.swap(__res);
+       
+       // Iff no more characters are available.
+       if (__beg == __end)
+         __err |= ios_base::eofbit;
+       return __beg;
+      }
 
   template<typename _CharT, typename _InIter>
     _InIter
     money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io, 
+    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
           ios_base::iostate& __err, long double& __units) const
-    { 
-      string_type __str;
-      __beg = this->do_get(__beg, __end, __intl, __io, __err, __str); 
-
-      const int __n = numeric_limits<long double>::digits10;
-      char* __cs = static_cast<char*>(__builtin_alloca(__n));
-      const locale __loc = __io.getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
-      const _CharT* __wcs = __str.c_str();
-      __ctype.narrow(__wcs, __wcs + __str.size() + 1, char(), __cs);      
-      std::__convert_to_v(__cs, __units, __err, _S_get_c_locale());
+    {
+      string __str;
+      if (__intl)
+       __beg = _M_extract<true>(__beg, __end, __io, __err, __str);
+      else
+       __beg = _M_extract<false>(__beg, __end, __io, __err, __str);
+      std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
       return __beg;
     }
 
   template<typename _CharT, typename _InIter>
     _InIter
     money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io, 
+    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
           ios_base::iostate& __err, string_type& __units) const
-    { 
-      // These contortions are quite unfortunate.
-      typedef moneypunct<_CharT, true>                 __money_true;
-      typedef moneypunct<_CharT, false>        __money_false;
-      typedef money_base::part                         part;
-      typedef typename string_type::size_type  size_type;
-
-      const locale __loc = __io.getloc();
-      const __money_true& __mpt = use_facet<__money_true>(__loc); 
-      const __money_false& __mpf = use_facet<__money_false>(__loc); 
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
-
-      const money_base::pattern __p = __intl ? __mpt.neg_format() 
-                                            : __mpf.neg_format();
-
-      const string_type __pos_sign =__intl ? __mpt.positive_sign() 
-                                          : __mpf.positive_sign();
-      const string_type __neg_sign =__intl ? __mpt.negative_sign() 
-                                          : __mpf.negative_sign();
-      const char_type __d = __intl ? __mpt.decimal_point() 
-                                  : __mpf.decimal_point();
-      const char_type __sep = __intl ? __mpt.thousands_sep() 
-                                    : __mpf.thousands_sep();
-
-      const string __grouping = __intl ? __mpt.grouping() : __mpf.grouping();
-
-      // Set to deduced positive or negative sign, depending.
-      string_type __sign;
-      // String of grouping info from thousands_sep plucked from __units.
-      string __grouping_tmp; 
-      // Marker for thousands_sep position.
-      int __sep_pos = 0;
-      // If input iterator is in a valid state.
-      bool __testvalid = true;
-      // Flag marking when a decimal point is found.
-      bool __testdecfound = false; 
-
-      // The tentative returned string is stored here.
-      string_type __tmp_units;
+    {
+      typedef typename string::size_type                  size_type;
 
-      char_type __c = *__beg;
-      char_type __eof = static_cast<char_type>(char_traits<char_type>::eof());
-      for (int __i = 0; __beg != __end && __i < 4 && __testvalid; ++__i)
-       {
-         part __which = static_cast<part>(__p.field[__i]);
-         switch (__which)
-               {
-               case money_base::symbol:
-                 if (__io.flags() & ios_base::showbase 
-                     || __i < 2 || __sign.size() > 1
-                     || ((static_cast<part>(__p.field[3]) != money_base::none)
-                         && __i == 2)) 
-                   {
-                     // According to 22.2.6.1.2.2, symbol is required
-                     // if (__io.flags() & ios_base::showbase),
-                     // otherwise is optional and consumed only if
-                     // other characters are needed to complete the
-                     // format.
-                     const string_type __symbol = __intl ? __mpt.curr_symbol()
-                                                        : __mpf.curr_symbol();
-                     size_type __len = __symbol.size();
-                     size_type __j = 0;
-                     while (__beg != __end 
-                            && __j < __len && __symbol[__j] == __c)
-                       {
-                         __c = *(++__beg);
-                         ++__j;
-                       }
-                     // When (__io.flags() & ios_base::showbase)
-                     // symbol is required.
-                     if (__j != __len && (__io.flags() & ios_base::showbase))
-                       __testvalid = false;
-                   }
-                 break;
-               case money_base::sign:              
-                 // Sign might not exist, or be more than one character long. 
-                 if (__pos_sign.size() && __neg_sign.size())
-                 {
-                   // Sign is mandatory.
-                   if (__c == __pos_sign[0])
-                     {
-                       __sign = __pos_sign;
-                       __c = *(++__beg);
-                     }
-                   else if (__c == __neg_sign[0])
-                     {
-                       __sign = __neg_sign;
-                       __c = *(++__beg);
-                     }
-                   else
-                     __testvalid = false;
-                 }
-                 else if (__pos_sign.size() && __c == __pos_sign[0])
-                   {
-                     __sign = __pos_sign;
-                     __c = *(++__beg);
-                   }
-                 else if (__neg_sign.size() && __c == __neg_sign[0])
-                   {
-                     __sign = __neg_sign;
-                     __c = *(++__beg);
-                   }
-                 break;
-               case money_base::value:
-                 // Extract digits, remove and stash away the
-                 // grouping of found thousands separators.
-                 while (__beg != __end 
-                        && (__ctype.is(ctype_base::digit, __c) 
-                            || (__c == __d && !__testdecfound)
-                            || __c == __sep))
-                   {
-                     if (__c == __d)
-                       {
-                         __grouping_tmp += static_cast<char>(__sep_pos);
-                         __sep_pos = 0;
-                         __testdecfound = true;
-                       }
-                     else if (__c == __sep)
-                       {
-                         if (__grouping.size())
-                           {
-                             // Mark position for later analysis.
-                             __grouping_tmp += static_cast<char>(__sep_pos);
-                             __sep_pos = 0;
-                           }
-                         else
-                           {
-                             __testvalid = false;
-                             break;
-                           }
-                       }
-                     else
-                       {
-                         __tmp_units += __c;
-                         ++__sep_pos;
-                       }
-                     __c = *(++__beg);
-                   }
-                 break;
-               case money_base::space:
-               case money_base::none:
-                 // Only if not at the end of the pattern.
-                 if (__i != 3)
-                   while (__beg != __end 
-                          && __ctype.is(ctype_base::space, __c))
-                     __c = *(++__beg);
-                 break;
-               }
-       }
+      const locale& __loc = __io._M_getloc();
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
 
-      // Need to get the rest of the sign characters, if they exist.
-      if (__sign.size() > 1)
+      string __str;
+      const iter_type __ret = __intl ? _M_extract<true>(__beg, __end, __io,
+                                                       __err, __str)
+                                    : _M_extract<false>(__beg, __end, __io,
+                                                        __err, __str);
+      const size_type __len = __str.size();
+      if (__len)
        {
-         size_type __len = __sign.size();
-         size_type __i = 1;
-         for (; __c != __eof && __i < __len; ++__i)
-           while (__beg != __end && __c != __sign[__i])
-             __c = *(++__beg);
-         
-         if (__i != __len)
-           __testvalid = false;
+         _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                              * __len));
+         __ctype.widen(__str.data(), __str.data() + __len, __ws);
+         __units.assign(__ws, __len);
        }
 
-      // Strip leading zeros.
-      while (__tmp_units.size() > 1 && __tmp_units[0] == __ctype.widen('0'))
-       __tmp_units.erase(__tmp_units.begin());
-
-      if (__sign.size() && __sign == __neg_sign)
-       __tmp_units.insert(__tmp_units.begin(), __ctype.widen('-'));
-
-      // Test for grouping fidelity.
-      if (__grouping.size() && __grouping_tmp.size())
-       {
-         if (!std::__verify_grouping(__grouping, __grouping_tmp))
-           __testvalid = false;
-       }
+      return __ret;
+    }
 
-      // Iff no more characters are available.      
-      if (__c == __eof)
-       __err |= ios_base::eofbit;
+  template<typename _CharT, typename _OutIter>
+    template<bool _Intl>
+      _OutIter
+      money_put<_CharT, _OutIter>::
+      _M_insert(iter_type __s, ios_base& __io, char_type __fill,
+               const string_type& __digits) const
+      {
+       typedef typename string_type::size_type           size_type;
+       typedef money_base::part                          part;
+       typedef moneypunct<_CharT, _Intl>                 __moneypunct_type;
+       typedef typename __moneypunct_type::__cache_type  __cache_type;
+      
+       const locale& __loc = __io._M_getloc();
+       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
 
-      // Iff not enough digits were supplied after the decimal-point.
-      if (__testdecfound)
-       {
-         const int __frac = __intl ? __mpt.frac_digits() 
-                                   : __mpf.frac_digits();
-         if (__frac > 0)
-           {
-             if (__sep_pos != __frac)
-               __testvalid = false;
-           }
-       }
+       __use_cache<__cache_type> __uc;
+       const __cache_type* __lc = __uc(__loc);
+       const char_type* __lit = __lc->_M_atoms;
 
-      // Iff valid sequence is not recognized.
-      if (!__testvalid || !__tmp_units.size())
-       __err |= ios_base::failbit;
-      else
-       // Use the "swap trick" to copy __tmp_units into __units.
-       __tmp_units.swap(__units);
+       // Determine if negative or positive formats are to be used, and
+       // discard leading negative_sign if it is present.
+       const char_type* __beg = __digits.data();
 
-      return __beg; 
-    }
+       money_base::pattern __p;
+       const char_type* __sign;
+       size_type __sign_size;
+       if (*__beg != __lit[money_base::_S_minus])
+         {
+           __p = __lc->_M_pos_format;
+           __sign = __lc->_M_positive_sign;
+           __sign_size = __lc->_M_positive_sign_size;
+         }
+       else
+         {
+           __p = __lc->_M_neg_format;
+           __sign = __lc->_M_negative_sign;
+           __sign_size = __lc->_M_negative_sign_size;
+           if (__digits.size())
+             ++__beg;
+         }
+       
+       // Look for valid numbers in the ctype facet within input digits.
+       size_type __len = __ctype.scan_not(ctype_base::digit, __beg,
+                                          __beg + __digits.size()) - __beg;
+       if (__len)
+         {
+           // Assume valid input, and attempt to format.
+           // Break down input numbers into base components, as follows:
+           //   final_value = grouped units + (decimal point) + (digits)
+           string_type __value;
+           __value.reserve(2 * __len);
+
+           // Add thousands separators to non-decimal digits, per
+           // grouping rules.
+           int __paddec = __len - __lc->_M_frac_digits;
+           if (__paddec > 0)
+             {
+               if (__lc->_M_frac_digits < 0)
+                 __paddec = __len;
+               if (__lc->_M_grouping_size)
+                 {
+                   _CharT* __ws =
+                     static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
+                                                           * 2 * __len));
+                   _CharT* __ws_end =
+                     std::__add_grouping(__ws, __lc->_M_thousands_sep,
+                                         __lc->_M_grouping,
+                                         __lc->_M_grouping_size,
+                                         __beg, __beg + __paddec);
+                   __value.assign(__ws, __ws_end - __ws);
+                 }
+               else
+                 __value.assign(__beg, __paddec);
+             }
 
+           // Deal with decimal point, decimal digits.
+           if (__lc->_M_frac_digits > 0)
+             {
+               __value += __lc->_M_decimal_point;
+               if (__paddec >= 0)
+                 __value.append(__beg + __paddec, __lc->_M_frac_digits);
+               else
+                 {
+                   // Have to pad zeros in the decimal position.
+                   __value.append(-__paddec, __lit[money_base::_S_zero]);
+                   __value.append(__beg, __len);
+                 }
+             }
+  
+           // Calculate length of resulting string.
+           const ios_base::fmtflags __f = __io.flags() 
+                                          & ios_base::adjustfield;
+           __len = __value.size() + __sign_size;
+           __len += ((__io.flags() & ios_base::showbase)
+                     ? __lc->_M_curr_symbol_size : 0);
+
+           string_type __res;
+           __res.reserve(2 * __len);
+           
+           const size_type __width = static_cast<size_type>(__io.width());  
+           const bool __testipad = (__f == ios_base::internal
+                                    && __len < __width);
+           // Fit formatted digits into the required pattern.
+           for (int __i = 0; __i < 4; ++__i)
+             {
+               const part __which = static_cast<part>(__p.field[__i]);
+               switch (__which)
+                 {
+                 case money_base::symbol:
+                   if (__io.flags() & ios_base::showbase)
+                     __res.append(__lc->_M_curr_symbol,
+                                  __lc->_M_curr_symbol_size);
+                   break;
+                 case money_base::sign:
+                   // Sign might not exist, or be more than one
+                   // charater long. In that case, add in the rest
+                   // below.
+                   if (__sign_size)
+                     __res += __sign[0];
+                   break;
+                 case money_base::value:
+                   __res += __value;
+                   break;
+                 case money_base::space:
+                   // At least one space is required, but if internal
+                   // formatting is required, an arbitrary number of
+                   // fill spaces will be necessary.
+                   if (__testipad)
+                     __res.append(__width - __len, __fill);
+                   else
+                     __res += __fill;
+                   break;
+                 case money_base::none:
+                   if (__testipad)
+                     __res.append(__width - __len, __fill);
+                   break;
+                 }
+             }
+           
+           // Special case of multi-part sign parts.
+           if (__sign_size > 1)
+             __res.append(__sign + 1, __sign_size - 1);
+           
+           // Pad, if still necessary.
+           __len = __res.size();
+           if (__width > __len)
+             {
+               if (__f == ios_base::left)
+                 // After.
+                 __res.append(__width - __len, __fill);
+               else
+                 // Before.
+                 __res.insert(0, __width - __len, __fill);
+               __len = __width;
+             }
+           
+           // Write resulting, fully-formatted string to output iterator.
+           __s = std::__write(__s, __res.data(), __len);
+         }
+       __io.width(0);
+       return __s;    
+      }
+  
   template<typename _CharT, typename _OutIter>
     _OutIter
     money_put<_CharT, _OutIter>::
     do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
           long double __units) const
-    { 
+    {
       const locale __loc = __io.getloc();
       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
 #ifdef _GLIBCXX_USE_C99
       // First try a buffer perhaps big enough.
       int __cs_size = 64;
       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      int __len = std::__convert_from_v(__cs, __cs_size, "%.01Lf", __units, 
-                                       _S_get_c_locale());
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 328. Bad sprintf format modifier in money_put<>::do_put()
+      int __len = std::__convert_from_v(__cs, __cs_size, "%.*Lf", __units,
+                                       _S_get_c_locale(), 0);
       // If the buffer was not large enough, try again with the correct size.
       if (__len >= __cs_size)
        {
          __cs_size = __len + 1;
          __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-         __len = std::__convert_from_v(__cs, __cs_size, "%.01Lf", __units, 
-                                       _S_get_c_locale());
+         __len = std::__convert_from_v(__cs, __cs_size, "%.*Lf", __units,
+                                       _S_get_c_locale(), 0);
        }
 #else
-      // max_exponent10 + 1 for the integer part, + 4 for sign, decimal point,
-      // decimal digit, '\0'. 
-      const int __cs_size = numeric_limits<long double>::max_exponent10 + 5;
+      // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
+      const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      int __len = std::__convert_from_v(__cs, 0, "%.01Lf", __units, 
-                                       _S_get_c_locale());
+      int __len = std::__convert_from_v(__cs, 0, "%.*Lf", __units,
+                                       _S_get_c_locale(), 0);
 #endif
-      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
+      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
                                                           * __cs_size));
       __ctype.widen(__cs, __cs + __len, __ws);
-      string_type __digits(__ws);
-      return this->do_put(__s, __intl, __io, __fill, __digits); 
+      const string_type __digits(__ws, __len);
+      return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
+                   : _M_insert<false>(__s, __io, __fill, __digits);
     }
 
   template<typename _CharT, typename _OutIter>
@@ -1387,163 +1741,8 @@ namespace std
     money_put<_CharT, _OutIter>::
     do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
           const string_type& __digits) const
-    { 
-      typedef typename string_type::size_type  size_type;
-      typedef money_base::part                         part;
-
-      const locale __loc = __io.getloc();
-      const size_type __width = static_cast<size_type>(__io.width());
-
-      // These contortions are quite unfortunate.
-      typedef moneypunct<_CharT, true> __money_true;
-      typedef moneypunct<_CharT, false> __money_false;
-      const __money_true& __mpt = use_facet<__money_true>(__loc); 
-      const __money_false& __mpf = use_facet<__money_false>(__loc); 
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
-
-      // Determine if negative or positive formats are to be used, and
-      // discard leading negative_sign if it is present.
-      const char_type* __beg = __digits.data();
-      const char_type* __end = __beg + __digits.size();
-      money_base::pattern __p;
-      string_type __sign;
-      if (*__beg != __ctype.widen('-'))
-       {
-         __p = __intl ? __mpt.pos_format() : __mpf.pos_format();
-         __sign =__intl ? __mpt.positive_sign() : __mpf.positive_sign();
-       }
-      else
-       {
-         __p = __intl ? __mpt.neg_format() : __mpf.neg_format();
-         __sign =__intl ? __mpt.negative_sign() : __mpf.negative_sign();
-         ++__beg;
-       }
-      
-      // Look for valid numbers in the current ctype facet within input digits.
-      __end = __ctype.scan_not(ctype_base::digit, __beg, __end);
-      if (__beg != __end)
-       {
-         // Assume valid input, and attempt to format.
-         // Break down input numbers into base components, as follows:
-         //   final_value = grouped units + (decimal point) + (digits)
-         string_type __res;
-         string_type __value;
-         const string_type __symbol = __intl ? __mpt.curr_symbol() 
-                                             : __mpf.curr_symbol();
-
-         // Deal with decimal point, decimal digits.
-         const int __frac = __intl ? __mpt.frac_digits() 
-                                   : __mpf.frac_digits();
-         if (__frac > 0)
-           {
-             const char_type __d = __intl ? __mpt.decimal_point() 
-                                          : __mpf.decimal_point();
-             if (__end - __beg >= __frac)
-               {
-                 __value = string_type(__end - __frac, __end);
-                 __value.insert(__value.begin(), __d);
-                 __end -= __frac;
-               }
-             else
-               {
-                 // Have to pad zeros in the decimal position.
-                 __value = string_type(__beg, __end);
-                 int __paddec = __frac - (__end - __beg);
-                 char_type __zero = __ctype.widen('0');
-                 __value.insert(__value.begin(), __paddec, __zero);
-                 __value.insert(__value.begin(), __d);
-                 __beg = __end;
-               }
-           }
-
-         // Add thousands separators to non-decimal digits, per
-         // grouping rules.
-         if (__beg != __end)
-           {
-             const string __grouping = __intl ? __mpt.grouping() 
-                                              : __mpf.grouping();
-             if (__grouping.size())
-               {
-                 const char_type __sep = __intl ? __mpt.thousands_sep() 
-                                                : __mpf.thousands_sep();
-                 const char* __gbeg = __grouping.c_str();
-                 const char* __gend = __gbeg + __grouping.size();
-                 const int __n = (__end - __beg) * 2;
-                 _CharT* __ws2 =
-                         static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __n));
-                 _CharT* __ws_end = std::__add_grouping(__ws2, __sep, __gbeg, 
-                                                        __gend, __beg, __end);
-                 __value.insert(0, __ws2, __ws_end - __ws2);
-               }
-             else
-               __value.insert(0, string_type(__beg, __end));
-           }
-
-         // Calculate length of resulting string.
-         ios_base::fmtflags __f = __io.flags() & ios_base::adjustfield;
-         size_type __len = __value.size() + __sign.size();
-         __len += (__io.flags() & ios_base::showbase) ? __symbol.size() : 0;
-         bool __testipad = __f == ios_base::internal && __len < __width;
-
-         // Fit formatted digits into the required pattern.
-         for (int __i = 0; __i < 4; ++__i)
-           {
-             part __which = static_cast<part>(__p.field[__i]);
-             switch (__which)
-               {
-               case money_base::symbol:
-                 if (__io.flags() & ios_base::showbase)
-                   __res += __symbol;
-                 break;
-               case money_base::sign:              
-                 // Sign might not exist, or be more than one
-                 // charater long. In that case, add in the rest
-                 // below.
-                 if (__sign.size())
-                   __res += __sign[0];
-                 break;
-               case money_base::value:
-                 __res += __value;
-                 break;
-               case money_base::space:
-                 // At least one space is required, but if internal
-                 // formatting is required, an arbitrary number of
-                 // fill spaces will be necessary.
-                 if (__testipad)
-                   __res += string_type(__width - __len, __fill);
-                 else
-                   __res += __ctype.widen(__fill);
-                 break;
-               case money_base::none:
-                 if (__testipad)
-                   __res += string_type(__width - __len, __fill);
-                 break;
-               }
-           }
-
-         // Special case of multi-part sign parts.
-         if (__sign.size() > 1)
-           __res += string_type(__sign.begin() + 1, __sign.end());
-
-         // Pad, if still necessary.
-         __len = __res.size();
-         if (__width > __len)
-           {
-             if (__f == ios_base::left)
-               // After.
-               __res.append(__width - __len, __fill);
-             else
-               // Before.
-               __res.insert(0, string_type(__width - __len, __fill));
-             __len = __width;
-           }
-
-         // Write resulting, fully-formatted string to output iterator.
-         __s = std::__write(__s, __res.c_str(), __len);
-       }
-      __io.width(0);
-      return __s; 
-    }
+    { return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
+                   : _M_insert<false>(__s, __io, __fill, __digits); }
 
 
   // NB: Not especially useful. Without an ios_base object or some
@@ -1554,32 +1753,29 @@ namespace std
     time_get<_CharT, _InIter>::do_date_order() const
     { return time_base::no_order; }
 
+  // Expand a strftime format string and parse it.  E.g., do_get_date() may
+  // pass %m/%d/%Y => extracted characters.
   template<typename _CharT, typename _InIter>
-    void
+    _InIter
     time_get<_CharT, _InIter>::
-    _M_extract_via_format(iter_type& __beg, iter_type& __end, ios_base& __io,
-                         ios_base::iostate& __err, tm* __tm, 
+    _M_extract_via_format(iter_type __beg, iter_type __end, ios_base& __io,
+                         ios_base::iostate& __err, tm* __tm,
                          const _CharT* __format) const
-    {  
-      locale __loc = __io.getloc();
-      __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
-      size_t __len = char_traits<_CharT>::length(__format);
+    {
+      const locale& __loc = __io._M_getloc();
+      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+      const size_t __len = char_traits<_CharT>::length(__format);
 
       for (size_t __i = 0; __beg != __end && __i < __len && !__err; ++__i)
        {
-         char __c = __format[__i];
-         if (__c == '%')
+         if (__ctype.narrow(__format[__i], 0) == '%')
            {
              // Verify valid formatting code, attempt to extract.
-             __c = __format[++__i];
-             char __mod = 0;
-             int __mem = 0; 
+             char __c = __ctype.narrow(__format[++__i], 0);
+             int __mem = 0;
              if (__c == 'E' || __c == 'O')
-               {
-                 __mod = __c;
-                 __c = __format[++__i];
-               }
+               __c = __ctype.narrow(__format[++__i], 0);
              switch (__c)
                {
                  const char* __cs;
@@ -1588,71 +1784,81 @@ namespace std
                  // Abbreviated weekday name [tm_wday]
                  const char_type*  __days1[7];
                  __tp._M_days_abbreviated(__days1);
-                 _M_extract_name(__beg, __end, __tm->tm_wday, __days1, 7, 
-                                 __err);
+                 __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days1,
+                                         7, __io, __err);
                  break;
                case 'A':
                  // Weekday name [tm_wday].
                  const char_type*  __days2[7];
                  __tp._M_days(__days2);
-                 _M_extract_name(__beg, __end, __tm->tm_wday, __days2, 7, 
-                                 __err);
+                 __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days2,
+                                         7, __io, __err);
                  break;
                case 'h':
                case 'b':
                  // Abbreviated month name [tm_mon]
                  const char_type*  __months1[12];
                  __tp._M_months_abbreviated(__months1);
-                 _M_extract_name(__beg, __end, __tm->tm_mon, __months1, 12
-                                 __err);
+                 __beg = _M_extract_name(__beg, __end, __tm->tm_mon
+                                         __months1, 12, __io, __err);
                  break;
                case 'B':
                  // Month name [tm_mon].
                  const char_type*  __months2[12];
                  __tp._M_months(__months2);
-                 _M_extract_name(__beg, __end, __tm->tm_mon, __months2, 12
-                                 __err);
+                 __beg = _M_extract_name(__beg, __end, __tm->tm_mon
+                                         __months2, 12, __io, __err);
                  break;
                case 'c':
                  // Default time and date representation.
                  const char_type*  __dt[2];
                  __tp._M_date_time_formats(__dt);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __dt[0]);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __dt[0]);
                  break;
                case 'd':
                  // Day [01, 31]. [tm_mday]
-                 _M_extract_num(__beg, __end, __tm->tm_mday, 1, 31, 2, 
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 1, 31, 2,
+                                        __io, __err);
+                 break;
+               case 'e':
+                 // Day [1, 31], with single digits preceded by
+                 // space. [tm_mday]
+                 if (__ctype.is(ctype_base::space, *__beg))
+                   __beg = _M_extract_num(++__beg, __end, __tm->tm_mday, 1, 9,
+                                          1, __io, __err);
+                 else
+                   __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 10, 31,
+                                          2, __io, __err);
                  break;
                case 'D':
                  // Equivalent to %m/%d/%y.[tm_mon, tm_mday, tm_year]
                  __cs = "%m/%d/%y";
                  __ctype.widen(__cs, __cs + 9, __wcs);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __wcs);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __wcs);
                  break;
                case 'H':
                  // Hour [00, 23]. [tm_hour]
-                 _M_extract_num(__beg, __end, __tm->tm_hour, 0, 23, 2,
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 0, 23, 2,
+                                        __io, __err);
                  break;
                case 'I':
                  // Hour [01, 12]. [tm_hour]
-                 _M_extract_num(__beg, __end, __tm->tm_hour, 1, 12, 2, 
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 1, 12, 2,
+                                        __io, __err);
                  break;
                case 'm':
                  // Month [01, 12]. [tm_mon]
-                 _M_extract_num(__beg, __end, __mem, 1, 12, 2, __ctype
-                                __err);
+                 __beg = _M_extract_num(__beg, __end, __mem, 1, 12, 2
+                                        __io, __err);
                  if (!__err)
                    __tm->tm_mon = __mem - 1;
                  break;
                case 'M':
                  // Minute [00, 59]. [tm_min]
-                 _M_extract_num(__beg, __end, __tm->tm_min, 0, 59, 2,
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_min, 0, 59, 2,
+                                        __io, __err);
                  break;
                case 'n':
                  if (__ctype.narrow(*__beg, 0) == '\n')
@@ -1664,51 +1870,56 @@ namespace std
                  // Equivalent to (%H:%M).
                  __cs = "%H:%M";
                  __ctype.widen(__cs, __cs + 6, __wcs);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __wcs);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __wcs);
                  break;
                case 'S':
-                 // Seconds.
-                 _M_extract_num(__beg, __end, __tm->tm_sec, 0, 59, 2,
-                                __ctype, __err);
+                 // Seconds. [tm_sec]
+                 // [00, 60] in C99 (one leap-second), [00, 61] in C89.
+#ifdef _GLIBCXX_USE_C99
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 60, 2,
+#else
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 61, 2,
+#endif
+                                        __io, __err);
                  break;
                case 't':
                  if (__ctype.narrow(*__beg, 0) == '\t')
                    ++__beg;
                  else
-               __err |= ios_base::failbit;
+                   __err |= ios_base::failbit;
                  break;
                case 'T':
                  // Equivalent to (%H:%M:%S).
                  __cs = "%H:%M:%S";
                  __ctype.widen(__cs, __cs + 9, __wcs);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __wcs);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __wcs);
                  break;
                case 'x':
                  // Locale's date.
                  const char_type*  __dates[2];
                  __tp._M_date_formats(__dates);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __dates[0]);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __dates[0]);
                  break;
                case 'X':
                  // Locale's time.
                  const char_type*  __times[2];
                  __tp._M_time_formats(__times);
-                 _M_extract_via_format(__beg, __end, __io, __err, __tm
-                                       __times[0]);
+                 __beg = _M_extract_via_format(__beg, __end, __io, __err
+                                               __tm, __times[0]);
                  break;
                case 'y':
+               case 'C': // C99
                  // Two digit year. [tm_year]
-                 _M_extract_num(__beg, __end, __tm->tm_year, 0, 99, 2, 
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __tm->tm_year, 0, 99, 2,
+                                        __io, __err);
                  break;
                case 'Y':
                  // Year [1900). [tm_year]
-                 _M_extract_num(__beg, __end, __mem, 0, 
-                                numeric_limits<int>::max(), 4, 
-                                __ctype, __err);
+                 __beg = _M_extract_num(__beg, __end, __mem, 0, 9999, 4,
+                                        __io, __err);
                  if (!__err)
                    __tm->tm_year = __mem - 1900;
                  break;
@@ -1717,116 +1928,128 @@ namespace std
                  if (__ctype.is(ctype_base::upper, *__beg))
                    {
                      int __tmp;
-                     _M_extract_name(__beg, __end, __tmp, 
-                                     __timepunct_cache<_CharT>::_S_timezones, 
-                                     14, __err);
-                     
+                     __beg = _M_extract_name(__beg, __end, __tmp,
+                                      __timepunct_cache<_CharT>::_S_timezones,
+                                             14, __io, __err);
+
                      // GMT requires special effort.
-                     char_type __c = *__beg;
-                     if (!__err && __tmp == 0 
-                         && (__c == __ctype.widen('-') 
-                             || __c == __ctype.widen('+')))
+                     if (__beg != __end && !__err && __tmp == 0
+                         && (*__beg == __ctype.widen('-')
+                             || *__beg == __ctype.widen('+')))
                        {
-                         _M_extract_num(__beg, __end, __tmp, 0, 23, 2,
-                                         __ctype, __err);
-                         _M_extract_num(__beg, __end, __tmp, 0, 59, 2,
-                                         __ctype, __err);
-                       }           
-                         }
-                     else
-                       __err |= ios_base::failbit;
-                     break;
-                   default:
-                     // Not recognized.
-                     __err |= ios_base::failbit;
+                         __beg = _M_extract_num(__beg, __end, __tmp, 0, 23, 2,
+                                                __io, __err);
+                         __beg = _M_extract_num(__beg, __end, __tmp, 0, 59, 2,
+                                                __io, __err);
+                       }
                    }
-               }
-             else
-               {
-                 // Verify format and input match, extract and discard.
-                 if (__c == __ctype.narrow(*__beg, 0))
-                   ++__beg;
                  else
                    __err |= ios_base::failbit;
+                 break;
+               default:
+                 // Not recognized.
+                 __err |= ios_base::failbit;
                }
+           }
+         else
+           {
+             // Verify format and input match, extract and discard.
+             if (__format[__i] == *__beg)
+               ++__beg;
+             else
+               __err |= ios_base::failbit;
+           }
        }
+      return __beg;
     }
 
   template<typename _CharT, typename _InIter>
-    void
+    _InIter
     time_get<_CharT, _InIter>::
-    _M_extract_num(iter_type& __beg, iter_type& __end, int& __member,
-                  int __min, int __max, size_t __len, 
-                  const ctype<_CharT>& __ctype, 
-                  ios_base::iostate& __err) const
+    _M_extract_num(iter_type __beg, iter_type __end, int& __member,
+                  int __min, int __max, size_t __len,
+                  ios_base& __io, ios_base::iostate& __err) const
     {
+      const locale& __loc = __io._M_getloc();
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+
+      // As-is works for __len = 1, 2, 4, the values actually used.
+      int __mult = __len == 2 ? 10 : (__len == 4 ? 1000 : 1);
+
+      ++__min;
       size_t __i = 0;
-      string __digits;
-      bool __testvalid = true;
-      char_type __c = *__beg;
-      while (__beg != __end && __i < __len 
-            && __ctype.is(ctype_base::digit, __c)) 
+      int __value = 0;
+      for (; __beg != __end && __i < __len; ++__beg, ++__i)
        {
-         __digits += __ctype.narrow(__c, 0);
-         __c = *(++__beg);
-         ++__i;
-       }
-      if (__i == __len)
-       {
-         int __value = atoi(__digits.c_str());
-         if (__min <= __value && __value <= __max)
-           __member = __value;
+         const char __c = __ctype.narrow(*__beg, '*');
+         if (__c >= '0' && __c <= '9')
+           {
+             __value = __value * 10 + (__c - '0');
+             const int __valuec = __value * __mult;
+             if (__valuec > __max || __valuec + __mult < __min)
+               break;
+             __mult /= 10;
+           }
          else
-           __testvalid = false;
+           break;
        }
+      if (__i == __len)
+       __member = __value;
       else
-       __testvalid = false;
-      if (!__testvalid)
        __err |= ios_base::failbit;
+      return __beg;
     }
 
   // Assumptions:
   // All elements in __names are unique.
   template<typename _CharT, typename _InIter>
-    void
+    _InIter
     time_get<_CharT, _InIter>::
-    _M_extract_name(iter_type& __beg, iter_type& __end, int& __member,
-                   const _CharT** __names, size_t __indexlen, 
-                   ios_base::iostate& __err) const
+    _M_extract_name(iter_type __beg, iter_type __end, int& __member,
+                   const _CharT** __names, size_t __indexlen,
+                   ios_base& __io, ios_base::iostate& __err) const
     {
-      typedef char_traits<_CharT>              __traits_type;
-      int* __matches = static_cast<int*>(__builtin_alloca(sizeof(int) 
+      typedef char_traits<_CharT>              __traits_type;
+      const locale& __loc = __io._M_getloc();
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+
+      int* __matches = static_cast<int*>(__builtin_alloca(sizeof(int)
                                                          * __indexlen));
       size_t __nmatches = 0;
       size_t __pos = 0;
       bool __testvalid = true;
       const char_type* __name;
 
-      char_type __c = *__beg;
       // Look for initial matches.
-      for (size_t __i1 = 0; __i1 < __indexlen; ++__i1)
-       if (__c == __names[__i1][0])
-         __matches[__nmatches++] = __i1;
-      
+      // NB: Some of the locale data is in the form of all lowercase
+      // names, and some is in the form of initially-capitalized
+      // names. Look for both.
+      if (__beg != __end)
+       {
+         const char_type __c = *__beg;
+         for (size_t __i1 = 0; __i1 < __indexlen; ++__i1)
+           if (__c == __names[__i1][0]
+               || __c == __ctype.toupper(__names[__i1][0]))
+             __matches[__nmatches++] = __i1;
+       }
+
       while (__nmatches > 1)
        {
          // Find smallest matching string.
-         size_t __minlen = 10;
-         for (size_t __i2 = 0; __i2 < __nmatches; ++__i2)
-           __minlen = min(__minlen, 
-                          __traits_type::length(__names[__matches[__i2]]));
-         
+         size_t __minlen = __traits_type::length(__names[__matches[0]]);
+         for (size_t __i2 = 1; __i2 < __nmatches; ++__i2)
+           __minlen = std::min(__minlen,
+                             __traits_type::length(__names[__matches[__i2]]));
+         ++__beg, ++__pos;
          if (__pos < __minlen && __beg != __end)
-           {
-             ++__pos;
-             __c = *(++__beg);
-             for (size_t __i3 = 0; __i3 < __nmatches; ++__i3)
-               {
-                 __name = __names[__matches[__i3]];
-                 if (__name[__pos] != __c)
-                   __matches[__i3] = __matches[--__nmatches];
-               }
-           }
+           for (size_t __i3 = 0; __i3 < __nmatches;)
+             {
+               __name = __names[__matches[__i3]];
+               if (__name[__pos] != *__beg)
+                 __matches[__i3] = __matches[--__nmatches];
+               else
+                 ++__i3;
+             }
          else
            break;
        }
@@ -1834,6 +2057,7 @@ namespace std
       if (__nmatches == 1)
        {
          // Make sure found name is completely extracted.
+         ++__beg, ++__pos;
          __name = __names[__matches[0]];
          const size_t __len = __traits_type::length(__name);
          while (__pos < __len && __beg != __end && __name[__pos] == *__beg)
@@ -1848,6 +2072,7 @@ namespace std
        __testvalid = false;
       if (!__testvalid)
        __err |= ios_base::failbit;
+      return __beg;
     }
 
   template<typename _CharT, typename _InIter>
@@ -1856,12 +2081,12 @@ namespace std
     do_get_time(iter_type __beg, iter_type __end, ios_base& __io,
                ios_base::iostate& __err, tm* __tm) const
     {
-      _CharT __wcs[3];
-      const char* __cs = "%X";
-      locale __loc = __io.getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __ctype.widen(__cs, __cs + 3, __wcs);
-      _M_extract_via_format(__beg, __end, __io, __err, __tm, __wcs);
+      const locale& __loc = __io._M_getloc();
+      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      const char_type*  __times[2];
+      __tp._M_time_formats(__times);
+      __beg = _M_extract_via_format(__beg, __end, __io, __err, 
+                                   __tm, __times[0]);
       if (__beg == __end)
        __err |= ios_base::eofbit;
       return __beg;
@@ -1873,12 +2098,12 @@ namespace std
     do_get_date(iter_type __beg, iter_type __end, ios_base& __io,
                ios_base::iostate& __err, tm* __tm) const
     {
-      _CharT __wcs[3];
-      const char* __cs = "%x";
-      locale __loc = __io.getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __ctype.widen(__cs, __cs + 3, __wcs);
-      _M_extract_via_format(__beg, __end, __io, __err, __tm, __wcs);
+      const locale& __loc = __io._M_getloc();
+      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      const char_type*  __dates[2];
+      __tp._M_date_formats(__dates);
+      __beg = _M_extract_via_format(__beg, __end, __io, __err, 
+                                   __tm, __dates[0]);
       if (__beg == __end)
        __err |= ios_base::eofbit;
       return __beg;
@@ -1887,24 +2112,25 @@ namespace std
   template<typename _CharT, typename _InIter>
     _InIter
     time_get<_CharT, _InIter>::
-    do_get_weekday(iter_type __beg, iter_type __end, ios_base& __io, 
+    do_get_weekday(iter_type __beg, iter_type __end, ios_base& __io,
                   ios_base::iostate& __err, tm* __tm) const
     {
-      typedef char_traits<_CharT>              __traits_type;
-      locale __loc = __io.getloc();
-      __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      typedef char_traits<_CharT>              __traits_type;
+      const locale& __loc = __io._M_getloc();
+      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
       const char_type*  __days[7];
       __tp._M_days_abbreviated(__days);
       int __tmpwday;
-      _M_extract_name(__beg, __end, __tmpwday, __days, 7, __err);
+      __beg = _M_extract_name(__beg, __end, __tmpwday, __days, 7, __io, __err);
 
       // Check to see if non-abbreviated name exists, and extract.
       // NB: Assumes both _M_days and _M_days_abbreviated organized in
       // exact same order, first to last, such that the resulting
       // __days array with the same index points to a day, and that
       // day's abbreviated form.
-      // NB: Also assumes that an abbreviated name is a subset of the name. 
-      if (!__err)
+      // NB: Also assumes that an abbreviated name is a subset of the name.
+      if (!__err && __beg != __end)
        {
          size_t __pos = __traits_type::length(__days[__tmpwday]);
          __tp._M_days(__days);
@@ -1913,15 +2139,16 @@ namespace std
            {
              // Extract the rest of it.
              const size_t __len = __traits_type::length(__name);
-             while (__pos < __len && __beg != __end 
+             while (__pos < __len && __beg != __end
                     && __name[__pos] == *__beg)
                ++__beg, ++__pos;
              if (__len != __pos)
                __err |= ios_base::failbit;
            }
-         if (!__err)
-           __tm->tm_wday = __tmpwday;
        }
+      if (!__err)
+       __tm->tm_wday = __tmpwday;
+      
       if (__beg == __end)
        __err |= ios_base::eofbit;
       return __beg;
@@ -1933,21 +2160,23 @@ namespace std
     do_get_monthname(iter_type __beg, iter_type __end,
                      ios_base& __io, ios_base::iostate& __err, tm* __tm) const
     {
-      typedef char_traits<_CharT>              __traits_type;
-      locale __loc = __io.getloc();
-      __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      typedef char_traits<_CharT>              __traits_type;
+      const locale& __loc = __io._M_getloc();
+      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
       const char_type*  __months[12];
       __tp._M_months_abbreviated(__months);
       int __tmpmon;
-      _M_extract_name(__beg, __end, __tmpmon, __months, 12, __err);
+      __beg = _M_extract_name(__beg, __end, __tmpmon, __months, 12, 
+                             __io, __err);
 
       // Check to see if non-abbreviated name exists, and extract.
       // NB: Assumes both _M_months and _M_months_abbreviated organized in
       // exact same order, first to last, such that the resulting
       // __months array with the same index points to a month, and that
       // month's abbreviated form.
-      // NB: Also assumes that an abbreviated name is a subset of the name. 
-      if (!__err)
+      // NB: Also assumes that an abbreviated name is a subset of the name.
+      if (!__err && __beg != __end)
        {
          size_t __pos = __traits_type::length(__months[__tmpmon]);
          __tp._M_months(__months);
@@ -1956,16 +2185,16 @@ namespace std
            {
              // Extract the rest of it.
              const size_t __len = __traits_type::length(__name);
-             while (__pos < __len && __beg != __end 
+             while (__pos < __len && __beg != __end
                     && __name[__pos] == *__beg)
                ++__beg, ++__pos;
              if (__len != __pos)
                __err |= ios_base::failbit;
            }
-         if (!__err)
-           __tm->tm_mon = __tmpmon;
        }
+      if (!__err)
+       __tm->tm_mon = __tmpmon;
+
       if (__beg == __end)
        __err |= ios_base::eofbit;
       return __beg;
@@ -1974,32 +2203,24 @@ namespace std
   template<typename _CharT, typename _InIter>
     _InIter
     time_get<_CharT, _InIter>::
-    do_get_year(iter_type __beg, iter_type __end, ios_base& __io, 
+    do_get_year(iter_type __beg, iter_type __end, ios_base& __io,
                ios_base::iostate& __err, tm* __tm) const
     {
-      locale __loc = __io.getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
+      const locale& __loc = __io._M_getloc();
+      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
 
-      char_type __c = *__beg;
       size_t __i = 0;
-      string __digits;
-      while (__i < 4 && __beg != __end && __ctype.is(ctype_base::digit, __c))
+      int __value = 0;
+      for (; __beg != __end && __i < 4; ++__beg, ++__i)
        {
-         __digits += __ctype.narrow(__c, 0);
-         __c = *(++__beg);
-         ++__i;
+         const char __c = __ctype.narrow(*__beg, '*');
+         if (__c >= '0' && __c <= '9')
+           __value = __value * 10 + (__c - '0');
+         else
+           break;
        }
       if (__i == 2 || __i == 4)
-       {
-         long __l;
-         std::__convert_to_v(__digits.c_str(), __l, __err,
-                             _S_get_c_locale());
-         if (!(__err & ios_base::failbit) && __l <= INT_MAX)
-           {
-             __l = __i == 2 ? __l : __l - 1900; 
-             __tm->tm_year = static_cast<int>(__l);
-           }
-       }
+       __tm->tm_year = __i == 2 ? __value : __value - 1900;
       else
        __err |= ios_base::failbit;
       if (__beg == __end)
@@ -2010,54 +2231,53 @@ namespace std
   template<typename _CharT, typename _OutIter>
     _OutIter
     time_put<_CharT, _OutIter>::
-    put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm, 
+    put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
        const _CharT* __beg, const _CharT* __end) const
     {
-      locale __loc = __io.getloc();
+      const locale& __loc = __io._M_getloc();
       ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      while (__beg != __end)
-       {
-         const _CharT __tmp = *__beg;
-         ++__beg;
-         if (__ctype.narrow(__tmp, 0) == '%' && __beg != __end)
-           {
-             char __format;
-             char __mod = 0;
-             const char __c = __ctype.narrow(*__beg, 0);
-             ++__beg;
-             if (__c == 'E' || __c == 'O')
-               {
-                 __mod = __c;
-                 __format = __ctype.narrow(*__beg, 0);
-                 ++__beg;
-               }
-             else
-               __format = __c;
-             __s = this->do_put(__s, __io, __fill, __tm, __format, __mod);
-           }
-         else
-           {
-             *__s = __tmp;
-             ++__s;
-           }
-       }
+      for (; __beg != __end; ++__beg)
+       if (__ctype.narrow(*__beg, 0) != '%')
+         {
+           *__s = *__beg;
+           ++__s;
+         }
+       else if (++__beg != __end)
+         {
+           char __format;
+           char __mod = 0;
+           const char __c = __ctype.narrow(*__beg, 0);
+           if (__c != 'E' && __c != 'O')
+             __format = __c;
+           else if (++__beg != __end)
+             {
+               __mod = __c;
+               __format = __ctype.narrow(*__beg, 0);
+             }
+           else
+             break;
+           __s = this->do_put(__s, __io, __fill, __tm, __format, __mod);
+         }
+       else
+         break;
       return __s;
     }
 
   template<typename _CharT, typename _OutIter>
     _OutIter
     time_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type, const tm* __tm, 
+    do_put(iter_type __s, ios_base& __io, char_type, const tm* __tm,
           char __format, char __mod) const
-    { 
-      locale __loc = __io.getloc();
+    {
+      const locale& __loc = __io._M_getloc();
       ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
       __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
 
       // NB: This size is arbitrary. Should this be a data member,
       // initialized at construction?
-      const size_t __maxlen = 64;
-      char_type* __res = static_cast<char_type*>(__builtin_alloca(sizeof(char_type) * __maxlen));
+      const size_t __maxlen = 128;
+      char_type* __res = 
+       static_cast<char_type*>(__builtin_alloca(sizeof(char_type) * __maxlen));
 
       // NB: In IEE 1003.1-200x, and perhaps other locale models, it
       // is possible that the format character will be longer than one
@@ -2065,7 +2285,7 @@ namespace std
       // format character: if __mod is not the default argument, assume
       // it's a valid modifier.
       char_type __fmt[4];
-      __fmt[0] = __ctype.widen('%'); 
+      __fmt[0] = __ctype.widen('%');
       if (!__mod)
        {
          __fmt[1] = __format;
@@ -2084,7 +2304,6 @@ namespace std
       return std::__write(__s, __res, char_traits<char_type>::length(__res));
     }
 
-
   // Generic version does nothing.
   template<typename _CharT>
     int
@@ -2100,25 +2319,25 @@ namespace std
   template<typename _CharT>
     int
     collate<_CharT>::
-    do_compare(const _CharT* __lo1, const _CharT* __hi1, 
+    do_compare(const _CharT* __lo1, const _CharT* __hi1,
               const _CharT* __lo2, const _CharT* __hi2) const
-    { 
+    {
       // strcoll assumes zero-terminated strings so we make a copy
       // and then put a zero at the end.
       const string_type __one(__lo1, __hi1);
       const string_type __two(__lo2, __hi2);
 
       const _CharT* __p = __one.c_str();
-      const _CharT* __pend = __one.c_str() + __one.length();
+      const _CharT* __pend = __one.data() + __one.length();
       const _CharT* __q = __two.c_str();
-      const _CharT* __qend = __two.c_str() + __two.length();
+      const _CharT* __qend = __two.data() + __two.length();
 
       // strcoll stops when it sees a nul character so we break
       // the strings into zero-terminated substrings and pass those
       // to strcoll.
       for (;;)
        {
-         int __res = _M_compare(__p, __q);
+         const int __res = _M_compare(__p, __q);
          if (__res)
            return __res;
 
@@ -2136,7 +2355,7 @@ namespace std
        }
     }
 
- template<typename _CharT>
 template<typename _CharT>
     typename collate<_CharT>::string_type
     collate<_CharT>::
     do_transform(const _CharT* __lo, const _CharT* __hi) const
@@ -2145,7 +2364,7 @@ namespace std
       string_type __str(__lo, __hi);
 
       const _CharT* __p = __str.c_str();
-      const _CharT* __pend = __str.c_str() + __str.length();
+      const _CharT* __pend = __str.data() + __str.length();
 
       size_t __len = (__hi - __lo) * 2;
 
@@ -2165,9 +2384,9 @@ namespace std
          if (__res >= __len)
            {
              __len = __res + 1;
-             __c = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
+             __c = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
                                                          * __len));
-             __res = _M_transform(__c, __p, __res + 1);
+             __res = _M_transform(__c, __p, __len);
            }
 
          __ret.append(__c, __res);
@@ -2180,20 +2399,20 @@ namespace std
        }
     }
 
- template<typename _CharT>
 template<typename _CharT>
     long
     collate<_CharT>::
     do_hash(const _CharT* __lo, const _CharT* __hi) const
-    { 
+    {
       unsigned long __val = 0;
       for (; __lo < __hi; ++__lo)
-       __val = *__lo + ((__val << 7) | 
+       __val = *__lo + ((__val << 7) |
                       (__val >> (numeric_limits<unsigned long>::digits - 7)));
       return static_cast<long>(__val);
     }
 
   // Construct correctly padded string, as per 22.2.2.2.2
-  // Assumes 
+  // Assumes
   // __newlen > __oldlen
   // __news is allocated for __newlen size
   // Used by both num_put and ostream inserters: if __num,
@@ -2204,121 +2423,95 @@ namespace std
   // NB: Of the two parameters, _CharT can be deduced from the
   // function arguments. The other (_Traits) has to be explicitly specified.
   template<typename _CharT, typename _Traits>
-    void 
-    __pad<_CharT, _Traits>::_S_pad(ios_base& __io, _CharT __fill, 
-                                  _CharT* __news, const _CharT* __olds, 
-                                  const streamsize __newlen, 
+    void
+    __pad<_CharT, _Traits>::_S_pad(ios_base& __io, _CharT __fill,
+                                  _CharT* __news, const _CharT* __olds,
+                                  const streamsize __newlen,
                                   const streamsize __oldlen, const bool __num)
     {
-      size_t __plen = static_cast<size_t>(__newlen - __oldlen);
-      _CharT* __pads = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) 
-                                                            * __plen));
-      _Traits::assign(__pads, __plen, __fill); 
-
-      _CharT* __beg;
-      _CharT* __end;
-      size_t __mod = 0;
-      size_t __beglen; //either __plen or __oldlen
-      ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield;
+      const size_t __plen = static_cast<size_t>(__newlen - __oldlen);
+      const ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield;
 
+      // Padding last.
       if (__adjust == ios_base::left)
        {
-         // Padding last.
-         __beg = const_cast<_CharT*>(__olds);
-         __beglen = __oldlen;
-         __end = __pads;
+         _Traits::copy(__news, const_cast<_CharT*>(__olds), __oldlen);
+         _Traits::assign(__news + __oldlen, __plen, __fill);
+         return;
        }
-      else if (__adjust == ios_base::internal && __num)
+
+      size_t __mod = 0;
+      if (__adjust == ios_base::internal && __num)
        {
          // Pad after the sign, if there is one.
          // Pad after 0[xX], if there is one.
          // Who came up with these rules, anyway? Jeeze.
           const locale& __loc = __io._M_getloc();
-         const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); 
-         const _CharT __minus = __ctype.widen('-');
-         const _CharT __plus = __ctype.widen('+');
-         bool __testsign = _Traits::eq(__olds[0], __minus)
-                           || _Traits::eq(__olds[0], __plus);
-
-         bool __testhex = _Traits::eq(__ctype.widen('0'), __olds[0]) 
-                          && (_Traits::eq(__ctype.widen('x'), __olds[1]) 
-                              || _Traits::eq(__ctype.widen('X'), __olds[1]));
+         const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+
+         const bool __testsign = (__ctype.widen('-') == __olds[0]
+                                  || __ctype.widen('+') == __olds[0]);
+         const bool __testhex = (__ctype.widen('0') == __olds[0]
+                                 && __oldlen > 1
+                                 && (__ctype.widen('x') == __olds[1]
+                                     || __ctype.widen('X') == __olds[1]));
          if (__testhex)
            {
-             __news[0] = __olds[0]; 
+             __news[0] = __olds[0];
              __news[1] = __olds[1];
-             __mod += 2;
+             __mod = 2;
              __news += 2;
-             __beg = __pads;
-             __beglen = __plen;
-             __end = const_cast<_CharT*>(__olds + __mod);
            }
          else if (__testsign)
            {
              __news[0] = __olds[0];
-             ++__mod;
+             __mod = 1;
              ++__news;
-             __beg = __pads;
-             __beglen = __plen;
-             __end = const_cast<_CharT*>(__olds + __mod);
-           }
-         else
-           {
-             // Padding first.
-             __beg = __pads;
-             __beglen = __plen;
-             __end = const_cast<_CharT*>(__olds);
            }
+         // else Padding first.
        }
-      else
-       {
-         // Padding first.
-         __beg = __pads;
-         __beglen = __plen;
-         __end = const_cast<_CharT*>(__olds);
-       }
-      _Traits::copy(__news, __beg, __beglen);
-      _Traits::copy(__news + __beglen, __end, __newlen - __beglen - __mod);
+      _Traits::assign(__news, __plen, __fill);
+      _Traits::copy(__news + __plen, const_cast<_CharT*>(__olds + __mod),
+                   __oldlen - __mod);
     }
 
-  template<typename _CharT>
-    bool
-    __verify_grouping(const basic_string<_CharT>& __grouping, 
-                     basic_string<_CharT>& __grouping_tmp)
-    {         
-      size_t __i = 0;
-      size_t __j = 0;
-      const size_t __len = __grouping.size();
-      const size_t __n = __grouping_tmp.size();
-      bool __test = true;
-      
-      // Parsed number groupings have to match the
-      // numpunct::grouping string exactly, starting at the
-      // right-most point of the parsed sequence of elements ...
-      while (__test && __i < __n - 1)
-       for (__j = 0; __test && __j < __len && __i < __n - 1; ++__j,++__i)
-         __test &= __grouping[__j] == __grouping_tmp[__n - __i - 1];
-      // ... but the last parsed grouping can be <= numpunct
-      // grouping.
-      __j == __len ? __j = 0 : __j;
-      __test &= __grouping[__j] >= __grouping_tmp[__n - __i - 1];
-      return __test;
-    }
+  bool
+  __verify_grouping(const char* __grouping, size_t __grouping_size,
+                   const string& __grouping_tmp)
+  {
+    const size_t __n = __grouping_tmp.size() - 1;
+    const size_t __min = std::min(__n, size_t(__grouping_size - 1));
+    size_t __i = __n;
+    bool __test = true;
+    
+    // Parsed number groupings have to match the
+    // numpunct::grouping string exactly, starting at the
+    // right-most point of the parsed sequence of elements ...
+    for (size_t __j = 0; __j < __min && __test; --__i, ++__j)
+      __test = __grouping_tmp[__i] == __grouping[__j];
+    for (; __i && __test; --__i)
+      __test = __grouping_tmp[__i] == __grouping[__min];
+    // ... but the last parsed grouping can be <= numpunct
+    // grouping.
+    __test &= __grouping_tmp[0] <= __grouping[__min];
+    return __test;
+  }
 
   template<typename _CharT>
     _CharT*
-    __add_grouping(_CharT* __s, _CharT __sep,  
-                  const char* __gbeg, const char* __gend, 
+    __add_grouping(_CharT* __s, _CharT __sep,
+                  const char* __gbeg, size_t __gsize,
                   const _CharT* __first, const _CharT* __last)
     {
       if (__last - __first > *__gbeg)
-        {
-         const bool __bump = __gbeg + 1 != __gend;
-          __s = std::__add_grouping(__s,  __sep, __gbeg + __bump,
-                                   __gend, __first, __last - *__gbeg);
-          __first = __last - *__gbeg;
-          *__s++ = __sep;
-        }
+       {
+         const bool __bump = __gsize != 1;
+         __s = std::__add_grouping(__s,  __sep, __gbeg + __bump,
+                                   __gsize - __bump, __first,
+                                   __last - *__gbeg);
+         __first = __last - *__gbeg;
+         *__s++ = __sep;
+       }
       do
        *__s++ = *__first++;
       while (__first != __last);
@@ -2326,7 +2519,7 @@ namespace std
     }
 
   // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.  
+  // which are defined via explicit instantiations elsewhere.
   // NB: This syntax is a GNU extension.
 #if _GLIBCXX_EXTERN_TEMPLATE
   extern template class moneypunct<char, false>;
@@ -2338,7 +2531,7 @@ namespace std
   extern template class numpunct<char>;
   extern template class numpunct_byname<char>;
   extern template class num_get<char>;
-  extern template class num_put<char>; 
+  extern template class num_put<char>;
   extern template class __timepunct<char>;
   extern template class time_put<char>;
   extern template class time_put_byname<char>;
@@ -2352,106 +2545,106 @@ namespace std
   extern template class collate_byname<char>;
 
   extern template
-    const codecvt<char, char, mbstate_t>& 
+    const codecvt<char, char, mbstate_t>&
     use_facet<codecvt<char, char, mbstate_t> >(const locale&);
 
   extern template
-    const collate<char>& 
+    const collate<char>&
     use_facet<collate<char> >(const locale&);
 
   extern template
-    const numpunct<char>& 
+    const numpunct<char>&
     use_facet<numpunct<char> >(const locale&);
 
-  extern template 
-    const num_put<char>& 
+  extern template
+    const num_put<char>&
     use_facet<num_put<char> >(const locale&);
 
-  extern template 
-    const num_get<char>& 
+  extern template
+    const num_get<char>&
     use_facet<num_get<char> >(const locale&);
 
   extern template
-    const moneypunct<char, true>& 
+    const moneypunct<char, true>&
     use_facet<moneypunct<char, true> >(const locale&);
 
   extern template
-    const moneypunct<char, false>& 
+    const moneypunct<char, false>&
     use_facet<moneypunct<char, false> >(const locale&);
 
-  extern template 
-    const money_put<char>& 
+  extern template
+    const money_put<char>&
     use_facet<money_put<char> >(const locale&);
 
-  extern template 
-    const money_get<char>& 
+  extern template
+    const money_get<char>&
     use_facet<money_get<char> >(const locale&);
 
   extern template
-    const __timepunct<char>& 
+    const __timepunct<char>&
     use_facet<__timepunct<char> >(const locale&);
 
-  extern template 
-    const time_put<char>& 
+  extern template
+    const time_put<char>&
     use_facet<time_put<char> >(const locale&);
 
-  extern template 
-    const time_get<char>& 
+  extern template
+    const time_get<char>&
     use_facet<time_get<char> >(const locale&);
 
-  extern template 
-    const messages<char>& 
+  extern template
+    const messages<char>&
     use_facet<messages<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<ctype<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<codecvt<char, char, mbstate_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<collate<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<numpunct<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<num_put<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<num_get<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<moneypunct<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<money_put<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<money_get<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<__timepunct<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<time_put<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<time_get<char> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<messages<char> >(const locale&);
 
@@ -2479,106 +2672,106 @@ namespace std
   extern template class collate_byname<wchar_t>;
 
   extern template
-    const codecvt<wchar_t, char, mbstate_t>& 
+    const codecvt<wchar_t, char, mbstate_t>&
     use_facet<codecvt<wchar_t, char, mbstate_t> >(locale const&);
 
   extern template
-    const collate<wchar_t>& 
+    const collate<wchar_t>&
     use_facet<collate<wchar_t> >(const locale&);
 
   extern template
-    const numpunct<wchar_t>& 
+    const numpunct<wchar_t>&
     use_facet<numpunct<wchar_t> >(const locale&);
 
-  extern template 
-    const num_put<wchar_t>& 
+  extern template
+    const num_put<wchar_t>&
     use_facet<num_put<wchar_t> >(const locale&);
 
-  extern template 
-    const num_get<wchar_t>& 
+  extern template
+    const num_get<wchar_t>&
     use_facet<num_get<wchar_t> >(const locale&);
 
   extern template
-    const moneypunct<wchar_t, true>& 
+    const moneypunct<wchar_t, true>&
     use_facet<moneypunct<wchar_t, true> >(const locale&);
 
   extern template
-    const moneypunct<wchar_t, false>& 
+    const moneypunct<wchar_t, false>&
     use_facet<moneypunct<wchar_t, false> >(const locale&);
-  extern template 
-    const money_put<wchar_t>& 
+
+  extern template
+    const money_put<wchar_t>&
     use_facet<money_put<wchar_t> >(const locale&);
 
-  extern template 
-    const money_get<wchar_t>& 
+  extern template
+    const money_get<wchar_t>&
     use_facet<money_get<wchar_t> >(const locale&);
 
   extern template
-    const __timepunct<wchar_t>& 
+    const __timepunct<wchar_t>&
     use_facet<__timepunct<wchar_t> >(const locale&);
 
-  extern template 
-    const time_put<wchar_t>& 
+  extern template
+    const time_put<wchar_t>&
     use_facet<time_put<wchar_t> >(const locale&);
 
-  extern template 
-    const time_get<wchar_t>& 
+  extern template
+    const time_get<wchar_t>&
     use_facet<time_get<wchar_t> >(const locale&);
 
-  extern template 
-    const messages<wchar_t>& 
+  extern template
+    const messages<wchar_t>&
     use_facet<messages<wchar_t> >(const locale&);
 
- extern template 
+ extern template
     bool
     has_facet<ctype<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<codecvt<wchar_t, char, mbstate_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<collate<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<numpunct<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<num_put<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<num_get<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<moneypunct<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<money_put<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<money_get<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<__timepunct<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<time_put<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<time_get<wchar_t> >(const locale&);
 
-  extern template 
+  extern template
     bool
     has_facet<messages<wchar_t> >(const locale&);
 #endif