Commit 13c4b877 by Paolo Carlini

[multiple changes]

2009-03-25  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* include/std/fstream (basic_filebuf<>::open(const std::string&,
	ios_base::openmode), basic_ifstream<>::basic_ifstream(const
	std::string&, ios_base::openmode), basic_ifstream<>::
	open(const std::string&, ios_base::openmode), basic_ofstream<>::
	basic_ofstream(const std::string&, ios_base::openmode),
	basic_ofstream<>::open(const std::string&, ios_base::openmode),
	basic_fstream<>::basic_fstream(const std::string&, ios_base::openmode),
	basic_fstream<>::open(const std::string&, ios_base::openmode)):
	Add in C++0x mode.
	* testsuite/27_io/basic_ofstream/open/char/2.cc: New.
	* testsuite/27_io/basic_ofstream/cons/char/2.cc: Likewise.
	* testsuite/27_io/basic_fstream/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_fstream/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/5.cc: Likewise.

2009-03-25  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/27_io/basic_ofstream/cons/char/2.cc: Rename to...
	* testsuite/27_io/basic_ofstream/cons/char/1.cc: ... this.    
	* testsuite/27_io/basic_fstream/cons/3.cc: Rename to...
	* testsuite/27_io/basic_fstream/cons/1.cc: ... this.

