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
177 lines
5.3 KiB
C++
177 lines
5.3 KiB
C++
// Stream iterators
|
|
|
|
// Copyright (C) 2001 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 stream_iterator.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef _STREAM_ITERATOR_H
|
|
#define _STREAM_ITERATOR_H 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
#include <debug/debug.h>
|
|
|
|
namespace std
|
|
{
|
|
template<typename _Tp, typename _CharT = char,
|
|
typename _Traits = char_traits<_CharT>, typename _Dist = ptrdiff_t>
|
|
class istream_iterator
|
|
: public iterator<input_iterator_tag, _Tp, _Dist, const _Tp*, const _Tp&>
|
|
{
|
|
public:
|
|
typedef _CharT char_type;
|
|
typedef _Traits traits_type;
|
|
typedef basic_istream<_CharT, _Traits> istream_type;
|
|
|
|
private:
|
|
istream_type* _M_stream;
|
|
_Tp _M_value;
|
|
bool _M_ok;
|
|
|
|
public:
|
|
istream_iterator() : _M_stream(0), _M_ok(false) {}
|
|
|
|
istream_iterator(istream_type& __s) : _M_stream(&__s) { _M_read(); }
|
|
|
|
istream_iterator(const istream_iterator& __obj)
|
|
: _M_stream(__obj._M_stream), _M_value(__obj._M_value),
|
|
_M_ok(__obj._M_ok)
|
|
{ }
|
|
|
|
const _Tp&
|
|
operator*() const
|
|
{
|
|
__glibcxx_requires_cond(_M_ok,
|
|
_M_message(__gnu_debug::__msg_deref_istream)
|
|
._M_iterator(*this));
|
|
return _M_value;
|
|
}
|
|
|
|
const _Tp*
|
|
operator->() const { return &(operator*()); }
|
|
|
|
istream_iterator&
|
|
operator++()
|
|
{
|
|
__glibcxx_requires_cond(_M_ok,
|
|
_M_message(__gnu_debug::__msg_inc_istream)
|
|
._M_iterator(*this));
|
|
_M_read();
|
|
return *this;
|
|
}
|
|
|
|
istream_iterator
|
|
operator++(int)
|
|
{
|
|
__glibcxx_requires_cond(_M_ok,
|
|
_M_message(__gnu_debug::__msg_inc_istream)
|
|
._M_iterator(*this));
|
|
istream_iterator __tmp = *this;
|
|
_M_read();
|
|
return __tmp;
|
|
}
|
|
|
|
bool
|
|
_M_equal(const istream_iterator& __x) const
|
|
{ return (_M_ok == __x._M_ok) && (!_M_ok || _M_stream == __x._M_stream);}
|
|
|
|
private:
|
|
void
|
|
_M_read()
|
|
{
|
|
_M_ok = (_M_stream && *_M_stream) ? true : false;
|
|
if (_M_ok)
|
|
{
|
|
*_M_stream >> _M_value;
|
|
_M_ok = *_M_stream ? true : false;
|
|
}
|
|
}
|
|
};
|
|
|
|
template<typename _Tp, typename _CharT, typename _Traits, typename _Dist>
|
|
inline bool
|
|
operator==(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
|
|
const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
|
|
{ return __x._M_equal(__y); }
|
|
|
|
template <class _Tp, class _CharT, class _Traits, class _Dist>
|
|
inline bool
|
|
operator!=(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
|
|
const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
|
|
{ return !__x._M_equal(__y); }
|
|
|
|
|
|
template<typename _Tp, typename _CharT = char,
|
|
typename _Traits = char_traits<_CharT> >
|
|
class ostream_iterator
|
|
: public iterator<output_iterator_tag, void, void, void, void>
|
|
{
|
|
public:
|
|
typedef _CharT char_type;
|
|
typedef _Traits traits_type;
|
|
typedef basic_ostream<_CharT, _Traits> ostream_type;
|
|
|
|
private:
|
|
ostream_type* _M_stream;
|
|
const _CharT* _M_string;
|
|
|
|
public:
|
|
ostream_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(0) {}
|
|
|
|
ostream_iterator(ostream_type& __s, const _CharT* __c)
|
|
: _M_stream(&__s), _M_string(__c) { }
|
|
|
|
ostream_iterator(const ostream_iterator& __obj)
|
|
: _M_stream(__obj._M_stream), _M_string(__obj._M_string) { }
|
|
|
|
ostream_iterator&
|
|
operator=(const _Tp& __value)
|
|
{
|
|
__glibcxx_requires_cond(_M_stream != 0,
|
|
_M_message(__gnu_debug::__msg_output_ostream)
|
|
._M_iterator(*this));
|
|
*_M_stream << __value;
|
|
if (_M_string) *_M_stream << _M_string;
|
|
return *this;
|
|
}
|
|
|
|
ostream_iterator&
|
|
operator*() { return *this; }
|
|
|
|
ostream_iterator&
|
|
operator++() { return *this; }
|
|
|
|
ostream_iterator&
|
|
operator++(int) { return *this; }
|
|
};
|
|
} // namespace std
|
|
#endif
|