This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Couple of iostreams clean ups
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 30 Jun 2003 13:21:08 +0200
- Subject: [v3] Couple of iostreams clean ups
Hi,
tested x86-linux, committed.
Paolo.
//////////
2003-06-30 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_streambuf.h (_M_mode): Move from here to
filebuf and stringbuf.
(~basic_streambuf()): Don't set _M_mode.
(basic_streambuf()): Don't set _M_mode.
* include/std/std_fstream.h (_M_mode): Move here, from streambuf.
(~basic_filebuf()): Clean up.
* include/bits/fstream.tcc (basic_filebuf()): Set _M_mode.
* include/std/std_sstream.h (_M_mode): Move here, from streambuf.
* testsuite/27_io/basic_streambuf/cons/char/1.cc: Don't set _M_mode.
* testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise.
* testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise.
* testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise.
* testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise.
2003-06-30 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_fstream.h (_M_underflow): Remove.
(uflow): Remove, inherited from streambuf.
(underflow): Only declare.
* include/bits/fstream.tcc (_M_underflow): Rename to
underflow, to which is equivalent for __bump == false,
simplify.
* include/std/std_sstream.h (_M_underflow): Remove.
(uflow): Remove, inherited from streambuf.
(underflow): Only declare.
* include/bits/sstream.tcc (_M_underflow): Rename to
underflow, to which is equivalent for __bump == false,
simplify.
diff -urN libstdc++-v3-curr/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
--- libstdc++-v3-curr/include/bits/fstream.tcc 2003-06-28 22:18:41.000000000 +0200
+++ libstdc++-v3/include/bits/fstream.tcc 2003-06-29 17:28:55.000000000 +0200
@@ -69,11 +69,11 @@
template<typename _CharT, typename _Traits>
basic_filebuf<_CharT, _Traits>::
basic_filebuf() : __streambuf_type(), _M_file(&_M_lock),
- _M_state_cur(__state_type()), _M_state_beg(__state_type()),
- _M_buf(NULL), _M_buf_size(BUFSIZ), _M_buf_allocated(false),
- _M_reading(false), _M_writing(false), _M_last_overflowed(false),
- _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false),
- _M_codecvt(0)
+ _M_mode(ios_base::openmode(0)), _M_state_cur(__state_type()),
+ _M_state_beg(__state_type()), _M_buf(NULL), _M_buf_size(BUFSIZ),
+ _M_buf_allocated(false), _M_reading(false), _M_writing(false),
+ _M_last_overflowed(false), _M_pback_cur_save(0), _M_pback_end_save(0),
+ _M_pback_init(false), _M_codecvt(0)
{
if (has_facet<__codecvt_type>(this->_M_buf_locale))
_M_codecvt = &use_facet<__codecvt_type>(this->_M_buf_locale);
diff -urN libstdc++-v3-curr/include/std/std_fstream.h libstdc++-v3/include/std/std_fstream.h
--- libstdc++-v3-curr/include/std/std_fstream.h 2003-06-28 22:22:47.000000000 +0200
+++ libstdc++-v3/include/std/std_fstream.h 2003-06-29 18:59:59.000000000 +0200
@@ -105,6 +105,13 @@
*/
__file_type _M_file;
+ /**
+ * @if maint
+ * Place to stash in || out || in | out settings for current filebuf.
+ * @endif
+ */
+ ios_base::openmode _M_mode;
+
// Current and beginning state type for codecvt.
/**
* @if maint
@@ -213,8 +220,6 @@
~basic_filebuf()
{
this->close();
- _M_buf_size = 0;
- _M_last_overflowed = false;
}
// Members:
diff -urN libstdc++-v3-curr/include/std/std_sstream.h libstdc++-v3/include/std/std_sstream.h
--- libstdc++-v3-curr/include/std/std_sstream.h 2003-06-28 22:22:35.000000000 +0200
+++ libstdc++-v3/include/std/std_sstream.h 2003-06-29 18:20:15.000000000 +0200
@@ -85,6 +85,13 @@
//@}
protected:
+ /**
+ * @if maint
+ * Place to stash in || out || in | out settings for current stringbuf.
+ * @endif
+ */
+ ios_base::openmode _M_mode;
+
// Data Members:
/**
* @if maint
diff -urN libstdc++-v3-curr/include/std/std_streambuf.h libstdc++-v3/include/std/std_streambuf.h
--- libstdc++-v3-curr/include/std/std_streambuf.h 2003-06-28 23:21:29.000000000 +0200
+++ libstdc++-v3/include/std/std_streambuf.h 2003-06-29 17:35:28.000000000 +0200
@@ -178,13 +178,6 @@
/**
* @if maint
- * Place to stash in || out || in | out settings for current streambuf.
- * @endif
- */
- ios_base::openmode _M_mode;
-
- /**
- * @if maint
* Current locale setting.
* @endif
*/
@@ -201,9 +194,7 @@
/// Destructor deallocates no buffer space.
virtual
~basic_streambuf()
- {
- _M_mode = ios_base::openmode(0);
- }
+ { }
// [27.5.2.2.1] locales
/**
@@ -451,7 +442,7 @@
basic_streambuf()
: _M_in_beg(0), _M_in_cur(0), _M_in_end(0),
_M_out_beg(0), _M_out_cur(0), _M_out_end(0),
- _M_mode(ios_base::openmode(0)),_M_buf_locale(locale())
+ _M_buf_locale(locale())
{ }
// [27.5.2.3.1] get area access
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_streambuf/cons/char/1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_streambuf/cons/char/1.cc 2003-04-10 09:15:35.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc 2003-06-29 17:54:02.000000000 +0200
@@ -41,7 +41,7 @@
typedef std::streambuf::char_type char_type;
testbuf(): std::streambuf()
- { _M_mode = (std::ios_base::in | std::ios_base::out); }
+ { }
bool
check_pointers()
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_streambuf/overflow/char/1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_streambuf/overflow/char/1.cc 2003-04-10 09:15:35.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc 2003-06-29 17:53:41.000000000 +0200
@@ -41,7 +41,7 @@
typedef std::streambuf::char_type char_type;
testbuf(): std::streambuf()
- { _M_mode = (std::ios_base::in | std::ios_base::out); }
+ { }
bool
check_pointers()
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sgetc/char/1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sgetc/char/1.cc 2003-04-10 09:15:35.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc 2003-06-29 17:54:27.000000000 +0200
@@ -41,7 +41,7 @@
typedef std::streambuf::char_type char_type;
testbuf(): std::streambuf()
- { _M_mode = (std::ios_base::in | std::ios_base::out); }
+ { }
bool
check_pointers()
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sgetn/char/1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sgetn/char/1.cc 2003-04-10 09:15:35.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc 2003-06-29 17:54:52.000000000 +0200
@@ -41,7 +41,7 @@
typedef std::streambuf::char_type char_type;
testbuf(): std::streambuf()
- { _M_mode = (std::ios_base::in | std::ios_base::out); }
+ { }
bool
check_pointers()
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sputn/char/1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_streambuf/sputn/char/1.cc 2003-04-10 09:15:36.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc 2003-06-29 17:55:09.000000000 +0200
@@ -41,7 +41,7 @@
typedef std::streambuf::char_type char_type;
testbuf(): std::streambuf()
- { _M_mode = (std::ios_base::in | std::ios_base::out); }
+ { }
bool
check_pointers()
diff -urN libstdc++-v3-orig/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
--- libstdc++-v3-orig/include/bits/fstream.tcc 2003-06-27 20:28:53.000000000 +0200
+++ libstdc++-v3/include/bits/fstream.tcc 2003-06-28 22:18:41.000000000 +0200
@@ -180,7 +180,7 @@
template<typename _CharT, typename _Traits>
typename basic_filebuf<_CharT, _Traits>::int_type
basic_filebuf<_CharT, _Traits>::
- _M_underflow(bool __bump)
+ underflow()
{
int_type __ret = traits_type::eof();
const bool __testin = this->_M_mode & ios_base::in;
@@ -194,12 +194,7 @@
_M_destroy_pback();
if (this->gptr() < this->egptr())
- {
- __ret = traits_type::to_int_type(*this->gptr());
- if (__bump)
- this->gbump(1);
- return __ret;
- }
+ return traits_type::to_int_type(*this->gptr());
// Get and convert input sequence.
const size_t __buflen = this->_M_buf_size > 1
@@ -247,8 +242,6 @@
_M_set_buffer(__ilen);
_M_reading = true;
__ret = traits_type::to_int_type(*this->gptr());
- if (__bump)
- this->gbump(1);
}
else if (__elen == 0)
{
diff -urN libstdc++-v3-orig/include/bits/sstream.tcc libstdc++-v3/include/bits/sstream.tcc
--- libstdc++-v3-orig/include/bits/sstream.tcc 2003-06-22 20:37:09.000000000 +0200
+++ libstdc++-v3/include/bits/sstream.tcc 2003-06-28 22:19:25.000000000 +0200
@@ -115,7 +115,7 @@
template <class _CharT, class _Traits, class _Alloc>
typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
basic_stringbuf<_CharT, _Traits, _Alloc>::
- _M_underflow(bool __bump)
+ underflow()
{
int_type __ret = traits_type::eof();
const bool __testin = this->_M_mode & ios_base::in;
@@ -125,11 +125,7 @@
_M_update_egptr();
if (this->gptr() < this->egptr())
- {
- __ret = traits_type::to_int_type(*this->gptr());
- if (__bump)
- this->gbump(1);
- }
+ __ret = traits_type::to_int_type(*this->gptr());
}
return __ret;
}
diff -urN libstdc++-v3-orig/include/std/std_fstream.h libstdc++-v3/include/std/std_fstream.h
--- libstdc++-v3-orig/include/std/std_fstream.h 2003-06-24 15:48:09.000000000 +0200
+++ libstdc++-v3/include/std/std_fstream.h 2003-06-28 22:22:47.000000000 +0200
@@ -281,29 +281,9 @@
// charater from the real input source when the buffer is empty.
// Buffered input uses underflow()
- // The only difference between underflow() and uflow() is that the
- // latter bumps _M_in_cur after the read. In the sync_with_stdio
- // case, this is important, as we need to unget the read character in
- // the underflow() case in order to maintain synchronization. So
- // instead of calling underflow() from uflow(), we create a common
- // subroutine to do the real work.
- /**
- * @if maint
- * @doctodo
- * @endif
- */
- int_type
- _M_underflow(bool __bump);
-
- // [documentation is inherited]
- virtual int_type
- underflow()
- { return _M_underflow(false); }
-
// [documentation is inherited]
virtual int_type
- uflow()
- { return _M_underflow(true); }
+ underflow();
// [documentation is inherited]
virtual int_type
diff -urN libstdc++-v3-orig/include/std/std_sstream.h libstdc++-v3/include/std/std_sstream.h
--- libstdc++-v3-orig/include/std/std_sstream.h 2003-06-22 20:37:10.000000000 +0200
+++ libstdc++-v3/include/std/std_sstream.h 2003-06-28 22:22:35.000000000 +0200
@@ -179,18 +179,9 @@
_M_sync(const_cast<char_type*>(_M_string.data()), 0, __len);
}
- int_type
- _M_underflow(bool __bump);
-
- // [documentation is inherited]
- virtual int_type
- underflow()
- { return _M_underflow(false); }
-
// [documentation is inherited]
virtual int_type
- uflow()
- { return _M_underflow(true); }
+ underflow();
// [documentation is inherited]
virtual int_type