OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testsuite_io.h (class sync_buf): New, templatized version of sync_streambuf; add typedefs for streambuf/wstreambuf. 

2004-12-02  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/testsuite_io.h (class sync_buf): New, templatized
	version of sync_streambuf; add typedefs for streambuf/wstreambuf.
	(class fail_buf): Likewise, for fail_streambuf.
	(class fail_num_get): Templatize and add char/wchar_t typedefs.
	(class fail_num_put): Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
	exceptions_badbit_throw.cc: Use the latter.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
	exceptions_failbit_throw.cc: Likewise.

From-SVN: r91635
This commit is contained in:
Paolo Carlini 2004-12-02 13:24:46 +00:00 committed by Paolo Carlini
parent 1afffb0073
commit 9b8d9ac39f
6 changed files with 209 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,19 @@
2004-12-02 Paolo Carlini <pcarlini@suse.de>
* testsuite/testsuite_io.h (class sync_buf): New, templatized
version of sync_streambuf; add typedefs for streambuf/wstreambuf.
(class fail_buf): Likewise, for fail_streambuf.
(class fail_num_get): Templatize and add char/wchar_t typedefs.
(class fail_num_put): Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_badbit_throw.cc: Use the latter.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit_throw.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
exceptions_badbit_throw.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
exceptions_failbit_throw.cc: Likewise.
2004-12-01 Paolo Carlini <pcarlini@suse.de>
* testsuite/27_io/basic_istream/get/wchar_t/1.cc: New.

4
libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc
View File

@ -1,6 +1,6 @@
// 2003-03-08 Jerry Quinn <jlquinn@optonline.net>
// Copyright (C) 2003 Free Software Foundation, Inc.
// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -30,7 +30,7 @@ void test_badbit()
using namespace std;
bool test __attribute__((unused)) = true;
locale loc(locale::classic(), new __gnu_test::fail_num_get);
locale loc(locale::classic(), new __gnu_test::fail_num_get_char);
istringstream stream("jaylib - champion sound");
stream.imbue(loc);

5
libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit_throw.cc
View File

@ -1,5 +1,4 @@
// Copyright (C) 2003
// Free Software Foundation, Inc.
// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -37,7 +36,7 @@ void test_failbit()
using namespace std;
bool test __attribute__((unused)) = true;
locale loc(locale::classic(), new __gnu_test::fail_num_get);
locale loc(locale::classic(), new __gnu_test::fail_num_get_char);
istringstream stream("jaylib - champion sound");
stream.imbue(loc);

2
libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_badbit_throw.cc
View File

@ -30,7 +30,7 @@ void test_badbit()
using namespace std;
bool test __attribute__((unused)) = true;
locale loc(locale::classic(), new __gnu_test::fail_num_put);
locale loc(locale::classic(), new __gnu_test::fail_num_put_char);
ostringstream stream("jaylib - champion sound");
stream.imbue(loc);

2
libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_failbit_throw.cc
View File

@ -37,7 +37,7 @@ void test_failbit()
using namespace std;
bool test __attribute__((unused)) = true;
locale loc(locale::classic(), new __gnu_test::fail_num_put);
locale loc(locale::classic(), new __gnu_test::fail_num_put_char);
ostringstream stream("jaylib - champion sound");
stream.imbue(loc);

54
libstdc++-v3/testsuite/testsuite_io.h
View File

@ -103,13 +103,15 @@ namespace __gnu_test
// Used to check if basic_streambuf::pubsync() has been called.
// This is useful for checking if a function creates [io]stream::sentry
// objects, since the sentry constructors call tie()->flush().
class sync_streambuf : public std::streambuf
template<typename T>
class sync_buf
: public T
{
private:
bool m_sync_called;
public:
sync_streambuf()
sync_buf()
: m_sync_called(false)
{ }
@ -124,21 +126,33 @@ namespace __gnu_test
}
};
typedef sync_buf<std::streambuf> sync_streambuf;
#ifdef _GLIBCXX_USE_WCHAR_T
typedef sync_buf<std::wstreambuf> sync_wstreambuf;
#endif
// Throws on all overflow and underflow calls.
struct underflow_error: std::exception { };
struct overflow_error: std::exception { };
struct positioning_error: std::exception { };
struct fail_streambuf : std::streambuf
template<typename T>
struct fail_buf
: public T
{
typedef typename T::char_type char_type;
typedef typename T::int_type int_type;
typedef typename T::off_type off_type;
typedef typename T::pos_type pos_type;
private:
char p[2];
char_type p[2];
public:
fail_streambuf()
fail_buf()
{
p[0] = 's';
p[1] = char();
p[0] = char_type('s');
p[1] = char_type();
setg(p, p, p + 1);
}
@ -183,12 +197,20 @@ namespace __gnu_test
}
};
typedef fail_buf<std::streambuf> fail_streambuf;
#ifdef _GLIBCXX_USE_WCHAR_T
typedef fail_buf<std::wstreambuf> fail_wstreambuf;
#endif
// Facets that throw an exception for every virtual function.
struct facet_error: std::exception { };
class fail_num_get : public std::num_get<char>
template<typename T>
class fail_num_get
: public std::num_get<T>
{
typedef std::ios_base ios_base;
typedef typename std::num_get<T>::iter_type iter_type;
protected:
iter_type
@ -247,9 +269,18 @@ namespace __gnu_test
{ throw facet_error(); return iter_type(); }
};
class fail_num_put : public std::num_put<char>
typedef fail_num_get<char> fail_num_get_char;
#ifdef _GLIBCXX_USE_WCHAR_T
typedef fail_num_get<wchar_t> fail_num_get_wchar_t;
#endif
template<typename T>
class fail_num_put
: public std::num_put<T>
{
typedef std::ios_base ios_base;
typedef typename std::num_put<T>::iter_type iter_type;
typedef typename std::num_put<T>::char_type char_type;
protected:
iter_type
@ -286,6 +317,11 @@ namespace __gnu_test
do_put(iter_type, ios_base&, char_type __fill, const void* __v) const
{ throw facet_error(); return iter_type(NULL); }
};
typedef fail_num_put<char> fail_num_put_char;
#ifdef _GLIBCXX_USE_WCHAR_T
typedef fail_num_put<wchar_t> fail_num_put_wchar_t;
#endif
}; // namespace __gnu_test
#endif // _GLIBCXX_TESTSUITE_IO_H