OSDN Git Service

2004-04-26 Paolo Carlini <pcarlini@suse.de>
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / istream.tcc
index a8da096..21f809d 100644 (file)
@@ -1,4 +1,7 @@
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// istream classes -*- C++ -*-
+
+// 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
 // software; you can redistribute it and/or modify it under the
 // the GNU General Public License.
 
 //
-// ISO C++ 14882: 27.6.2  Output streams
+// ISO C++ 14882: 27.6.1  Input streams
 //
 
-#include <bits/std_locale.h>
+#ifndef _ISTREAM_TCC
+#define _ISTREAM_TCC 1
+
+#pragma GCC system_header
 
-namespace std {
+#include <locale>
+#include <ostream> // For flush()
 
+namespace std
+{
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>::sentry::
     sentry(basic_istream<_CharT, _Traits>& __in, bool __noskipws)
     {
-      if (__in.good()) 
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      if (__in.good())
        {
          if (__in.tie())
            __in.tie()->flush();
          if (!__noskipws && (__in.flags() & ios_base::skipws))
-           {     
+           {
              const __int_type __eof = traits_type::eof();
-             __int_type __c = __int_type(0);
              __streambuf_type* __sb = __in.rdbuf();
-             const __ctype_type* __ctype = __in._M_get_fctype_ios();
-             bool __testsp = true;
-             bool __testeof = false;
-             
-             while (!__testeof && __testsp)
-               {
-                 __c = __sb->sbumpc();
-                 __testeof = __c == __eof;
-                 __testsp = __ctype->is(ctype_base::space, __c);
-               }
-             
-             if (!__testeof && !__testsp)
-               __sb->sputbackc(__c);
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-//195.  Should basic_istream::sentry's constructor ever set eofbit? 
-             else
-               __in.setstate(ios_base::eofbit);
-#endif
+             __int_type __c = __sb->sgetc();
+
+             const __ctype_type& __ct = __check_facet(__in._M_ctype);
+             while (!traits_type::eq_int_type(__c, __eof)
+                    && __ct.is(ctype_base::space,
+                               traits_type::to_char_type(__c)))
+               __c = __sb->snextc();
+
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 195. Should basic_istream::sentry's constructor ever
+             // set eofbit?
+             if (traits_type::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
            }
        }
 
-      if (__in.good())
+      if (__in.good() && __err == ios_base::goodbit)
        _M_ok = true;
       else
        {
          _M_ok = false;
-         __in.setstate(ios_base::failbit);
+         __err |= ios_base::failbit;
+         __in.setstate(__err);
        }
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(__istream_type& (*__pf)(__istream_type&))
-    {
-      sentry __cerb(*this, false);
-      if (__cerb) 
-       {
-         try {
-           __pf(*this);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
-       }
-      return *this;
-    }
+    { return __pf(*this); }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(__ios_type& (*__pf)(__ios_type&))
     {
-      sentry __cerb(*this, false);
-      if (__cerb) 
-       {
-         try {
-           __pf(*this);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
-       }
+      __pf(*this);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(ios_base& (*__pf)(ios_base&))
     {
-      sentry __cerb(*this, false);
-      if (__cerb) 
-       {
-         try {
-           __pf(*this);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
-       }
+      __pf(*this);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(bool& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(short& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             long __l;
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __l);
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 118. basic_istream uses nonexistent num_get member functions.
+             if (!(__err & ios_base::failbit)
+                 && (numeric_limits<short>::min() <= __l
+                     && __l <= numeric_limits<short>::max()))
+               __n = __l;
+             else
+                __err |= ios_base::failbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(unsigned short& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(int& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             long __l;
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __l);
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 118. basic_istream uses nonexistent num_get member functions.
+             if (!(__err & ios_base::failbit)
+                 && (numeric_limits<int>::min() <= __l
+                     && __l <= numeric_limits<int>::max()))
+               __n = __l;
+             else
+                __err |= ios_base::failbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(unsigned int& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(long& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(unsigned long& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(long long& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(unsigned long long& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 #endif
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(float& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(double& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(long double& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(void*& __n)
     {
       sentry __cerb(*this, false);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const __num_get_type& __ng = __check_facet(this->_M_num_get);
+             __ng.get(*this, 0, *this, __err, __n);
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
            this->setstate(__err);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
+    basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     operator>>(__streambuf_type* __sbout)
     {
-      streamsize __xtrct = 0;
-      __streambuf_type* __sbin = this->rdbuf();
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, false);
-      if (__sbout && __cerb)
-       __xtrct = __copy_streambufs(*this, __sbin, __sbout);
-      if (!__sbout || !__xtrct)
-       this->setstate(ios_base::failbit);
+      if (__cerb && __sbout)
+       {
+         try
+           {
+             if (!__copy_streambufs(this->rdbuf(), __sbout))
+               __err |= ios_base::failbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::failbit); }
+       }
+      else if (!__sbout)
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::int_type
+    typename basic_istream<_CharT, _Traits>::int_type
     basic_istream<_CharT, _Traits>::
     get(void)
     {
       const int_type __eof = traits_type::eof();
       int_type __c = __eof;
       _M_gcount = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           __c = this->rdbuf()->sbumpc();
-           // 27.6.1.1 paragraph 3
-           if (__c != __eof)
-             _M_gcount = 1;
-           else
-             this->setstate(ios_base::eofbit | ios_base::failbit);
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         try
+           {
+             __c = this->rdbuf()->sbumpc();
+             // 27.6.1.1 paragraph 3
+             if (!traits_type::eq_int_type(__c, __eof))
+               _M_gcount = 1;
+             else
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
+      if (!_M_gcount)
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return __c;
     }
 
@@ -507,29 +472,29 @@ namespace std {
     get(char_type& __c)
     {
       _M_gcount = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           const int_type __eof = traits_type::eof();
-           int_type __bufval = this->rdbuf()->sbumpc();
-           // 27.6.1.1 paragraph 3
-           if (__bufval != __eof)
-             {
-               _M_gcount = 1;
-               __c = traits_type::to_char_type(__bufval);
-             }
-           else
-             this->setstate(ios_base::eofbit | ios_base::failbit);
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         try
+           {
+             int_type __cb = this->rdbuf()->sbumpc();
+             // 27.6.1.1 paragraph 3
+             if (!traits_type::eq_int_type(__cb, traits_type::eof()))
+               {
+                 _M_gcount = 1;
+                 __c = traits_type::to_char_type(__cb);
+               }
+             else
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
+      if (!_M_gcount)
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
@@ -539,41 +504,36 @@ namespace std {
     get(char_type* __s, streamsize __n, char_type __delim)
     {
       _M_gcount = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, true);
-      if (__cerb && __n > 1) 
+      if (__cerb)
        {
-         try {
-           const int_type __idelim = traits_type::to_int_type(__delim);
-           const int_type __eof = traits_type::eof();
-           __streambuf_type* __sb = this->rdbuf();
-           int_type __c = __sb->sbumpc();      
-           bool __testdelim = __c == __idelim;
-           bool __testeof =  __c == __eof;
-           
-           while (_M_gcount < __n - 1 && !__testeof && !__testdelim)
-             {
-               *__s++ = traits_type::to_char_type(__c);
-               ++_M_gcount;
-               __c = __sb->sbumpc();
-               __testeof = __c == __eof;
-               __testdelim = __c == __idelim;
-             }
-           if (__testdelim || _M_gcount == __n - 1)
-             __sb->sputbackc(__c);
-           if (__testeof)
-             this->setstate(ios_base::eofbit);
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         try
+           {
+             const int_type __idelim = traits_type::to_int_type(__delim);
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             int_type __c = __sb->sgetc();
+
+             while (_M_gcount + 1 < __n
+                    && !traits_type::eq_int_type(__c, __eof)
+                    && !traits_type::eq_int_type(__c, __idelim))
+               {
+                 *__s++ = traits_type::to_char_type(__c);
+                 __c = __sb->snextc();
+                 ++_M_gcount;
+               }
+             if (traits_type::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
-       this->setstate(ios_base::failbit);
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
@@ -583,40 +543,36 @@ namespace std {
     get(__streambuf_type& __sb, char_type __delim)
     {
       _M_gcount = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         int_type __c;
-         __streambuf_type* __this_sb = this->rdbuf();
-         try {
-           const int_type __idelim = traits_type::to_int_type(__delim);
-           const int_type __eof = traits_type::eof();        
-           __c = __this_sb->sbumpc();
-           bool __testdelim = __c == __idelim;
-           bool __testeof =  __c == __eof;
-           bool __testput = true;
-
-           while (!__testeof && !__testdelim 
-                  && (__testput = __sb.sputc(traits_type::to_char_type(__c)) 
-                      != __eof))
-             {
-               ++_M_gcount;
-               __c = __this_sb->sbumpc();
-               __testeof = __c == __eof;
-               __testdelim = __c == __idelim;
-             }
-           if (__testdelim || !__testput)
-             __this_sb->sputbackc(traits_type::to_char_type(__c));
-           if (__testeof)
-             this->setstate(ios_base::eofbit);
-         }
-         catch(exception& __fail){
-           // Exception may result from sputc->overflow.
-           __this_sb->sputbackc(traits_type::to_char_type(__c));
-         }
+         try
+           {
+             const int_type __idelim = traits_type::to_int_type(__delim);
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __this_sb = this->rdbuf();
+             int_type __c = __this_sb->sgetc();
+             char_type __c2 = traits_type::to_char_type(__c);
+
+             while (!traits_type::eq_int_type(__c, __eof)
+                    && !traits_type::eq_int_type(__c, __idelim)
+                    && !traits_type::eq_int_type(__sb.sputc(__c2), __eof))
+               {
+                 ++_M_gcount;
+                 __c = __this_sb->snextc();
+                 __c2 = traits_type::to_char_type(__c);
+               }
+             if (traits_type::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
       if (!_M_gcount)
-       this->setstate(ios_base::failbit);
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
@@ -626,53 +582,67 @@ namespace std {
     getline(char_type* __s, streamsize __n, char_type __delim)
     {
       _M_gcount = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-          try {
-           __streambuf_type* __sb = this->rdbuf();
-           int_type __c = __sb->sbumpc();
-           ++_M_gcount;
-            const int_type __idelim = traits_type::to_int_type(__delim);
-            const int_type __eof = traits_type::eof();
-           bool __testdelim = __c == __idelim;
-           bool __testeof =  __c == __eof;
-           
-           while (_M_gcount < __n && !__testeof && !__testdelim)
-             {
-               *__s++ = traits_type::to_char_type(__c);
-               __c = __sb->sbumpc();
-               ++_M_gcount;
-               __testeof = __c == __eof;
-               __testdelim = __c == __idelim;
-             }
-           
-           if (__testeof)
-             {
-               --_M_gcount;
-               this->setstate(ios_base::eofbit);
-             }
-           else if (!__testdelim)
-             {
-               --_M_gcount;
-               __sb->sputbackc(traits_type::to_char_type(__c));
-               this->setstate(ios_base::failbit);
-             }
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+          try
+           {
+             const int_type __idelim = traits_type::to_int_type(__delim);
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             int_type __c = __sb->sgetc();
+             --__n;
+             
+             while (_M_gcount < __n
+                    && !traits_type::eq_int_type(__c, __eof)
+                    && !traits_type::eq_int_type(__c, __idelim))
+               {
+                 streamsize __size = std::min(streamsize(__sb->egptr()
+                                                         - __sb->gptr()),
+                                              __n - _M_gcount);
+                 if (__size > 1)
+                   {
+                     const char_type* __p = traits_type::find(__sb->gptr(),
+                                                              __size,
+                                                              __delim);
+                     if (__p)
+                       __size = __p - __sb->gptr();
+                     traits_type::copy(__s, __sb->gptr(), __size);
+                     __s += __size;
+                     __sb->gbump(__size);
+                     _M_gcount += __size;
+                     __c = __sb->sgetc();
+                   }
+                 else
+                   {
+                     *__s++ = traits_type::to_char_type(__c);
+                     __c = __sb->snextc();
+                     ++_M_gcount;
+                   }
+               }
+
+             if (traits_type::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+             else if (traits_type::eq_int_type(__c, __idelim))
+               {
+                 __sb->sbumpc();
+                 ++_M_gcount;
+               }
+             else
+               __err |= ios_base::failbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
-       this->setstate(ios_base::failbit);
+       __err |= ios_base::failbit;
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
@@ -680,42 +650,36 @@ namespace std {
     {
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__cerb && __n > 0) 
+      if (__cerb && __n > 0)
        {
-         try {
-           const int_type __idelim = traits_type::to_int_type(__delim);
-           const int_type __eof = traits_type::eof();
-           __streambuf_type* __sb = this->rdbuf();
-           int_type __c = __sb->sbumpc();      
-           bool __testdelim = __c == __idelim;
-           bool __testeof =  __c == __eof;
-                       
-           __n = min(__n, numeric_limits<streamsize>::max());
-           while (_M_gcount < __n - 1 && !__testeof && !__testdelim)
-             {
-               ++_M_gcount;
-               __c = __sb->sbumpc();
-               __testeof = __c == __eof;
-               __testdelim = __c == __idelim;
-             }
-           if ((_M_gcount == __n - 1 && !__testeof) || __testdelim)
-             ++_M_gcount;
-           if (__testeof)
-             this->setstate(ios_base::eofbit);
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             int_type __c;
+
+             __n = std::min(__n, numeric_limits<streamsize>::max());
+             while (_M_gcount < __n
+                    && !traits_type::eq_int_type(__c = __sb->sbumpc(), __eof))
+               {
+                 ++_M_gcount;
+                 if (traits_type::eq_int_type(__c, __delim))
+                   break;
+               }
+             if (traits_type::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::int_type
+    typename basic_istream<_CharT, _Traits>::int_type
     basic_istream<_CharT, _Traits>::
     peek(void)
     {
@@ -724,17 +688,18 @@ namespace std {
       sentry __cerb(*this, true);
       if (__cerb)
        {
-         try {
-           __c = this->rdbuf()->sgetc();
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
-       } 
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             __c = this->rdbuf()->sgetc();
+             if (traits_type::eq_int_type(__c, traits_type::eof()))
+               __err |= ios_base::eofbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
+       }
       return __c;
     }
 
@@ -745,214 +710,183 @@ namespace std {
     {
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         if (__n > 0)
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
            {
-             try {
-               const int_type __eof = traits_type::eof();
-               __streambuf_type* __sb = this->rdbuf();
-               int_type __c = __sb->sbumpc();  
-               bool __testeof =  __c == __eof;
-               
-               while (_M_gcount < __n - 1 && !__testeof)
-                 {
-                   *__s++ = traits_type::to_char_type(__c);
-                   ++_M_gcount;
-                   __c = __sb->sbumpc();
-                   __testeof = __c == __eof;
-                 }
-               if (__testeof)
-                 this->setstate(ios_base::eofbit | ios_base::failbit);
-               else
-                 {
-                   // _M_gcount == __n - 1
-                   *__s++ = traits_type::to_char_type(__c);
-                   ++_M_gcount;
-                 }         
-             }
-             catch(exception& __fail){
-               // 27.6.1.3 paragraph 1
-               // Turn this on without causing an ios::failure to be thrown.
-               this->setstate(ios_base::badbit);
-               if ((this->exceptions() & ios_base::badbit) != 0)
-                 throw;
-             }
+             _M_gcount = this->rdbuf()->sgetn(__s, __n);
+             if (_M_gcount != __n)
+               __err |= (ios_base::eofbit | ios_base::failbit);
            }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
-    streamsize 
+    streamsize
     basic_istream<_CharT, _Traits>::
     readsome(char_type* __s, streamsize __n)
     {
-      const int_type __eof = traits_type::eof();
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         if (__n > 0)
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
            {
-             try {
-               streamsize __num = this->rdbuf()->in_avail();
-               if (__num != static_cast<streamsize>(__eof))
-                 {
-                   __num = min(__num, __n);
+             // Cannot compare int_type with streamsize generically.
+             streamsize __num = this->rdbuf()->in_avail();
+             if (__num >= 0)
+               {
+                 __num = std::min(__num, __n);
+                 if (__num)
                    _M_gcount = this->rdbuf()->sgetn(__s, __num);
-                 }
-               else
-                 this->setstate(ios_base::eofbit);                 
-             }
-
-             catch(exception& __fail){
-               // 27.6.1.3 paragraph 1
-               // Turn this on without causing an ios::failure to be thrown.
-               this->setstate(ios_base::badbit);
-               if ((this->exceptions() & ios_base::badbit) != 0)
-                 throw;
-             }
+               }
+             else
+               __err |= ios_base::eofbit;
            }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
-      else
-       this->setstate(ios_base::failbit);
       return _M_gcount;
     }
-      
+
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     putback(char_type __c)
     {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 60. What is a formatted input function?
+      _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           const int_type __eof = traits_type::eof();
-           __streambuf_type* __sb = this->rdbuf();
-           if (!__sb || __sb->sputbackc(__c) == __eof) 
-             this->setstate(ios_base::badbit);             
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             if (!__sb
+                 || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
+               __err |= ios_base::badbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     unget(void)
     {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 60. What is a formatted input function?
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           const int_type __eof = traits_type::eof();
-           __streambuf_type* __sb = this->rdbuf();
-           if (!__sb || __eof == __sb->sungetc())
-             this->setstate(ios_base::badbit);             
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             if (!__sb
+                 || traits_type::eq_int_type(__sb->sungetc(), __eof))
+               __err |= ios_base::badbit;
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
-  
+
   template<typename _CharT, typename _Traits>
     int
     basic_istream<_CharT, _Traits>::
     sync(void)
     {
-      int __ret = traits_type::eof();
-      _M_gcount = 0;
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR60.  Do not change _M_gcount.
+      int __ret = -1;
       sentry __cerb(*this, true);
-      if (__cerb) 
+      if (__cerb)
        {
-         try {
-           __streambuf_type* __sb = this->rdbuf();
-           if (!__sb || __ret == __sb->pubsync())
-             this->setstate(ios_base::badbit);             
-           else 
-             __ret = 0;
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             __streambuf_type* __sb = this->rdbuf();
+             if (__sb)
+               {
+                 if (__sb->pubsync() == -1)
+                   __err |= ios_base::badbit;
+                 else
+                   __ret = 0;
+               }
+           }
+         catch(...)
+           { this->_M_setstate(ios_base::badbit); }
+         if (__err)
+           this->setstate(__err);
        }
       return __ret;
     }
-  
+
   template<typename _CharT, typename _Traits>
     typename basic_istream<_CharT, _Traits>::pos_type
     basic_istream<_CharT, _Traits>::
     tellg(void)
     {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR60.  Do not change _M_gcount.
       pos_type __ret = pos_type(-1);
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
+      try
        {
-         try {
+         if (!this->fail())
            __ret = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
        }
+      catch(...)
+       { this->_M_setstate(ios_base::badbit); }
       return __ret;
     }
 
-
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>&
     basic_istream<_CharT, _Traits>::
     seekg(pos_type __pos)
     {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR60.  Do not change _M_gcount.
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      try
        {
-         try {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-// 136.  seekp, seekg setting wrong streams?
-           this->rdbuf()->pubseekpos(__pos, ios_base::in);
-#endif
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         if (!this->fail())
+           {
+             // 136.  seekp, seekg setting wrong streams?
+             pos_type __p = this->rdbuf()->pubseekpos(__pos, ios_base::in);
+
+             // 129. Need error indication from seekp() and seekg()
+             if (__p == pos_type(off_type(-1)))
+               __err |= ios_base::failbit;
+           }
        }
+      catch(...)
+       { this->_M_setstate(ios_base::badbit); }
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
@@ -961,24 +895,26 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     seekg(off_type __off, ios_base::seekdir __dir)
     {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR60.  Do not change _M_gcount.
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      try
        {
-         try {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-// 136.  seekp, seekg setting wrong streams?
-           this->rdbuf()->pubseekoff(__off, __dir, ios_base::in);
-#endif
-         }
-         catch(exception& __fail){
-           // 27.6.1.3 paragraph 1
-           // Turn this on without causing an ios::failure to be thrown.
-           this->setstate(ios_base::badbit);
-           if ((this->exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         if (!this->fail())
+           {
+             // 136.  seekp, seekg setting wrong streams?
+             pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
+                                                      ios_base::in);
+
+             // 129. Need error indication from seekp() and seekg()
+             if (__p == pos_type(off_type(-1)))
+               __err |= ios_base::failbit;
+           }
        }
+      catch(...)
+       { this->_M_setstate(ios_base::badbit); }
+      if (__err)
+       this->setstate(__err);
       return *this;
     }
 
@@ -987,23 +923,24 @@ namespace std {
     basic_istream<_CharT, _Traits>&
     operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c)
     {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
-      __istream_type::sentry __cerb(__in, false);
+      typedef basic_istream<_CharT, _Traits>           __istream_type;
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
        {
-         try {
-           __in.get(__c);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           __in.setstate(ios_base::badbit);
-           if ((__in.exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+         try
+           {
+             typename __istream_type::int_type __cb = __in.rdbuf()->sbumpc();
+             if (!_Traits::eq_int_type(__cb, _Traits::eof()))
+               __c = _Traits::to_char_type(__cb);
+             else
+               __err |= (ios_base::eofbit | ios_base::failbit);
+           }
+         catch(...)
+           { __in._M_setstate(ios_base::badbit); }
+         if (__err)
+           __in.setstate(__err);
        }
-      else
-       __in.setstate(ios_base::failbit);
       return __in;
     }
 
@@ -1011,93 +948,78 @@ namespace std {
     basic_istream<_CharT, _Traits>&
     operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)
     {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
+      typedef basic_istream<_CharT, _Traits>           __istream_type;
       typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename _Traits::int_type               int_type;
-      typedef _CharT                                   char_type;
-      typedef ctype<_CharT>                            __ctype_type;
-      int_type __extracted = 0;
+      typedef typename _Traits::int_type               int_type;
+      typedef _CharT                                   char_type;
+      typedef ctype<_CharT>                            __ctype_type;
 
-      __istream_type::sentry __cerb(__in, false);
+      streamsize __extracted = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
        {
-         try {
-           // Figure out how many characters to extract.
-           int_type __num = static_cast<int_type>(__in.width());
-           if (__num <= 0)
-             __num = basic_string<_CharT, _Traits>::npos;
-
-           __streambuf_type* __sb = __in.rdbuf();
-           const __ctype_type* __ctype = __in._M_get_fctype_ios();
-           int_type __c = __sb->sbumpc();
-           const int_type __eof = _Traits::eof();
-           bool __testsp = __ctype->is(ctype_base::space, __c);
-           bool __testeof =  __c == __eof;
-           
-           while (__extracted < __num - 1 && !__testeof && !__testsp)
-             {
-               *__s++ = __c;
-               ++__extracted;
-               __c = __sb->sbumpc();
-               __testeof = __c == __eof;
-               __testsp = __ctype->is(ctype_base::space, __c);
-             }
-           
-           if (!__testeof)
-             __sb->sputbackc(__c);
-           else
-             __in.setstate(ios_base::eofbit);
-
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-//68.  Extractors for char* should store null at end
-           *__s = char_type();
-#endif
-           __in.width(0);
-         }
-         catch(exception& __fail){
-           // 27.6.1.2.1 Common requirements.
-           // Turn this on without causing an ios::failure to be thrown.
-           __in.setstate(ios_base::badbit);
-           if ((__in.exceptions() & ios_base::badbit) != 0)
-             throw;
-         }
+         try
+           {
+             // Figure out how many characters to extract.
+             streamsize __num = __in.width();
+             if (__num <= 0)
+               __num = numeric_limits<streamsize>::max();
+
+             const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
+
+             const int_type __eof = _Traits::eof();
+             __streambuf_type* __sb = __in.rdbuf();
+             int_type __c = __sb->sgetc();
+
+             while (__extracted < __num - 1
+                    && !_Traits::eq_int_type(__c, __eof)
+                    && !__ct.is(ctype_base::space,
+                                _Traits::to_char_type(__c)))
+               {
+                 *__s++ = _Traits::to_char_type(__c);
+                 ++__extracted;
+                 __c = __sb->snextc();
+               }
+             if (_Traits::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 68.  Extractors for char* should store null at end
+             *__s = char_type();
+             __in.width(0);
+           }
+         catch(...)
+           { __in._M_setstate(ios_base::badbit); }
        }
       if (!__extracted)
-       __in.setstate(ios_base::failbit);
+       __err |= ios_base::failbit;
+      if (__err)
+       __in.setstate(__err);
       return __in;
     }
 
   // 27.6.1.4 Standard basic_istream manipulators
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT,_Traits>& 
+    basic_istream<_CharT,_Traits>&
     ws(basic_istream<_CharT,_Traits>& __in)
     {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
+      typedef basic_istream<_CharT, _Traits>           __istream_type;
       typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
-      typedef typename __istream_type::int_type        __int_type;
-      typedef typename __istream_type::char_type       __char_type;
+      typedef typename __istream_type::__ctype_type    __ctype_type;
+      typedef typename __istream_type::int_type                __int_type;
 
+      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
+      const __int_type __eof = _Traits::eof();
       __streambuf_type* __sb = __in.rdbuf();
-      const __ctype_type* __ctype = __in._M_get_fctype_ios();
-      const __int_type __eof = _Traits::eof();       
-      __int_type __c;
-      bool __testeof;
-      bool __testsp;
-
-      do 
-       {
-         __c = __sb->sbumpc();
-         __testeof = __c == __eof;
-         __testsp = __ctype->is(ctype_base::space, __c);
-       }
-      while (!__testeof && __testsp);
+      __int_type __c = __sb->sgetc();
 
-      if (!__testeof && !__testsp)
-       __sb->sputbackc(__c);
-      else
-       __in.setstate(ios_base::eofbit);
+      while (!_Traits::eq_int_type(__c, __eof)
+            && __ct.is(ctype_base::space, _Traits::to_char_type(__c)))
+       __c = __sb->snextc();
 
+       if (_Traits::eq_int_type(__c, __eof))
+        __in.setstate(ios_base::eofbit);
       return __in;
     }
 
@@ -1107,48 +1029,55 @@ namespace std {
     operator>>(basic_istream<_CharT, _Traits>& __in,
               basic_string<_CharT, _Traits, _Alloc>& __str)
     {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::int_type        __int_type;
+      typedef basic_istream<_CharT, _Traits>           __istream_type;
+      typedef typename __istream_type::int_type                __int_type;
       typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
+      typedef typename __istream_type::__ctype_type    __ctype_type;
+      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
       typedef typename __string_type::size_type                __size_type;
-      __int_type __extracted = 0;
 
-      __istream_type::sentry __cerb(__in, false);
-      if (__cerb) 
+      __size_type __extracted = 0;
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      typename __istream_type::sentry __cerb(__in, false);
+      if (__cerb)
        {
-         __str.erase();
-         streamsize __w = __in.width();
-         __size_type __n;
-         __n = __w > 0 ? static_cast<__size_type>(__w) : __str.max_size();
-
-         __streambuf_type* __sb = __in.rdbuf();
-         const __ctype_type* __ctype = __in._M_get_fctype_ios();
-         __int_type __c = __sb->sbumpc();
-         const __int_type __eof = _Traits::eof();
-         bool __testsp = __ctype->is(ctype_base::space, __c);
-         bool __testeof =  __c == __eof;
-
-         while (__extracted < __n && !__testeof && !__testsp)
+         try
+           {
+             __str.erase();
+             streamsize __w = __in.width();
+             __size_type __n;
+             __n = __w > 0 ? static_cast<__size_type>(__w) : __str.max_size();
+
+             const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
+             const __int_type __eof = _Traits::eof();
+             __streambuf_type* __sb = __in.rdbuf();
+             __int_type __c = __sb->sgetc();
+
+             while (__extracted < __n
+                    && !_Traits::eq_int_type(__c, __eof)
+                    && !__ct.is(ctype_base::space, _Traits::to_char_type(__c)))
+               {
+                 __str += _Traits::to_char_type(__c);
+                 ++__extracted;
+                 __c = __sb->snextc();
+               }
+             if (_Traits::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+             __in.width(0);
+           }
+         catch(...)
            {
-             __str += _Traits::to_char_type(__c);
-             ++__extracted;
-             __c = __sb->sbumpc();
-             __testeof = __c == __eof;
-             __testsp = __ctype->is(ctype_base::space, __c);
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 91. Description of operator>> and getline() for string<>
+             // might cause endless loop
+             __in._M_setstate(ios_base::badbit);
            }
-         if (!__testeof)
-           __sb->sputbackc(__c);
-         else
-           __in.setstate(ios_base::eofbit);
-         __in.width(0);
        }
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-// 2000-02-01 Number to be determined
+      // 211.  operator>>(istream&, string&) doesn't set failbit
       if (!__extracted)
-       __in.setstate (ios_base::failbit);
-#endif
+       __err |= ios_base::failbit;
+      if (__err)
+       __in.setstate(__err);
       return __in;
     }
 
@@ -1157,66 +1086,97 @@ namespace std {
     getline(basic_istream<_CharT, _Traits>& __in,
            basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
     {
-      typedef basic_istream<_CharT, _Traits>           __istream_type;
-      typedef typename __istream_type::int_type        __int_type;
+      typedef basic_istream<_CharT, _Traits>           __istream_type;
+      typedef typename __istream_type::int_type                __int_type;
       typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type    __ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
+      typedef typename __istream_type::__ctype_type    __ctype_type;
+      typedef basic_string<_CharT, _Traits, _Alloc>    __string_type;
       typedef typename __string_type::size_type                __size_type;
 
       __size_type __extracted = 0;
+      const __size_type __n = __str.max_size();
       bool __testdelim = false;
-      __istream_type::sentry __cerb(__in, true);
-      if (__cerb) 
+      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+      typename __istream_type::sentry __cerb(__in, true);
+      if (__cerb)
        {
-         __str.erase();
-         __size_type __n = __str.max_size();
+         try
+           {
+             // Avoid reallocation for common case.          
+             __str.erase();
+             _CharT __buf[128];
+             __size_type __len = 0;
+             const __int_type __idelim = _Traits::to_int_type(__delim);
+             const __int_type __eof = _Traits::eof();
+             __streambuf_type* __sb = __in.rdbuf();
+             __int_type __c = __sb->sgetc();
 
-         __int_type __idelim = _Traits::to_int_type(__delim);
-         __streambuf_type* __sb = __in.rdbuf();
-         __int_type __c = __sb->sbumpc();
-         const __int_type __eof = _Traits::eof();
-         __testdelim = __c ==  __idelim;
-         bool __testeof =  __c == __eof;
+             while (__extracted < __n
+                    && !_Traits::eq_int_type(__c, __eof)
+                    && !_Traits::eq_int_type(__c, __idelim))
+               {
+                 if (__len == sizeof(__buf) / sizeof(_CharT))
+                   {
+                     __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
+                     __len = 0;
+                   }
+                 __buf[__len++] = _Traits::to_char_type(__c);
+                 ++__extracted;
+                 __c = __sb->snextc();
+               }
+             __str.append(__buf, __len);
 
-         while (__extracted <= __n && !__testeof && !__testdelim)
+             if (_Traits::eq_int_type(__c, __eof))
+               __err |= ios_base::eofbit;
+             else if (_Traits::eq_int_type(__c, __idelim))
+               {
+                 __sb->sbumpc();
+                 ++__extracted;
+               }
+             else
+               __err |= ios_base::failbit;
+           }
+         catch(...)
            {
-             __str += _Traits::to_char_type(__c);
-             ++__extracted;
-             __c = __sb->sbumpc();
-             __testeof = __c == __eof;
-             __testdelim = __c == __idelim;
+             // _GLIBCXX_RESOLVE_LIB_DEFECTS
+             // 91. Description of operator>> and getline() for string<>
+             // might cause endless loop
+             __in._M_setstate(ios_base::badbit);
            }
-         if (__testeof)
-           __in.setstate(ios_base::eofbit);
        }
-      if (!__extracted && !__testdelim)
-       __in.setstate(ios_base::failbit);
+      if (!__extracted)
+       __err |= ios_base::failbit;
+      if (__err)
+       __in.setstate(__err);
       return __in;
     }
 
   template<class _CharT, class _Traits, class _Alloc>
     inline basic_istream<_CharT,_Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in, 
+    getline(basic_istream<_CharT, _Traits>& __in,
            basic_string<_CharT,_Traits,_Alloc>& __str)
     { return getline(__in, __str, __in.widen('\n')); }
 
+  // Inhibit implicit instantiations for required instantiations,
+  // which are defined via explicit instantiations elsewhere.
+  // NB:  This syntax is a GNU extension.
+#if _GLIBCXX_EXTERN_TEMPLATE
+  extern template class basic_istream<char>;
+  extern template istream& ws(istream&);
+  extern template istream& operator>>(istream&, char&);
+  extern template istream& operator>>(istream&, char*);
+  extern template istream& operator>>(istream&, unsigned char&);
+  extern template istream& operator>>(istream&, signed char&);
+  extern template istream& operator>>(istream&, unsigned char*);
+  extern template istream& operator>>(istream&, signed char*);
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  extern template class basic_istream<wchar_t>;
+  extern template wistream& ws(wistream&);
+  extern template wistream& operator>>(wistream&, wchar_t&);
+  extern template wistream& operator>>(wistream&, wchar_t*);
+#endif
+#endif
 } // namespace std
 
-// Local Variables:
-// mode:C++
-// End:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif