OSDN Git Service

2003-07-04 Benjamin Kosnik <bkoz@redhat.com>
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / istream.tcc
index 571af89..7f26f64 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
+// 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
 // ISO C++ 14882: 27.6.2  Output 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)
@@ -44,24 +53,18 @@ namespace std {
          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
+             __int_type __c = __sb->sgetc();
+
+             __check_facet(__in._M_ctype);
+             while (!traits_type::eq_int_type(__c, __eof)
+                    && __in._M_ctype->is(ctype_base::space, 
+                                         traits_type::to_char_type(__c)))
+                 __c = __sb->snextc();
+
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //195.  Should basic_istream::sentry's constructor ever set eofbit? 
-             else
+             if (traits_type::eq_int_type(__c, __eof))
                __in.setstate(ios_base::eofbit);
 #endif
            }
@@ -81,20 +84,7 @@ namespace std {
     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_exception_again;
-         }
-       }
+      __pf(*this);
       return *this;
     }
 
@@ -103,20 +93,7 @@ namespace std {
     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_exception_again;
-         }
-       }
+      __pf(*this);
       return *this;
     }
   
@@ -125,20 +102,7 @@ namespace std {
     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_exception_again;
-         }
-       }
+      __pf(*this);
       return *this;
     }
   
@@ -150,18 +114,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -174,18 +140,30 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             long __l;
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
+#ifdef _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;
+#endif
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -198,18 +176,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -222,18 +202,30 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             long __l;
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
+#ifdef _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;
+#endif
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -246,18 +238,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -270,18 +264,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -294,23 +290,25 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       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>::
@@ -319,18 +317,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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)
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
              __throw_exception_again;
-         }
+           }
        }
       return *this;
     }
@@ -343,18 +343,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -368,18 +370,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -392,18 +396,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -416,18 +422,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -440,18 +448,20 @@ namespace std {
       sentry __cerb(*this, false);
       if (__cerb) 
        {
-         try {
-           iostate __err = iostate(ios_base::goodbit);
-           _M_fnumget->get(*this, 0, *this, __err, __n);
-           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_exception_again;
-         }
+         try 
+           {
+             ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+             __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+             this->setstate(__err);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -461,18 +471,34 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     operator>>(__streambuf_type* __sbout)
     {
-      streamsize __xtrct = 0;
-      __streambuf_type* __sbin = this->rdbuf();
-      sentry __cerb(*this, false);
-      if (__sbout && __cerb)
-       __xtrct = __copy_streambufs(*this, __sbin, __sbout);
-      if (!__sbout || !__xtrct)
-       this->setstate(ios_base::failbit);
-      return *this;
+       sentry __cerb(*this, false);
+       if (__cerb)
+        {
+          try
+            {
+              streamsize __xtrct = 0;
+              if (__sbout)
+                {
+                  __streambuf_type* __sbin = this->rdbuf();
+                  __xtrct = __copy_streambufs(*this, __sbin, __sbout);
+                }
+              if (!__sbout || !__xtrct)
+                this->setstate(ios_base::failbit);
+            }
+          catch(...)
+            {
+              // 27.6.2.5.1 Common requirements.
+              // Turn this on without causing an ios::failure to be thrown.
+              this->_M_setstate(ios_base::badbit);
+              if ((this->exceptions() & ios_base::badbit) != 0)
+                __throw_exception_again;
+            }
+        }
+       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)
     {
@@ -482,21 +508,23 @@ namespace std {
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         try 
+           {
+             __c = this->rdbuf()->sbumpc();
+             // 27.6.1.1 paragraph 3
+             if (!traits_type::eq_int_type(__c, __eof))
+               _M_gcount = 1;
+             else
+               this->setstate(ios_base::eofbit | ios_base::failbit);
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return __c;
     }
@@ -510,25 +538,27 @@ namespace std {
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         try 
+           {
+             const int_type __eof = traits_type::eof();
+             int_type __bufval = this->rdbuf()->sbumpc();
+             // 27.6.1.1 paragraph 3
+             if (!traits_type::eq_int_type(__bufval, __eof))
+               {
+                 _M_gcount = 1;
+                 __c = traits_type::to_char_type(__bufval);
+               }
+             else
+               this->setstate(ios_base::eofbit | ios_base::failbit);
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return *this;
     }
@@ -540,38 +570,36 @@ namespace std {
     {
       _M_gcount = 0;
       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_exception_again;
-         }
+         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))
+               this->setstate(ios_base::eofbit);
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
        this->setstate(ios_base::failbit);
       return *this;
@@ -586,34 +614,33 @@ namespace std {
       sentry __cerb(*this, true);
       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))
+               this->setstate(ios_base::eofbit);
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       if (!_M_gcount)
        this->setstate(ios_base::failbit);
@@ -629,45 +656,44 @@ namespace std {
       sentry __cerb(*this, true);
       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;
-             }
+          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();
            
-           if (__testeof)
-             {
-               --_M_gcount;
+             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))
                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_exception_again;
-         }
+             else
+               {
+                 if (traits_type::eq_int_type(__c, __idelim))
+                   {
+                     __sb->sbumpc();
+                     ++_M_gcount;
+                   }
+                 else
+                   this->setstate(ios_base::failbit);
+               }
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
        this->setstate(ios_base::failbit);
       return *this;
@@ -682,40 +708,37 @@ namespace std {
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         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))
+               this->setstate(ios_base::eofbit);
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       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,16 +747,16 @@ 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_exception_again;
-         }
+         try 
+           { __c = this->rdbuf()->sgetc(); }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        } 
       return __c;
     }
@@ -747,37 +770,19 @@ namespace std {
       sentry __cerb(*this, true);
       if (__cerb) 
        {
-         if (__n > 0)
+         try 
+           {
+             _M_gcount = this->rdbuf()->sgetn(__s, __n);
+             if (_M_gcount != __n)
+               this->setstate(ios_base::eofbit | ios_base::failbit);
+           }       
+         catch(...)
            {
-             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_exception_again;
-             }
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
            }
        }
       else
@@ -790,31 +795,30 @@ namespace std {
     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 (__n > 0)
+         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_exception_again;
-             }
+               }
+             else
+               this->setstate(ios_base::eofbit);                   
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
            }
        }
       else
@@ -827,22 +831,29 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     putback(char_type __c)
     {
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
+// 60. What is a formatted input function?
+      _M_gcount = 0;
+#endif
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         try 
+           {
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             if (!__sb 
+                 || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
+               this->setstate(ios_base::badbit);                   
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       else
        this->setstate(ios_base::failbit);
@@ -854,23 +865,29 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     unget(void)
     {
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
+// 60. What is a formatted input function?
       _M_gcount = 0;
+#endif
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         try 
+           {
+             const int_type __eof = traits_type::eof();
+             __streambuf_type* __sb = this->rdbuf();
+             if (!__sb 
+                 || traits_type::eq_int_type(__sb->sungetc(), __eof))
+               this->setstate(ios_base::badbit);                   
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       else
        this->setstate(ios_base::failbit);
@@ -882,25 +899,30 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     sync(void)
     {
-      int __ret = traits_type::eof();
-      _M_gcount = 0;
+      // DR60.  Do not change _M_gcount.
+      int __ret = -1;
       sentry __cerb(*this, true);
       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_exception_again;
-         }
+         try 
+           {
+             __streambuf_type* __sb = this->rdbuf();
+             if (__sb)
+               {
+                 if (__sb->pubsync() == -1)
+                   this->setstate(ios_base::badbit);               
+                 else 
+                   __ret = 0;
+               }
+           }
+         catch(...)
+           {
+             // 27.6.1.3 paragraph 1
+             // Turn this on without causing an ios::failure to be thrown.
+             this->_M_setstate(ios_base::badbit);
+             if ((this->exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       return __ret;
     }
@@ -910,22 +932,10 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     tellg(void)
     {
+      // DR60.  Do not change _M_gcount.
       pos_type __ret = pos_type(-1);
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
-       {
-         try {
-           __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_exception_again;
-         }
-       }
+      if (!this->fail())
+       __ret = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
       return __ret;
     }
 
@@ -935,23 +945,17 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     seekg(pos_type __pos)
     {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
+      // DR60.  Do not change _M_gcount.
+      if (!this->fail())
        {
-         try {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
-           this->rdbuf()->pubseekpos(__pos, ios_base::in);
+         pos_type __err = this->rdbuf()->pubseekpos(__pos, ios_base::in);
+
+// 129. Need error indication from seekp() and seekg()
+         if (__err == pos_type(off_type(-1)))
+           this->setstate(ios_base::failbit);
 #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_exception_again;
-         }
        }
       return *this;
     }
@@ -961,23 +965,18 @@ namespace std {
     basic_istream<_CharT, _Traits>::
     seekg(off_type __off, ios_base::seekdir __dir)
     {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb) 
+      // DR60.  Do not change _M_gcount.
+      if (!this->fail())
        {
-         try {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
-           this->rdbuf()->pubseekoff(__off, __dir, ios_base::in);
+         pos_type __err = this->rdbuf()->pubseekoff(__off, __dir, 
+                                                    ios_base::in);
+
+// 129. Need error indication from seekp() and seekg()
+         if (__err == pos_type(off_type(-1)))
+           this->setstate(ios_base::failbit);
 #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_exception_again;
-         }
        }
       return *this;
     }
@@ -988,19 +987,19 @@ namespace std {
     operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c)
     {
       typedef basic_istream<_CharT, _Traits>           __istream_type;
-      __istream_type::sentry __cerb(__in, false);
+      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_exception_again;
-         }
+         try 
+           { __in.get(__c); }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             __in._M_setstate(ios_base::badbit);
+             if ((__in.exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       else
        __in.setstate(ios_base::failbit);
@@ -1016,51 +1015,48 @@ namespace std {
       typedef typename _Traits::int_type               int_type;
       typedef _CharT                                   char_type;
       typedef ctype<_CharT>                            __ctype_type;
-      int_type __extracted = 0;
+      streamsize __extracted = 0;
 
-      __istream_type::sentry __cerb(__in, false);
+      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);
+         try 
+           {
+             // Figure out how many characters to extract.
+             streamsize __num = __in.width();
+             if (__num <= 0)
+               __num = numeric_limits<streamsize>::max();
+             
+             const __ctype_type& __ctype = 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)
+                    && !__ctype.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))
+               __in.setstate(ios_base::eofbit);
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //68.  Extractors for char* should store null at end
-           *__s = char_type();
+             *__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_exception_again;
-         }
+             __in.width(0);
+           }
+         catch(...)
+           {
+             // 27.6.1.2.1 Common requirements.
+             // Turn this on without causing an ios::failure to be thrown.
+             __in._M_setstate(ios_base::badbit);
+             if ((__in.exceptions() & ios_base::badbit) != 0)
+               __throw_exception_again;
+           }
        }
       if (!__extracted)
        __in.setstate(ios_base::failbit);
@@ -1076,26 +1072,17 @@ namespace std {
       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;
 
-      __streambuf_type* __sb = __in.rdbuf();
-      const __ctype_type* __ctype = __in._M_get_fctype_ios();
+      const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc());
       const __int_type __eof = _Traits::eof();       
-      __int_type __c;
-      bool __testeof;
-      bool __testsp;
+      __streambuf_type* __sb = __in.rdbuf();
+      __int_type __c = __sb->sgetc();
 
-      do 
-       {
-         __c = __sb->sbumpc();
-         __testeof = __c == __eof;
-         __testsp = __ctype->is(ctype_base::space, __c);
-       }
-      while (!__testeof && __testsp);
+      while (!_Traits::eq_int_type(__c, __eof) 
+            && __ctype.is(ctype_base::space, _Traits::to_char_type(__c)))
+       __c = __sb->snextc();
 
-      if (!__testeof && !__testsp)
-       __sb->sputbackc(__c);
-      else
+       if (_Traits::eq_int_type(__c, __eof))
        __in.setstate(ios_base::eofbit);
 
       return __in;
@@ -1113,9 +1100,9 @@ namespace std {
       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;
+      __size_type __extracted = 0;
 
-      __istream_type::sentry __cerb(__in, false);
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb) 
        {
          __str.erase();
@@ -1123,29 +1110,25 @@ namespace std {
          __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 __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc());
          const __int_type __eof = _Traits::eof();
-         bool __testsp = __ctype->is(ctype_base::space, __c);
-         bool __testeof =  __c == __eof;
-
-         while (__extracted < __n && !__testeof && !__testsp)
+         __streambuf_type* __sb = __in.rdbuf();
+         __int_type __c = __sb->sgetc();
+         
+         while (__extracted < __n 
+                && !_Traits::eq_int_type(__c, __eof)
+                && !__ctype.is(ctype_base::space, _Traits::to_char_type(__c)))
            {
              __str += _Traits::to_char_type(__c);
              ++__extracted;
-             __c = __sb->sbumpc();
-             __testeof = __c == __eof;
-             __testsp = __ctype->is(ctype_base::space, __c);
+             __c = __sb->snextc();
            }
-         if (!__testeof)
-           __sb->sputbackc(__c);
-         else
+         if (_Traits::eq_int_type(__c, __eof))
            __in.setstate(ios_base::eofbit);
          __in.width(0);
        }
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-// 2000-02-01 Number to be determined
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
+//211.  operator>>(istream&, string&) doesn't set failbit
       if (!__extracted)
        __in.setstate (ios_base::failbit);
 #endif
@@ -1166,7 +1149,7 @@ namespace std {
 
       __size_type __extracted = 0;
       bool __testdelim = false;
-      __istream_type::sentry __cerb(__in, true);
+      typename __istream_type::sentry __cerb(__in, true);
       if (__cerb) 
        {
          __str.erase();
@@ -1176,18 +1159,18 @@ namespace std {
          __streambuf_type* __sb = __in.rdbuf();
          __int_type __c = __sb->sbumpc();
          const __int_type __eof = _Traits::eof();
-         __testdelim = __c ==  __idelim;
-         bool __testeof =  __c == __eof;
+         __testdelim = _Traits::eq_int_type(__c, __idelim);
 
-         while (__extracted <= __n && !__testeof && !__testdelim)
+         while (__extracted <= __n 
+                && !_Traits::eq_int_type(__c, __eof)
+                && !__testdelim)
            {
              __str += _Traits::to_char_type(__c);
              ++__extracted;
              __c = __sb->sbumpc();
-             __testeof = __c == __eof;
-             __testdelim = __c == __idelim;
+             __testdelim = _Traits::eq_int_type(__c, __idelim);
            }
-         if (__testeof)
+         if (_Traits::eq_int_type(__c, __eof))
            __in.setstate(ios_base::eofbit);
        }
       if (!__extracted && !__testdelim)
@@ -1201,22 +1184,26 @@ namespace std {
            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