This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Various underflow and overflow bits
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 10 Jun 2003 21:31:35 +0200
- Subject: [v3] Various underflow and overflow bits
Hi,
tested x86-linux, reviewed by Benjamin.
Paolo.
///////
2003-06-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (overflow): According to
27.5.2.4.5, overflow() returns not_eof(eof()).
* testsuite/27_io/basic_filebuf/overflow/char/2.cc: New.
* testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc: Ditto.
2003-06-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (_M_underflow): Check overflow return
value; tweak slightly.
diff -urN libstdc++-v3-curr/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
--- libstdc++-v3-curr/include/bits/fstream.tcc 2003-06-10 12:30:12.000000000 +0200
+++ libstdc++-v3/include/bits/fstream.tcc 2003-06-10 13:46:38.000000000 +0200
@@ -348,8 +348,8 @@
{
// Unbuffered.
char_type __conv = traits_type::to_char_type(__c);
- if (!__testeof && _M_convert_to_external(&__conv, 1))
- __ret = __c;
+ if (__testeof || _M_convert_to_external(&__conv, 1))
+ __ret = traits_type::not_eof(__c);
}
}
_M_last_overflowed = true;
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc 2003-06-10 18:40:32.000000000 +0200
@@ -0,0 +1,54 @@
+// 2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+// Copyright (C) 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_08[] = "filebuf_virtuals-8.txt"; // empty file, need to create
+
+class OverBuf : public std::filebuf
+{
+public:
+ int_type pub_overflow(int_type c = traits_type::eof())
+ { return std::filebuf::overflow(c); }
+};
+
+// According to 27.5.2.4.5 filebuf::overflow() returns not_eof(eof()).
+void test01()
+{
+ using namespace std;
+ bool test = true;
+ typedef OverBuf::traits_type traits_type;
+
+ OverBuf fb;
+ fb.pubsetbuf(0, 0);
+ fb.open(name_08, ios_base::out | ios_base::trunc);
+
+ VERIFY( fb.pub_overflow() == traits_type::not_eof(traits_type::eof()) );
+ fb.close();
+}
+
+main()
+{
+ test01();
+ return 0;
+}
diff -urN libstdc++-v3-curr/testsuite/27_io/basic_filebuf/overflow/char/2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
--- libstdc++-v3-curr/testsuite/27_io/basic_filebuf/overflow/char/2.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc 2003-06-10 18:40:19.000000000 +0200
@@ -0,0 +1,53 @@
+// 2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+// Copyright (C) 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_08[] = "filebuf_virtuals-8.txt"; // empty file, need to create
+
+class OverBuf : public std::filebuf
+{
+public:
+ int_type pub_overflow(int_type c = traits_type::eof())
+ { return std::filebuf::overflow(c); }
+};
+
+// According to 27.5.2.4.5 filebuf::overflow() returns not_eof(eof()).
+void test01()
+{
+ using namespace std;
+ bool test = true;
+ typedef OverBuf::traits_type traits_type;
+
+ OverBuf fb;
+ fb.open(name_08, ios_base::out | ios_base::trunc);
+
+ VERIFY( fb.pub_overflow() == traits_type::not_eof(traits_type::eof()) );
+ fb.close();
+}
+
+main()
+{
+ test01();
+ return 0;
+}
diff -prN libstdc++-v3-orig/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
*** libstdc++-v3-orig/include/bits/fstream.tcc Tue Jun 10 02:02:02 2003
--- libstdc++-v3/include/bits/fstream.tcc Tue Jun 10 12:30:12 2003
*************** namespace std
*** 193,201 ****
// fileops happen...
_M_destroy_pback();
- const size_t __buflen = this->_M_buf_size > 1
- ? this->_M_buf_size - 1 : 1;
-
if (this->_M_in_cur < this->_M_in_end)
{
__ret = traits_type::to_int_type(*this->_M_in_cur);
--- 193,198 ----
*************** namespace std
*** 205,214 ****
}
// Sync internal and external buffers.
! if (__testout && this->_M_out_beg < this->_M_out_lim)
! this->overflow();
// Get and convert input sequence.
streamsize __elen = 0;
streamsize __ilen = 0;
if (__check_facet(_M_codecvt).always_noconv())
--- 202,214 ----
}
// Sync internal and external buffers.
! if (__testout && this->_M_out_beg < this->_M_out_lim
! && traits_type::eq_int_type(this->overflow(), __ret))
! return __ret;
// Get and convert input sequence.
+ const size_t __buflen = this->_M_buf_size > 1
+ ? this->_M_buf_size - 1 : 1;
streamsize __elen = 0;
streamsize __ilen = 0;
if (__check_facet(_M_codecvt).always_noconv())