From-SVN: r145078
parent 9fdcdc74
2009-03-25 Edward Smith-Rowland <3dw4rd@verizon.net>
* include/std/fstream (basic_filebuf<>::open(const std::string&,
ios_base::openmode), basic_ifstream<>::basic_ifstream(const
std::string&, ios_base::openmode), basic_ifstream<>::
open(const std::string&, ios_base::openmode), basic_ofstream<>::
basic_ofstream(const std::string&, ios_base::openmode),
basic_ofstream<>::open(const std::string&, ios_base::openmode),
basic_fstream<>::basic_fstream(const std::string&, ios_base::openmode),
basic_fstream<>::open(const std::string&, ios_base::openmode)):
Add in C++0x mode.
* testsuite/27_io/basic_ofstream/open/char/2.cc: New.
* testsuite/27_io/basic_ofstream/cons/char/2.cc: Likewise.
* testsuite/27_io/basic_fstream/open/char/1.cc: Likewise.
* testsuite/27_io/basic_fstream/cons/char/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/open/char/5.cc: Likewise.
2009-03-25 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/27_io/basic_ofstream/cons/char/2.cc: Rename to...
* testsuite/27_io/basic_ofstream/cons/char/1.cc: ... this.
* testsuite/27_io/basic_fstream/cons/3.cc: Rename to...
* testsuite/27_io/basic_fstream/cons/1.cc: ... this.
2009-03-25 Paolo Carlini <paolo.carlini@oracle.com> 2009-03-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/forward_list.h (_Fwd_list_node_base<>:: * include/bits/forward_list.h (_Fwd_list_node_base<>::
......
...@@ -45,8 +45,11 @@ ...@@ -45,8 +45,11 @@
#include <istream> #include <istream>
#include <ostream> #include <ostream>
#include <bits/codecvt.h> #include <bits/codecvt.h>
#include <cstdio> // For BUFSIZ #include <cstdio> // For BUFSIZ
#include <bits/basic_file.h> // For __basic_file, __c_lock #include <bits/basic_file.h> // For __basic_file, __c_lock
#ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <string> // For std::string overloads.
#endif
_GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_BEGIN_NAMESPACE(std)
...@@ -59,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -59,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* external disk file, and maintains a joint file position for both * external disk file, and maintains a joint file position for both
* sequences. Many of its semantics are described in terms of similar * sequences. Many of its semantics are described in terms of similar
* behavior in the Standard C Library's @c FILE streams. * behavior in the Standard C Library's @c FILE streams.
*/ */
// Requirements on traits_type, specific to this class: // Requirements on traits_type, specific to this class:
// traits_type::pos_type must be fpos<traits_type::state_type> // traits_type::pos_type must be fpos<traits_type::state_type>
// traits_type::off_type must be streamoff // traits_type::off_type must be streamoff
...@@ -114,19 +117,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -114,19 +117,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Actual size of internal buffer. This number is equal to the size * Actual size of internal buffer. This number is equal to the size
* of the put area + 1 position, reserved for the overflow char of * of the put area + 1 position, reserved for the overflow char of
* a full area. * a full area.
*/ */
size_t _M_buf_size; size_t _M_buf_size;
// Set iff _M_buf is allocated memory from _M_allocate_internal_buffer. // Set iff _M_buf is allocated memory from _M_allocate_internal_buffer.
bool _M_buf_allocated; bool _M_buf_allocated;
/** /**
* _M_reading == false && _M_writing == false for 'uncommitted' mode; * _M_reading == false && _M_writing == false for 'uncommitted' mode;
* _M_reading == true for 'read' mode; * _M_reading == true for 'read' mode;
* _M_writing == true for 'write' mode; * _M_writing == true for 'write' mode;
* *
* NB: _M_reading == true && _M_writing == true is unused. * NB: _M_reading == true && _M_writing == true is unused.
*/ */
bool _M_reading; bool _M_reading;
bool _M_writing; bool _M_writing;
...@@ -135,11 +138,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -135,11 +138,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Necessary bits for putback buffer management. * Necessary bits for putback buffer management.
* *
* @note pbacks of over one character are not currently supported. * @note pbacks of over one character are not currently supported.
*/ */
char_type _M_pback; char_type _M_pback;
char_type* _M_pback_cur_save; char_type* _M_pback_cur_save;
char_type* _M_pback_end_save; char_type* _M_pback_end_save;
bool _M_pback_init; bool _M_pback_init;
//@} //@}
// Cached codecvt facet. // Cached codecvt facet.
...@@ -149,19 +152,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -149,19 +152,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Buffer for external characters. Used for input when * Buffer for external characters. Used for input when
* codecvt::always_noconv() == false. When valid, this corresponds * codecvt::always_noconv() == false. When valid, this corresponds
* to eback(). * to eback().
*/ */
char* _M_ext_buf; char* _M_ext_buf;
/** /**
* Size of buffer held by _M_ext_buf. * Size of buffer held by _M_ext_buf.
*/ */
streamsize _M_ext_buf_size; streamsize _M_ext_buf_size;
/** /**
* Pointers into the buffer held by _M_ext_buf that delimit a * Pointers into the buffer held by _M_ext_buf that delimit a
* subsequence of bytes that have been read but not yet converted. * subsequence of bytes that have been read but not yet converted.
* When valid, _M_ext_next corresponds to egptr(). * When valid, _M_ext_next corresponds to egptr().
*/ */
const char* _M_ext_next; const char* _M_ext_next;
char* _M_ext_end; char* _M_ext_end;
...@@ -169,7 +172,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -169,7 +172,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Initializes pback buffers, and moves normal buffers to safety. * Initializes pback buffers, and moves normal buffers to safety.
* Assumptions: * Assumptions:
* _M_in_cur has already been moved back * _M_in_cur has already been moved back
*/ */
void void
_M_create_pback() _M_create_pback()
{ {
...@@ -186,7 +189,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -186,7 +189,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Deactivates pback buffer contents, and restores normal buffer. * Deactivates pback buffer contents, and restores normal buffer.
* Assumptions: * Assumptions:
* The pback buffer has only moved forward. * The pback buffer has only moved forward.
*/ */
void void
_M_destroy_pback() throw() _M_destroy_pback() throw()
{ {
...@@ -206,12 +209,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -206,12 +209,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* The default constructor initializes the parent class using its * The default constructor initializes the parent class using its
* own default ctor. * own default ctor.
*/ */
basic_filebuf(); basic_filebuf();
/** /**
* @brief The destructor closes the file first. * @brief The destructor closes the file first.
*/ */
virtual virtual
~basic_filebuf() ~basic_filebuf()
{ this->close(); } { this->close(); }
...@@ -219,7 +222,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -219,7 +222,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// Members: // Members:
/** /**
* @brief Returns true if the external file is open. * @brief Returns true if the external file is open.
*/ */
bool bool
is_open() const throw() is_open() const throw()
{ return _M_file.is_open(); } { return _M_file.is_open(); }
...@@ -266,6 +269,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -266,6 +269,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__filebuf_type* __filebuf_type*
open(const char* __s, ios_base::openmode __mode); open(const char* __s, ios_base::openmode __mode);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @return @c this on success, NULL on failure
*/
__filebuf_type*
open(const std::string& __s, ios_base::openmode __mode)
{ return open(__s.c_str(), __mode); }
#endif
/** /**
* @brief Closes the currently associated file. * @brief Closes the currently associated file.
* @return @c this on success, NULL on failure * @return @c this on success, NULL on failure
...@@ -276,7 +291,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -276,7 +291,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* all the characters. The file is then closed. * all the characters. The file is then closed.
* *
* If any operations fail, this function also fails. * If any operations fail, this function also fails.
*/ */
__filebuf_type* __filebuf_type*
close(); close();
...@@ -328,7 +343,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -328,7 +343,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* buffer; see * buffer; see
* http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html * http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
* for more. * for more.
*/ */
virtual __streambuf_type* virtual __streambuf_type*
setbuf(char_type* __s, streamsize __n); setbuf(char_type* __s, streamsize __n);
...@@ -367,11 +382,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -367,11 +382,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* __off == egptr() - eback() upon underflow/uflow ('read' mode); * __off == egptr() - eback() upon underflow/uflow ('read' mode);
* __off == 0 upon overflow ('write' mode); * __off == 0 upon overflow ('write' mode);
* __off == -1 upon open, setbuf, seekoff/pos ('uncommitted' mode). * __off == -1 upon open, setbuf, seekoff/pos ('uncommitted' mode).
* *
* NB: epptr() - pbase() == _M_buf_size - 1, since _M_buf_size * NB: epptr() - pbase() == _M_buf_size - 1, since _M_buf_size
* reflects the actual allocated memory and the last cell is reserved * reflects the actual allocated memory and the last cell is reserved
* for the overflow char of a full put area. * for the overflow char of a full put area.
*/ */
void void
_M_set_buffer(streamsize __off) _M_set_buffer(streamsize __off)
{ {
...@@ -399,7 +414,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -399,7 +414,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* functions from std::basic_istream. To control the associated * functions from std::basic_istream. To control the associated
* sequence, an instance of std::basic_filebuf is used, which this page * sequence, an instance of std::basic_filebuf is used, which this page
* refers to as @c sb. * refers to as @c sb.
*/ */
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
class basic_ifstream : public basic_istream<_CharT, _Traits> class basic_ifstream : public basic_istream<_CharT, _Traits>
{ {
...@@ -426,7 +441,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -426,7 +441,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Initializes @c sb using its default constructor, and passes * Initializes @c sb using its default constructor, and passes
* @c &sb to the base class initializer. Does not open any files * @c &sb to the base class initializer. Does not open any files
* (you haven't given it a filename to open). * (you haven't given it a filename to open).
*/ */
basic_ifstream() : __istream_type(), _M_filebuf() basic_ifstream() : __istream_type(), _M_filebuf()
{ this->init(&_M_filebuf); } { this->init(&_M_filebuf); }
...@@ -439,7 +454,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -439,7 +454,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
explicit explicit
basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in) basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in)
: __istream_type(), _M_filebuf() : __istream_type(), _M_filebuf()
...@@ -448,12 +463,30 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -448,12 +463,30 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->open(__s, __mode); this->open(__s, __mode);
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an input file stream.
* @param s std::string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::in is automatically included in @a mode.
*/
explicit
basic_ifstream(const std::string& __s,
ios_base::openmode __mode = ios_base::in)
: __istream_type(), _M_filebuf()
{
this->init(&_M_filebuf);
this->open(__s, __mode);
}
#endif
/** /**
* @brief The destructor does nothing. * @brief The destructor does nothing.
* *
* The file is closed by the filebuf object, not the formatting * The file is closed by the filebuf object, not the formatting
* stream. * stream.
*/ */
~basic_ifstream() ~basic_ifstream()
{ } { }
...@@ -463,7 +496,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -463,7 +496,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* @return The current basic_filebuf buffer. * @return The current basic_filebuf buffer.
* *
* This hides both signatures of std::basic_ios::rdbuf(). * This hides both signatures of std::basic_ios::rdbuf().
*/ */
__filebuf_type* __filebuf_type*
rdbuf() const rdbuf() const
{ return const_cast<__filebuf_type*>(&_M_filebuf); } { return const_cast<__filebuf_type*>(&_M_filebuf); }
...@@ -471,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -471,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/** /**
* @brief Wrapper to test for an open file. * @brief Wrapper to test for an open file.
* @return @c rdbuf()->is_open() * @return @c rdbuf()->is_open()
*/ */
bool bool
is_open() is_open()
{ return _M_filebuf.is_open(); } { return _M_filebuf.is_open(); }
...@@ -492,7 +525,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -492,7 +525,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
void void
open(const char* __s, ios_base::openmode __mode = ios_base::in) open(const char* __s, ios_base::openmode __mode = ios_base::in)
{ {
...@@ -504,12 +537,33 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -504,12 +537,33 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->clear(); this->clear();
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|in). If that function
* fails, @c failbit is set in the stream's error state.
*/
void
open(const std::string& __s, ios_base::openmode __mode = ios_base::in)
{
if (!_M_filebuf.open(__s, __mode | ios_base::in))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
#endif
/** /**
* @brief Close the file. * @brief Close the file.
* *
* Calls @c std::basic_filebuf::close(). If that function * Calls @c std::basic_filebuf::close(). If that function
* fails, @c failbit is set in the stream's error state. * fails, @c failbit is set in the stream's error state.
*/ */
void void
close() close()
{ {
...@@ -528,7 +582,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -528,7 +582,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* functions from std::basic_ostream. To control the associated * functions from std::basic_ostream. To control the associated
* sequence, an instance of std::basic_filebuf is used, which this page * sequence, an instance of std::basic_filebuf is used, which this page
* refers to as @c sb. * refers to as @c sb.
*/ */
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
class basic_ofstream : public basic_ostream<_CharT,_Traits> class basic_ofstream : public basic_ostream<_CharT,_Traits>
{ {
...@@ -555,7 +609,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -555,7 +609,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Initializes @c sb using its default constructor, and passes * Initializes @c sb using its default constructor, and passes
* @c &sb to the base class initializer. Does not open any files * @c &sb to the base class initializer. Does not open any files
* (you haven't given it a filename to open). * (you haven't given it a filename to open).
*/ */
basic_ofstream(): __ostream_type(), _M_filebuf() basic_ofstream(): __ostream_type(), _M_filebuf()
{ this->init(&_M_filebuf); } { this->init(&_M_filebuf); }
...@@ -569,7 +623,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -569,7 +623,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
explicit explicit
basic_ofstream(const char* __s, basic_ofstream(const char* __s,
ios_base::openmode __mode = ios_base::out|ios_base::trunc) ios_base::openmode __mode = ios_base::out|ios_base::trunc)
...@@ -579,12 +633,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -579,12 +633,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->open(__s, __mode); this->open(__s, __mode);
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an output file stream.
* @param s std::string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::out|ios_base::trunc is automatically included in
* @a mode.
*/
explicit
basic_ofstream(const std::string& __s,
ios_base::openmode __mode = ios_base::out|ios_base::trunc)
: __ostream_type(), _M_filebuf()
{
this->init(&_M_filebuf);
this->open(__s, __mode);
}
#endif
/** /**
* @brief The destructor does nothing. * @brief The destructor does nothing.
* *
* The file is closed by the filebuf object, not the formatting * The file is closed by the filebuf object, not the formatting
* stream. * stream.
*/ */
~basic_ofstream() ~basic_ofstream()
{ } { }
...@@ -594,7 +667,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -594,7 +667,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* @return The current basic_filebuf buffer. * @return The current basic_filebuf buffer.
* *
* This hides both signatures of std::basic_ios::rdbuf(). * This hides both signatures of std::basic_ios::rdbuf().
*/ */
__filebuf_type* __filebuf_type*
rdbuf() const rdbuf() const
{ return const_cast<__filebuf_type*>(&_M_filebuf); } { return const_cast<__filebuf_type*>(&_M_filebuf); }
...@@ -602,7 +675,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -602,7 +675,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/** /**
* @brief Wrapper to test for an open file. * @brief Wrapper to test for an open file.
* @return @c rdbuf()->is_open() * @return @c rdbuf()->is_open()
*/ */
bool bool
is_open() is_open()
{ return _M_filebuf.is_open(); } { return _M_filebuf.is_open(); }
...@@ -623,7 +696,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -623,7 +696,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
void void
open(const char* __s, open(const char* __s,
ios_base::openmode __mode = ios_base::out | ios_base::trunc) ios_base::openmode __mode = ios_base::out | ios_base::trunc)
...@@ -636,12 +709,34 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -636,12 +709,34 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->clear(); this->clear();
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|out|trunc). If that
* function fails, @c failbit is set in the stream's error state.
*/
void
open(const std::string& __s,
ios_base::openmode __mode = ios_base::out | ios_base::trunc)
{
if (!_M_filebuf.open(__s, __mode | ios_base::out))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
#endif
/** /**
* @brief Close the file. * @brief Close the file.
* *
* Calls @c std::basic_filebuf::close(). If that function * Calls @c std::basic_filebuf::close(). If that function
* fails, @c failbit is set in the stream's error state. * fails, @c failbit is set in the stream's error state.
*/ */
void void
close() close()
{ {
...@@ -660,7 +755,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -660,7 +755,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* the inherited functions from std::basic_iostream. To control the * the inherited functions from std::basic_iostream. To control the
* associated sequence, an instance of std::basic_filebuf is used, which * associated sequence, an instance of std::basic_filebuf is used, which
* this page refers to as @c sb. * this page refers to as @c sb.
*/ */
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
class basic_fstream : public basic_iostream<_CharT, _Traits> class basic_fstream : public basic_iostream<_CharT, _Traits>
{ {
...@@ -688,7 +783,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -688,7 +783,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Initializes @c sb using its default constructor, and passes * Initializes @c sb using its default constructor, and passes
* @c &sb to the base class initializer. Does not open any files * @c &sb to the base class initializer. Does not open any files
* (you haven't given it a filename to open). * (you haven't given it a filename to open).
*/ */
basic_fstream() basic_fstream()
: __iostream_type(), _M_filebuf() : __iostream_type(), _M_filebuf()
{ this->init(&_M_filebuf); } { this->init(&_M_filebuf); }
...@@ -700,7 +795,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -700,7 +795,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
explicit explicit
basic_fstream(const char* __s, basic_fstream(const char* __s,
ios_base::openmode __mode = ios_base::in | ios_base::out) ios_base::openmode __mode = ios_base::in | ios_base::out)
...@@ -710,12 +805,28 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -710,12 +805,28 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->open(__s, __mode); this->open(__s, __mode);
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an input/output file stream.
* @param s Null terminated string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
*/
explicit
basic_fstream(const std::string& __s,
ios_base::openmode __mode = ios_base::in | ios_base::out)
: __iostream_type(NULL), _M_filebuf()
{
this->init(&_M_filebuf);
this->open(__s, __mode);
}
#endif
/** /**
* @brief The destructor does nothing. * @brief The destructor does nothing.
* *
* The file is closed by the filebuf object, not the formatting * The file is closed by the filebuf object, not the formatting
* stream. * stream.
*/ */
~basic_fstream() ~basic_fstream()
{ } { }
...@@ -725,7 +836,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -725,7 +836,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* @return The current basic_filebuf buffer. * @return The current basic_filebuf buffer.
* *
* This hides both signatures of std::basic_ios::rdbuf(). * This hides both signatures of std::basic_ios::rdbuf().
*/ */
__filebuf_type* __filebuf_type*
rdbuf() const rdbuf() const
{ return const_cast<__filebuf_type*>(&_M_filebuf); } { return const_cast<__filebuf_type*>(&_M_filebuf); }
...@@ -733,7 +844,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -733,7 +844,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/** /**
* @brief Wrapper to test for an open file. * @brief Wrapper to test for an open file.
* @return @c rdbuf()->is_open() * @return @c rdbuf()->is_open()
*/ */
bool bool
is_open() is_open()
{ return _M_filebuf.is_open(); } { return _M_filebuf.is_open(); }
...@@ -754,7 +865,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -754,7 +865,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
*/ */
void void
open(const char* __s, open(const char* __s,
ios_base::openmode __mode = ios_base::in | ios_base::out) ios_base::openmode __mode = ios_base::in | ios_base::out)
...@@ -767,12 +878,34 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -767,12 +878,34 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
this->clear(); this->clear();
} }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode). If that
* function fails, @c failbit is set in the stream's error state.
*/
void
open(const std::string& __s,
ios_base::openmode __mode = ios_base::in | ios_base::out)
{
if (!_M_filebuf.open(__s, __mode))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
#endif
/** /**
* @brief Close the file. * @brief Close the file.
* *
* Calls @c std::basic_filebuf::close(). If that function * Calls @c std::basic_filebuf::close(). If that function
* fails, @c failbit is set in the stream's error state. * fails, @c failbit is set in the stream's error state.
*/ */
void void
close() close()
{ {
......
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
// Test member functions.
void test01()
{
std::filebuf fb;
const std::string name = "filebuf_name.txt";
fb.open(name, std::ios_base::in | std::ios_base::ate);
}
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
void test01()
{
const std::string name = "fstream_name.txt";
std::fstream fs(name);
}
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
void test01()
{
std::fstream fs;
const std::string name = "fstream_name.txt";
fs.open(name);
fs.close();
}
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
void test01()
{
const std::string name = "ifstream_name.txt";
std::ifstream ifs(name);
}
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
void test01()
{
std::ifstream ifs;
const std::string name = "ifstream_name.txt";
ifs.open(name);
ifs.close();
}
// Copyright (C) 2000, 2001, 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 27.8.1.10 ofstream member functions
// @require@ %-*.tst
// @diff@ %-*.tst %-*.txt
// { dg-require-fileio "" }
#include <ostream>
#include <fstream>
#include <testsuite_hooks.h>
const char name_02[] = "ofstream_members-1.txt";
// http://gcc.gnu.org/ml/libstdc++/2000-07/msg00004.html
void test02()
{
bool test __attribute__((unused)) = true;
const int more_than_max_open_files = 8200;
for(int i = 0; ++i < more_than_max_open_files;)
{
std::ofstream ifs(name_02);
VERIFY( static_cast<bool>(ifs) );
}
}
int main()
{
test02();
return 0;
}
// Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. // Copyright (C) 2009 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
...@@ -16,36 +16,13 @@ ...@@ -16,36 +16,13 @@
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA. // USA.
// 27.8.1.10 ofstream member functions // { dg-do compile }
// @require@ %-*.tst // { dg-options "-std=gnu++0x" }
// @diff@ %-*.tst %-*.txt
// { dg-require-fileio "" }
#include <ostream>
#include <fstream> #include <fstream>
#include <testsuite_hooks.h>
const char name_02[] = "ofstream_members-1.txt";
// http://gcc.gnu.org/ml/libstdc++/2000-07/msg00004.html
void test02()
{
bool test __attribute__((unused)) = true;
const int more_than_max_open_files = 8200;
for(int i = 0; ++i < more_than_max_open_files;)
{
std::ofstream ifs(name_02);
VERIFY( static_cast<bool>(ifs) );
}
}
int main() void test01()
{ {
test02(); const std::string name = "ofstream_name.txt";
return 0; std::ofstream ofs(name);
} }
// Copyright (C) 2009 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <fstream>
void test01()
{
std::ofstream ofs;
const std::string name = "ofstream_name.txt";
ofs.open(name);
ofs.close();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment