285b36d6a5
2003-11-11 Doug Gregor <gregod@cs.rpi.edu> * docs/html/debug.html: Document libstdc++ debug mode. * docs/html/debug_mode.html: Document libstdc++ debug mode design. * docs/html/test.html: Document how to test under debug mode. * docs/html/17_intro/howto.html: Document debug-mode macros. * include/Makefile.am: Install debug-mode headers. * src/Makefile.am: Include debug.cc. * include/bits/basic_string.tcc: (basic_string::_S_construct): Fix NULL pointer check. (__is_null_pointer): New. Add precondition annotations. * include/bits/stream_iterator.h (istream_iterator, ostream_iterator): Added precondition annotations. * include/bits/streambuf_iterator.h (istreambuf_iterator): Ditto. * include/bits/stl_queue.h (queue, priority_queue): Ditto. * include/bits/stl_stack.h (stack): Ditto. * include/bits/basic_string.h (basic_string): Ditto. * include/bits/basic_string.tcc (basic_string): Ditto. * include/std/std_memory.h (auto_ptr): Ditto. * include/std/std_valarray.h (valarray): Ditto. * include/bits/stl_algo.h: Added algorithm precondition annotations. * include/bits/stl_algobase.h: Added algorithm precondition annotations. * include/bits/stl_numeric.h: Ditto. * include/ext/algorithm: Added algorithm precondition annotations. (__is_heap): Moved away from here. * include/bits/stl_heap.h: Added algorithm precondition annotations. (__is_heap): Moved to the top of this file. (__is_heap): Added iterator range overloads. * testsuite/20_util/auto_ptr_neg.cc: Fix line numbers to match up with changes in std_memory.h. * testsuite/23_containers/list/operators/4.cc: Don't verify performance guarantees when in debug mode. * testsuite/23_containers/bitset/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/2.cc: New. * testsuite/23_containers/deque/invalidation/3.cc: New. * testsuite/23_containers/deque/invalidation/4.cc: New. * testsuite/23_containers/list/invalidation/1.cc: New. * testsuite/23_containers/list/invalidation/2.cc: New. * testsuite/23_containers/list/invalidation/3.cc: New. * testsuite/23_containers/list/invalidation/4.cc: New. * testsuite/23_containers/map/invalidation/1.cc: New. * testsuite/23_containers/map/invalidation/2.cc: New. * testsuite/23_containers/multimap/invalidation/1.cc: New. * testsuite/23_containers/multimap/invalidation/2.cc: New. * testsuite/23_containers/multiset/invalidation/1.cc: New. * testsuite/23_containers/multiset/invalidation/2.cc: New. * testsuite/23_containers/set/invalidation/1.cc: New. * testsuite/23_containers/set/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/1.cc: New. * testsuite/23_containers/vector/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/3.cc: New. * testsuite/23_containers/vector/invalidation/4.cc: New. * testsuite/25_algorithms/heap.cc: Don't verify performance guarantees when in debug mode. * include/debug/bitset: New. * include/debug/debug.h: New. * include/debug/deque: New. * include/debug/formatter.h: New. * include/debug/hash_map: New. * include/debug/hash_map.h: New. * include/debug/hash_multimap.h: New. * include/debug/hash_set: New. * include/debug/hash_set.h: New. * include/debug/hash_multiset.h: New. * include/debug/list: New. * include/debug/map: New. * include/debug/map.h: New. * include/debug/multimap.h: New. * include/debug/multiset.h: New. * include/debug/safe_base.h: New. * include/debug/safe_iterator.h: New. * include/debug/safe_iterator.tcc: New. * include/debug/safe_sequence.h: New. * include/debug/set: New. * include/debug/set.h: New. * include/debug/string: New. * include/debug/vector: New. * src/debug.cc: New. * config/linker-map.gnu: Add debug mode symbols. 2003-11-11 Benjamin Kosnik <bkoz@redhat.com> * src/string-inst.cc: Tweak namespaces. * src/misc-inst.cc: Same. * docs/html/debug.html: Edits. * config/link-map.gnu: Remove cruft. * include/bits/c++config: Add in namespace associations. * include/std/std_bitset.h: Adjust namespace to __gnu_norm, comment tweaks. * include/bits/deque.tcc: Same. * include/bits/list.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_vector.h: Same. * include/bits/vector.tcc: Same. * include/std/std_algorithm.h: Remove markup comments. * include/std/std_functional.h: Same. * include/std/std_iterator.h: Same. * include/std/std_numeric.h: Same. * include/std/std_utility.h: Same. * include/bits/stl_queue.h: Formatting tweaks. * include/bits/stl_stack.h: Same. * include/std/std_deque.h: Include debugging version in debug mode. * include/std/std_list.h: Same. * include/std/std_map.h: Same. * include/std/std_set.h: Same. * include/std/std_vector.h: Same. * include/std/std_queue.h: Use deque, vector. * include/std/std_stack.h: Same. From-SVN: r73459
236 lines
7.0 KiB
C++
236 lines
7.0 KiB
C++
// Streambuf iterators
|
|
|
|
// 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
|
|
// 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.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
/** @file streambuf_iterator.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef _STREAMBUF_ITERATOR_H
|
|
#define _STREAMBUF_ITERATOR_H 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
#include <streambuf>
|
|
#include <debug/debug.h>
|
|
|
|
// NB: Should specialize copy, find algorithms for streambuf iterators.
|
|
|
|
namespace std
|
|
{
|
|
// 24.5.3 Template class istreambuf_iterator
|
|
template<typename _CharT, typename _Traits>
|
|
class istreambuf_iterator
|
|
: public iterator<input_iterator_tag, _CharT, typename _Traits::off_type,
|
|
_CharT*, _CharT&>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef _CharT char_type;
|
|
typedef _Traits traits_type;
|
|
typedef typename _Traits::int_type int_type;
|
|
typedef basic_streambuf<_CharT, _Traits> streambuf_type;
|
|
typedef basic_istream<_CharT, _Traits> istream_type;
|
|
|
|
private:
|
|
// 24.5.3 istreambuf_iterator
|
|
// p 1
|
|
// If the end of stream is reached (streambuf_type::sgetc()
|
|
// returns traits_type::eof()), the iterator becomes equal to
|
|
// the "end of stream" iterator value.
|
|
// NB: This implementation assumes the "end of stream" value
|
|
// is EOF, or -1.
|
|
mutable streambuf_type* _M_sbuf;
|
|
int_type _M_c;
|
|
|
|
public:
|
|
istreambuf_iterator() throw()
|
|
: _M_sbuf(0), _M_c(traits_type::eof()) { }
|
|
|
|
istreambuf_iterator(istream_type& __s) throw()
|
|
: _M_sbuf(__s.rdbuf()), _M_c(traits_type::eof()) { }
|
|
|
|
istreambuf_iterator(streambuf_type* __s) throw()
|
|
: _M_sbuf(__s), _M_c(traits_type::eof()) { }
|
|
|
|
// NB: The result of operator*() on an end of stream is undefined.
|
|
char_type
|
|
operator*() const
|
|
{
|
|
#ifdef _GLIBCXX_DEBUG_PEDANTIC
|
|
// Dereferencing a past-the-end istreambuf_iterator is a
|
|
// libstdc++ extension
|
|
__glibcxx_requires_cond(!_M_at_eof(),
|
|
_M_message(__gnu_debug::__msg_deref_istreambuf)
|
|
._M_iterator(*this));
|
|
#endif
|
|
return traits_type::to_char_type(_M_get());
|
|
}
|
|
|
|
istreambuf_iterator&
|
|
operator++()
|
|
{
|
|
__glibcxx_requires_cond(!_M_at_eof(),
|
|
_M_message(__gnu_debug::__msg_inc_istreambuf)
|
|
._M_iterator(*this));
|
|
const int_type __eof = traits_type::eof();
|
|
if (_M_sbuf && traits_type::eq_int_type(_M_sbuf->sbumpc(), __eof))
|
|
_M_sbuf = 0;
|
|
else
|
|
_M_c = __eof;
|
|
return *this;
|
|
}
|
|
|
|
istreambuf_iterator
|
|
operator++(int)
|
|
{
|
|
__glibcxx_requires_cond(!_M_at_eof(),
|
|
_M_message(__gnu_debug::__msg_inc_istreambuf)
|
|
._M_iterator(*this));
|
|
|
|
const int_type __eof = traits_type::eof();
|
|
istreambuf_iterator __old = *this;
|
|
if (_M_sbuf
|
|
&& traits_type::eq_int_type((__old._M_c = _M_sbuf->sbumpc()),
|
|
__eof))
|
|
_M_sbuf = 0;
|
|
else
|
|
_M_c = __eof;
|
|
return __old;
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 110 istreambuf_iterator::equal not const
|
|
// NB: there is also number 111 (NAD, Future) pending on this function.
|
|
bool
|
|
equal(const istreambuf_iterator& __b) const
|
|
{
|
|
const int_type __eof = traits_type::eof();
|
|
bool __thiseof = _M_at_eof();
|
|
bool __beof = __b._M_at_eof();
|
|
return (__thiseof && __beof || (!__thiseof && !__beof));
|
|
}
|
|
|
|
private:
|
|
int_type
|
|
_M_get() const
|
|
{
|
|
const int_type __eof = traits_type::eof();
|
|
int_type __ret = __eof;
|
|
if (_M_sbuf)
|
|
{
|
|
if (!traits_type::eq_int_type(_M_c, __eof))
|
|
__ret = _M_c;
|
|
else
|
|
if (traits_type::eq_int_type((__ret = _M_sbuf->sgetc()), __eof))
|
|
_M_sbuf = 0;
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
bool
|
|
_M_at_eof() const
|
|
{
|
|
const int_type __eof = traits_type::eof();
|
|
return traits_type::eq_int_type(_M_get(), __eof);
|
|
}
|
|
};
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
inline bool
|
|
operator==(const istreambuf_iterator<_CharT, _Traits>& __a,
|
|
const istreambuf_iterator<_CharT, _Traits>& __b)
|
|
{ return __a.equal(__b); }
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
inline bool
|
|
operator!=(const istreambuf_iterator<_CharT, _Traits>& __a,
|
|
const istreambuf_iterator<_CharT, _Traits>& __b)
|
|
{ return !__a.equal(__b); }
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
class ostreambuf_iterator
|
|
: public iterator<output_iterator_tag, void, void, void, void>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef _CharT char_type;
|
|
typedef _Traits traits_type;
|
|
typedef basic_streambuf<_CharT, _Traits> streambuf_type;
|
|
typedef basic_ostream<_CharT, _Traits> ostream_type;
|
|
|
|
private:
|
|
streambuf_type* _M_sbuf;
|
|
bool _M_failed;
|
|
|
|
public:
|
|
ostreambuf_iterator(ostream_type& __s) throw ()
|
|
: _M_sbuf(__s.rdbuf()), _M_failed(!_M_sbuf) { }
|
|
|
|
ostreambuf_iterator(streambuf_type* __s) throw ()
|
|
: _M_sbuf(__s), _M_failed(!_M_sbuf) { }
|
|
|
|
ostreambuf_iterator&
|
|
operator=(_CharT __c)
|
|
{
|
|
if (!_M_failed &&
|
|
_Traits::eq_int_type(_M_sbuf->sputc(__c), _Traits::eof()))
|
|
_M_failed = true;
|
|
return *this;
|
|
}
|
|
|
|
ostreambuf_iterator&
|
|
operator*() throw()
|
|
{ return *this; }
|
|
|
|
ostreambuf_iterator&
|
|
operator++(int) throw()
|
|
{ return *this; }
|
|
|
|
ostreambuf_iterator&
|
|
operator++() throw()
|
|
{ return *this; }
|
|
|
|
bool
|
|
failed() const throw()
|
|
{ return _M_failed; }
|
|
|
|
ostreambuf_iterator&
|
|
_M_put(const _CharT* __ws, streamsize __len)
|
|
{
|
|
if (__builtin_expect(!_M_failed, true)
|
|
&& __builtin_expect(this->_M_sbuf->sputn(__ws, __len) != __len, false))
|
|
_M_failed = true;
|
|
return *this;
|
|
}
|
|
};
|
|
} // namespace std
|
|
#endif
|