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
324 lines
10 KiB
C++
324 lines
10 KiB
C++
// Debugging map implementation -*- C++ -*-
|
|
|
|
// 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.
|
|
|
|
// 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.
|
|
|
|
#ifndef _GLIBCXX_DEBUG_MAP_H
|
|
#define _GLIBCXX_DEBUG_MAP_H 1
|
|
|
|
#include <debug/safe_sequence.h>
|
|
#include <debug/safe_iterator.h>
|
|
#include <utility>
|
|
|
|
namespace __gnu_debug_def
|
|
{
|
|
template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
|
|
typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
|
|
class map
|
|
: public __gnu_norm::map<_Key, _Tp, _Compare, _Allocator>,
|
|
public __gnu_debug::_Safe_sequence<map<_Key, _Tp, _Compare, _Allocator> >
|
|
{
|
|
typedef __gnu_norm::map<_Key, _Tp, _Compare, _Allocator> _Base;
|
|
typedef __gnu_debug::_Safe_sequence<map> _Safe_base;
|
|
|
|
public:
|
|
// types:
|
|
typedef _Key key_type;
|
|
typedef _Tp mapped_type;
|
|
typedef std::pair<const _Key, _Tp> value_type;
|
|
typedef _Compare key_compare;
|
|
typedef _Allocator allocator_type;
|
|
typedef typename _Allocator::reference reference;
|
|
typedef typename _Allocator::const_reference const_reference;
|
|
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, map>
|
|
iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator, map>
|
|
const_iterator;
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
typedef typename _Base::difference_type difference_type;
|
|
typedef typename _Allocator::pointer pointer;
|
|
typedef typename _Allocator::const_pointer const_pointer;
|
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
|
|
|
using _Base::value_compare;
|
|
|
|
// 23.3.1.1 construct/copy/destroy:
|
|
explicit map(const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__comp, __a) { }
|
|
|
|
template<typename _InputIterator>
|
|
map(_InputIterator __first, _InputIterator __last,
|
|
const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__gnu_debug::__check_valid_range(__first, __last), __last,
|
|
__comp, __a), _Safe_base() { }
|
|
|
|
map(const map<_Key,_Tp,_Compare,_Allocator>& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
map(const _Base& __x) : _Base(__x), _Safe_base() { }
|
|
|
|
~map() { }
|
|
|
|
map<_Key,_Tp,_Compare,_Allocator>&
|
|
operator=(const map<_Key,_Tp,_Compare,_Allocator>& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
this->_M_invalidate_all();
|
|
return *this;
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 133. map missing get_allocator()
|
|
using _Base::get_allocator;
|
|
|
|
// iterators:
|
|
iterator
|
|
begin()
|
|
{ return iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
begin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
iterator
|
|
end()
|
|
{ return iterator(_Base::end(), this); }
|
|
|
|
const_iterator
|
|
end() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
reverse_iterator
|
|
rbegin()
|
|
{ return reverse_iterator(end()); }
|
|
|
|
const_reverse_iterator
|
|
rbegin() const
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
reverse_iterator
|
|
rend()
|
|
{ return reverse_iterator(begin()); }
|
|
|
|
const_reverse_iterator
|
|
rend() const
|
|
{ return const_reverse_iterator(begin()); }
|
|
|
|
// capacity:
|
|
using _Base::empty;
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
|
|
// 23.3.1.2 element access:
|
|
using _Base::operator[];
|
|
|
|
// modifiers:
|
|
std::pair<iterator, bool>
|
|
insert(const value_type& __x)
|
|
{
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
|
|
return std::pair<iterator, bool>(iterator(__res.first, this),
|
|
__res.second);
|
|
}
|
|
|
|
iterator
|
|
insert(iterator __position, const value_type& __x)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
return iterator(_Base::insert(__position.base(), __x), this);
|
|
}
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_valid_range(__first, __last);
|
|
_Base::insert(__first, __last);
|
|
}
|
|
|
|
void
|
|
erase(iterator __position)
|
|
{
|
|
__glibcxx_check_erase(__position);
|
|
__position._M_invalidate();
|
|
_Base::erase(__position.base());
|
|
}
|
|
|
|
size_type
|
|
erase(const key_type& __x)
|
|
{
|
|
iterator __victim = find(__x);
|
|
if (__victim == end())
|
|
return 0;
|
|
else
|
|
{
|
|
__victim._M_invalidate();
|
|
_Base::erase(__victim.base());
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
void
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 151. can't currently clear() empty container
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
while (__first != __last)
|
|
this->erase(__first++);
|
|
}
|
|
|
|
void
|
|
swap(map<_Key,_Tp,_Compare,_Allocator>& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
this->_M_swap(__x);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{ this->erase(begin(), end()); }
|
|
|
|
// observers:
|
|
using _Base::key_comp;
|
|
using _Base::value_comp;
|
|
|
|
// 23.3.1.3 map operations:
|
|
iterator
|
|
find(const key_type& __x)
|
|
{ return iterator(_Base::find(__x), this); }
|
|
|
|
const_iterator
|
|
find(const key_type& __x) const
|
|
{ return const_iterator(_Base::find(__x), this); }
|
|
|
|
using _Base::count;
|
|
|
|
iterator
|
|
lower_bound(const key_type& __x)
|
|
{ return iterator(_Base::lower_bound(__x), this); }
|
|
|
|
const_iterator
|
|
lower_bound(const key_type& __x) const
|
|
{ return const_iterator(_Base::lower_bound(__x), this); }
|
|
|
|
iterator
|
|
upper_bound(const key_type& __x)
|
|
{ return iterator(_Base::upper_bound(__x), this); }
|
|
|
|
const_iterator
|
|
upper_bound(const key_type& __x) const
|
|
{ return const_iterator(_Base::upper_bound(__x), this); }
|
|
|
|
std::pair<iterator,iterator>
|
|
equal_range(const key_type& __x)
|
|
{
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
std::pair<_Base_iterator, _Base_iterator> __res =
|
|
_Base::equal_range(__x);
|
|
return std::make_pair(iterator(__res.first, this),
|
|
iterator(__res.second, this));
|
|
}
|
|
|
|
std::pair<const_iterator,const_iterator>
|
|
equal_range(const key_type& __x) const
|
|
{
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
std::pair<_Base_const_iterator, _Base_const_iterator> __res =
|
|
_Base::equal_range(__x);
|
|
return std::make_pair(const_iterator(__res.first, this),
|
|
const_iterator(__res.second, this));
|
|
}
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
|
|
private:
|
|
void
|
|
_M_invalidate_all()
|
|
{
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
|
|
this->_M_invalidate_if(_Not_equal(_M_base().end()));
|
|
}
|
|
};
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator==(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() == __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator!=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() != __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator<(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() < __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator<=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() <= __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator>=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() >= __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline bool
|
|
operator>(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ return __lhs._M_base() > __rhs._M_base(); }
|
|
|
|
template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
|
|
inline void
|
|
swap(map<_Key,_Tp,_Compare,_Allocator>& __lhs,
|
|
map<_Key,_Tp,_Compare,_Allocator>& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
} // namespace __gnu_debug_def
|
|
|
|
#endif
|