Skip to content

R
riscv-gcc-1
Commit 659e82ad by Paolo Carlini Committed by Paolo Carlini
Options

hashtable.h: Trivial formatting fixes. 

2004-06-15  Paolo Carlini  <pcarlini@suse.de>

	* include/ext/hashtable.h: Trivial formatting fixes.
	* include/ext/rb_tree: Likewise.

From-SVN: r83183
parent d1238423
Showing with 504 additions and 361 deletions
libstdc++-v3/ChangeLog
2004-06-15 Paolo Carlini <pcarlini@suse.de>
* include/ext/hashtable.h: Trivial formatting fixes.
* include/ext/rb_tree: Likewise.
2004-06-14 Paolo Carlini <pcarlini@suse.de> 2004-06-14 Paolo Carlini <pcarlini@suse.de>
* include/ext/hash_map: Trivial formatting fixes. * include/ext/hash_map: Trivial formatting fixes.
......
libstdc++-v3/include/ext/hashtable.h
...@@ -73,40 +73,41 @@ ...@@ -73,40 +73,41 @@
namespace __gnu_cxx namespace __gnu_cxx
{ {
using std::size_t; using std::size_t;
using std::ptrdiff_t; using std::ptrdiff_t;
using std::forward_iterator_tag; using std::forward_iterator_tag;
using std::input_iterator_tag; using std::input_iterator_tag;
using std::_Construct; using std::_Construct;
using std::_Destroy; using std::_Destroy;
using std::distance; using std::distance;
using std::vector; using std::vector;
using std::pair; using std::pair;
using std::__iterator_category; using std::__iterator_category;
template <class _Val> template <class _Val>
struct _Hashtable_node struct _Hashtable_node
{ {
_Hashtable_node* _M_next; _Hashtable_node* _M_next;
_Val _M_val; _Val _M_val;
}; };
template <class _Val, class _Key, class _HashFcn, class _ExtractKey, template <class _Val, class _Key, class _HashFcn, class _ExtractKey,
class _EqualKey, class _Alloc = std::allocator<_Val> > class _EqualKey, class _Alloc = std::allocator<_Val> >
class hashtable; class hashtable;
template <class _Val, class _Key, class _HashFcn, template <class _Val, class _Key, class _HashFcn,
class _ExtractKey, class _EqualKey, class _Alloc> class _ExtractKey, class _EqualKey, class _Alloc>
struct _Hashtable_iterator; struct _Hashtable_iterator;
template <class _Val, class _Key, class _HashFcn, template <class _Val, class _Key, class _HashFcn,
class _ExtractKey, class _EqualKey, class _Alloc> class _ExtractKey, class _EqualKey, class _Alloc>
struct _Hashtable_const_iterator; struct _Hashtable_const_iterator;
template <class _Val, class _Key, class _HashFcn, template <class _Val, class _Key, class _HashFcn,
class _ExtractKey, class _EqualKey, class _Alloc> class _ExtractKey, class _EqualKey, class _Alloc>
struct _Hashtable_iterator { struct _Hashtable_iterator
typedef hashtable<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc> {
typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
_Hashtable; _Hashtable;
typedef _Hashtable_iterator<_Val, _Key, _HashFcn, typedef _Hashtable_iterator<_Val, _Key, _HashFcn,
_ExtractKey, _EqualKey, _Alloc> _ExtractKey, _EqualKey, _Alloc>
...@@ -115,7 +116,6 @@ struct _Hashtable_iterator { ...@@ -115,7 +116,6 @@ struct _Hashtable_iterator {
_ExtractKey, _EqualKey, _Alloc> _ExtractKey, _EqualKey, _Alloc>
const_iterator; const_iterator;
typedef _Hashtable_node<_Val> _Node; typedef _Hashtable_node<_Val> _Node;
typedef forward_iterator_tag iterator_category; typedef forward_iterator_tag iterator_category;
typedef _Val value_type; typedef _Val value_type;
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
...@@ -128,22 +128,37 @@ struct _Hashtable_iterator { ...@@ -128,22 +128,37 @@ struct _Hashtable_iterator {
_Hashtable_iterator(_Node* __n, _Hashtable* __tab) _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
: _M_cur(__n), _M_ht(__tab) {} : _M_cur(__n), _M_ht(__tab) {}
_Hashtable_iterator() {} _Hashtable_iterator() {}
reference operator*() const { return _M_cur->_M_val; }
pointer operator->() const { return &(operator*()); } reference
iterator& operator++(); operator*() const
iterator operator++(int); { return _M_cur->_M_val; }
bool operator==(const iterator& __it) const
pointer
operator->() const
{ return &(operator*()); }
iterator&
operator++();
iterator
operator++(int);
bool
operator==(const iterator& __it) const
{ return _M_cur == __it._M_cur; } { return _M_cur == __it._M_cur; }
bool operator!=(const iterator& __it) const
{ return _M_cur != __it._M_cur; }
};
bool
operator!=(const iterator& __it) const
{ return _M_cur != __it._M_cur; }
};
template <class _Val, class _Key, class _HashFcn, template <class _Val, class _Key, class _HashFcn,
class _ExtractKey, class _EqualKey, class _Alloc> class _ExtractKey, class _EqualKey, class _Alloc>
struct _Hashtable_const_iterator { struct _Hashtable_const_iterator
typedef hashtable<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc> {
typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
_Hashtable; _Hashtable;
typedef _Hashtable_iterator<_Val,_Key,_HashFcn, typedef _Hashtable_iterator<_Val,_Key,_HashFcn,
_ExtractKey,_EqualKey,_Alloc> _ExtractKey,_EqualKey,_Alloc>
...@@ -165,63 +180,83 @@ struct _Hashtable_const_iterator { ...@@ -165,63 +180,83 @@ struct _Hashtable_const_iterator {
_Hashtable_const_iterator(const _Node* __n, const _Hashtable* __tab) _Hashtable_const_iterator(const _Node* __n, const _Hashtable* __tab)
: _M_cur(__n), _M_ht(__tab) {} : _M_cur(__n), _M_ht(__tab) {}
_Hashtable_const_iterator() {} _Hashtable_const_iterator() {}
_Hashtable_const_iterator(const iterator& __it) _Hashtable_const_iterator(const iterator& __it)
: _M_cur(__it._M_cur), _M_ht(__it._M_ht) {} : _M_cur(__it._M_cur), _M_ht(__it._M_ht) {}
reference operator*() const { return _M_cur->_M_val; }
pointer operator->() const { return &(operator*()); } reference
const_iterator& operator++(); operator*() const
const_iterator operator++(int); { return _M_cur->_M_val; }
bool operator==(const const_iterator& __it) const
pointer
operator->() const
{ return &(operator*()); }
const_iterator&
operator++();
const_iterator
operator++(int);
bool
operator==(const const_iterator& __it) const
{ return _M_cur == __it._M_cur; } { return _M_cur == __it._M_cur; }
bool operator!=(const const_iterator& __it) const
bool
operator!=(const const_iterator& __it) const
{ return _M_cur != __it._M_cur; } { return _M_cur != __it._M_cur; }
}; };
// Note: assumes long is at least 32 bits. // Note: assumes long is at least 32 bits.
enum { _S_num_primes = 28 }; enum { _S_num_primes = 28 };
static const unsigned long __stl_prime_list[_S_num_primes] = static const unsigned long __stl_prime_list[_S_num_primes] =
{ {
53ul, 97ul, 193ul, 389ul, 769ul, 53ul, 97ul, 193ul, 389ul, 769ul,
1543ul, 3079ul, 6151ul, 12289ul, 24593ul, 1543ul, 3079ul, 6151ul, 12289ul, 24593ul,
49157ul, 98317ul, 196613ul, 393241ul, 786433ul, 49157ul, 98317ul, 196613ul, 393241ul, 786433ul,
1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul, 1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul,
50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul, 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,
1610612741ul, 3221225473ul, 4294967291ul 1610612741ul, 3221225473ul, 4294967291ul
}; };
inline unsigned long __stl_next_prime(unsigned long __n) inline unsigned long
{ __stl_next_prime(unsigned long __n)
{
const unsigned long* __first = __stl_prime_list; const unsigned long* __first = __stl_prime_list;
const unsigned long* __last = __stl_prime_list + (int)_S_num_primes; const unsigned long* __last = __stl_prime_list + (int)_S_num_primes;
const unsigned long* pos = std::lower_bound(__first, __last, __n); const unsigned long* pos = std::lower_bound(__first, __last, __n);
return pos == __last ? *(__last - 1) : *pos; return pos == __last ? *(__last - 1) : *pos;
} }
// Forward declaration of operator==.
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> // Forward declaration of operator==.
class hashtable;
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex,
bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1, class _Eq, class _All>
const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2); class hashtable;
template <class _Val, class _Key, class _HF, class _Ex,
class _Eq, class _All>
bool
operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2);
// Hashtables handle allocators a bit differently than other // Hashtables handle allocators a bit differently than other
// containers do. If we're using standard-conforming allocators, then // containers do. If we're using standard-conforming allocators, then
// a hashtable unconditionally has a member variable to hold its // a hashtable unconditionally has a member variable to hold its
// allocator, even if it so happens that all instances of the // allocator, even if it so happens that all instances of the
// allocator type are identical. This is because, for hashtables, // allocator type are identical. This is because, for hashtables,
// this extra storage is negligible. Additionally, a base class // this extra storage is negligible. Additionally, a base class
// wouldn't serve any other purposes; it wouldn't, for example, // wouldn't serve any other purposes; it wouldn't, for example,
// simplify the exception-handling code. // simplify the exception-handling code.
template <class _Val, class _Key, class _HashFcn, template <class _Val, class _Key, class _HashFcn,
class _ExtractKey, class _EqualKey, class _Alloc> class _ExtractKey, class _EqualKey, class _Alloc>
class hashtable { class hashtable
public: {
public:
typedef _Key key_type; typedef _Key key_type;
typedef _Val value_type; typedef _Val value_type;
typedef _HashFcn hasher; typedef _HashFcn hasher;
...@@ -234,87 +269,86 @@ public: ...@@ -234,87 +269,86 @@ public:
typedef value_type& reference; typedef value_type& reference;
typedef const value_type& const_reference; typedef const value_type& const_reference;
hasher hash_funct() const { return _M_hash; } hasher
key_equal key_eq() const { return _M_equals; } hash_funct() const
{ return _M_hash; }
private: key_equal
key_eq() const
{ return _M_equals; }
private:
typedef _Hashtable_node<_Val> _Node; typedef _Hashtable_node<_Val> _Node;
public: public:
typedef _Alloc allocator_type; typedef _Alloc allocator_type;
allocator_type get_allocator() const { return _M_node_allocator; } allocator_type
private: get_allocator() const
{ return _M_node_allocator; }
private:
typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc; typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc;
typedef typename _Alloc::template rebind<_Node*>::other _Nodeptr_Alloc; typedef typename _Alloc::template rebind<_Node*>::other _Nodeptr_Alloc;
typedef vector<_Node*, _Nodeptr_Alloc> _Vector_type; typedef vector<_Node*, _Nodeptr_Alloc> _Vector_type;
_Node_Alloc _M_node_allocator; _Node_Alloc _M_node_allocator;
_Node* _M_get_node() { return _M_node_allocator.allocate(1); }
void _M_put_node(_Node* __p) { _M_node_allocator.deallocate(__p, 1); }
private: _Node*
_M_get_node()
{ return _M_node_allocator.allocate(1); }
void
_M_put_node(_Node* __p)
{ _M_node_allocator.deallocate(__p, 1); }
private:
hasher _M_hash; hasher _M_hash;
key_equal _M_equals; key_equal _M_equals;
_ExtractKey _M_get_key; _ExtractKey _M_get_key;
_Vector_type _M_buckets; _Vector_type _M_buckets;
size_type _M_num_elements; size_type _M_num_elements;
public: public:
typedef _Hashtable_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc> typedef _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey,
_EqualKey, _Alloc>
iterator; iterator;
typedef _Hashtable_const_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey, typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
_Alloc> _EqualKey, _Alloc>
const_iterator; const_iterator;
friend struct friend struct
_Hashtable_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>; _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>;
friend struct friend struct
_Hashtable_const_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>; _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
_EqualKey, _Alloc>;
public: public:
hashtable(size_type __n, hashtable(size_type __n, const _HashFcn& __hf,
const _HashFcn& __hf, const _EqualKey& __eql, const _ExtractKey& __ext,
const _EqualKey& __eql,
const _ExtractKey& __ext,
const allocator_type& __a = allocator_type()) const allocator_type& __a = allocator_type())
: _M_node_allocator(__a), : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
_M_hash(__hf), _M_get_key(__ext), _M_buckets(__a), _M_num_elements(0)
_M_equals(__eql), { _M_initialize_buckets(__n); }
_M_get_key(__ext),
_M_buckets(__a),
_M_num_elements(0)
{
_M_initialize_buckets(__n);
}
hashtable(size_type __n, hashtable(size_type __n, const _HashFcn& __hf,
const _HashFcn& __hf,
const _EqualKey& __eql, const _EqualKey& __eql,
const allocator_type& __a = allocator_type()) const allocator_type& __a = allocator_type())
: _M_node_allocator(__a), : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
_M_hash(__hf), _M_get_key(_ExtractKey()), _M_buckets(__a), _M_num_elements(0)
_M_equals(__eql), { _M_initialize_buckets(__n); }
_M_get_key(_ExtractKey()),
_M_buckets(__a),
_M_num_elements(0)
{
_M_initialize_buckets(__n);
}
hashtable(const hashtable& __ht) hashtable(const hashtable& __ht)
: _M_node_allocator(__ht.get_allocator()), : _M_node_allocator(__ht.get_allocator()), _M_hash(__ht._M_hash),
_M_hash(__ht._M_hash), _M_equals(__ht._M_equals), _M_get_key(__ht._M_get_key),
_M_equals(__ht._M_equals), _M_buckets(__ht.get_allocator()), _M_num_elements(0)
_M_get_key(__ht._M_get_key), { _M_copy_from(__ht); }
_M_buckets(__ht.get_allocator()),
_M_num_elements(0)
{
_M_copy_from(__ht);
}
hashtable& operator= (const hashtable& __ht) hashtable&
operator= (const hashtable& __ht)
{
if (&__ht != this)
{ {
if (&__ht != this) {
clear(); clear();
_M_hash = __ht._M_hash; _M_hash = __ht._M_hash;
_M_equals = __ht._M_equals; _M_equals = __ht._M_equals;
...@@ -324,13 +358,23 @@ public: ...@@ -324,13 +358,23 @@ public:
return *this; return *this;
} }
~hashtable() { clear(); } ~hashtable()
{ clear(); }
size_type
size() const
{ return _M_num_elements; }
size_type size() const { return _M_num_elements; } size_type
size_type max_size() const { return size_type(-1); } max_size() const
bool empty() const { return size() == 0; } { return size_type(-1); }
void swap(hashtable& __ht) bool
empty() const
{ return size() == 0; }
void
swap(hashtable& __ht)
{ {
std::swap(_M_hash, __ht._M_hash); std::swap(_M_hash, __ht._M_hash);
std::swap(_M_equals, __ht._M_equals); std::swap(_M_equals, __ht._M_equals);
...@@ -339,7 +383,8 @@ public: ...@@ -339,7 +383,8 @@ public:
std::swap(_M_num_elements, __ht._M_num_elements); std::swap(_M_num_elements, __ht._M_num_elements);
} }
iterator begin() iterator
begin()
{ {
for (size_type __n = 0; __n < _M_buckets.size(); ++__n) for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
if (_M_buckets[__n]) if (_M_buckets[__n])
...@@ -347,9 +392,12 @@ public: ...@@ -347,9 +392,12 @@ public:
return end(); return end();
} }
iterator end() { return iterator(0, this); } iterator
end()
{ return iterator(0, this); }
const_iterator begin() const const_iterator
begin() const
{ {
for (size_type __n = 0; __n < _M_buckets.size(); ++__n) for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
if (_M_buckets[__n]) if (_M_buckets[__n])
...@@ -357,19 +405,27 @@ public: ...@@ -357,19 +405,27 @@ public:
return end(); return end();
} }
const_iterator end() const { return const_iterator(0, this); } const_iterator
end() const
{ return const_iterator(0, this); }
template <class _Vl, class _Ky, class _HF, class _Ex, class _Eq, class _Al> template <class _Vl, class _Ky, class _HF, class _Ex, class _Eq,
friend bool operator== (const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&, class _Al>
friend bool
operator==(const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&,
const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&); const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&);
public:
size_type bucket_count() const { return _M_buckets.size(); } public:
size_type
bucket_count() const
{ return _M_buckets.size(); }
size_type max_bucket_count() const size_type
max_bucket_count() const
{ return __stl_prime_list[(int)_S_num_primes - 1]; } { return __stl_prime_list[(int)_S_num_primes - 1]; }
size_type elems_in_bucket(size_type __bucket) const size_type
elems_in_bucket(size_type __bucket) const
{ {
size_type __result = 0; size_type __result = 0;
for (_Node* __cur = _M_buckets[__bucket]; __cur; __cur = __cur->_M_next) for (_Node* __cur = _M_buckets[__bucket]; __cur; __cur = __cur->_M_next)
...@@ -377,35 +433,39 @@ public: ...@@ -377,35 +433,39 @@ public:
return __result; return __result;
} }
pair<iterator, bool> insert_unique(const value_type& __obj) pair<iterator, bool>
insert_unique(const value_type& __obj)
{ {
resize(_M_num_elements + 1); resize(_M_num_elements + 1);
return insert_unique_noresize(__obj); return insert_unique_noresize(__obj);
} }
iterator insert_equal(const value_type& __obj) iterator
insert_equal(const value_type& __obj)
{ {
resize(_M_num_elements + 1); resize(_M_num_elements + 1);
return insert_equal_noresize(__obj); return insert_equal_noresize(__obj);
} }
pair<iterator, bool> insert_unique_noresize(const value_type& __obj); pair<iterator, bool>
iterator insert_equal_noresize(const value_type& __obj); insert_unique_noresize(const value_type& __obj);
iterator
insert_equal_noresize(const value_type& __obj);
template <class _InputIterator> template <class _InputIterator>
void insert_unique(_InputIterator __f, _InputIterator __l) void
{ insert_unique(_InputIterator __f, _InputIterator __l)
insert_unique(__f, __l, __iterator_category(__f)); { insert_unique(__f, __l, __iterator_category(__f)); }
}
template <class _InputIterator> template <class _InputIterator>
void insert_equal(_InputIterator __f, _InputIterator __l) void
{ insert_equal(_InputIterator __f, _InputIterator __l)
insert_equal(__f, __l, __iterator_category(__f)); { insert_equal(__f, __l, __iterator_category(__f)); }
}
template <class _InputIterator> template <class _InputIterator>
void insert_unique(_InputIterator __f, _InputIterator __l, void
insert_unique(_InputIterator __f, _InputIterator __l,
input_iterator_tag) input_iterator_tag)
{ {
for ( ; __f != __l; ++__f) for ( ; __f != __l; ++__f)
...@@ -413,7 +473,8 @@ public: ...@@ -413,7 +473,8 @@ public:
} }
template <class _InputIterator> template <class _InputIterator>
void insert_equal(_InputIterator __f, _InputIterator __l, void
insert_equal(_InputIterator __f, _InputIterator __l,
input_iterator_tag) input_iterator_tag)
{ {
for ( ; __f != __l; ++__f) for ( ; __f != __l; ++__f)
...@@ -421,7 +482,8 @@ public: ...@@ -421,7 +482,8 @@ public:
} }
template <class _ForwardIterator> template <class _ForwardIterator>
void insert_unique(_ForwardIterator __f, _ForwardIterator __l, void
insert_unique(_ForwardIterator __f, _ForwardIterator __l,
forward_iterator_tag) forward_iterator_tag)
{ {
size_type __n = distance(__f, __l); size_type __n = distance(__f, __l);
...@@ -431,7 +493,8 @@ public: ...@@ -431,7 +493,8 @@ public:
} }
template <class _ForwardIterator> template <class _ForwardIterator>
void insert_equal(_ForwardIterator __f, _ForwardIterator __l, void
insert_equal(_ForwardIterator __f, _ForwardIterator __l,
forward_iterator_tag) forward_iterator_tag)
{ {
size_type __n = distance(__f, __l); size_type __n = distance(__f, __l);
...@@ -440,36 +503,41 @@ public: ...@@ -440,36 +503,41 @@ public:
insert_equal_noresize(*__f); insert_equal_noresize(*__f);
} }
reference find_or_insert(const value_type& __obj); reference
find_or_insert(const value_type& __obj);
iterator find(const key_type& __key) iterator
find(const key_type& __key)
{ {
size_type __n = _M_bkt_num_key(__key); size_type __n = _M_bkt_num_key(__key);
_Node* __first; _Node* __first;
for ( __first = _M_buckets[__n]; for (__first = _M_buckets[__n];
__first && !_M_equals(_M_get_key(__first->_M_val), __key); __first && !_M_equals(_M_get_key(__first->_M_val), __key);
__first = __first->_M_next) __first = __first->_M_next)
{} {}
return iterator(__first, this); return iterator(__first, this);
} }
const_iterator find(const key_type& __key) const const_iterator
find(const key_type& __key) const
{ {
size_type __n = _M_bkt_num_key(__key); size_type __n = _M_bkt_num_key(__key);
const _Node* __first; const _Node* __first;
for ( __first = _M_buckets[__n]; for (__first = _M_buckets[__n];
__first && !_M_equals(_M_get_key(__first->_M_val), __key); __first && !_M_equals(_M_get_key(__first->_M_val), __key);
__first = __first->_M_next) __first = __first->_M_next)
{} {}
return const_iterator(__first, this); return const_iterator(__first, this);
} }
size_type count(const key_type& __key) const size_type
count(const key_type& __key) const
{ {
const size_type __n = _M_bkt_num_key(__key); const size_type __n = _M_bkt_num_key(__key);
size_type __result = 0; size_type __result = 0;
for (const _Node* __cur = _M_buckets[__n]; __cur; __cur = __cur->_M_next) for (const _Node* __cur = _M_buckets[__n]; __cur;
__cur = __cur->_M_next)
if (_M_equals(_M_get_key(__cur->_M_val), __key)) if (_M_equals(_M_get_key(__cur->_M_val), __key))
++__result; ++__result;
return __result; return __result;
...@@ -481,21 +549,34 @@ public: ...@@ -481,21 +549,34 @@ public:
pair<const_iterator, const_iterator> pair<const_iterator, const_iterator>
equal_range(const key_type& __key) const; equal_range(const key_type& __key) const;
size_type erase(const key_type& __key); size_type
void erase(const iterator& __it); erase(const key_type& __key);
void erase(iterator __first, iterator __last);
void
erase(const iterator& __it);
void
erase(iterator __first, iterator __last);
void erase(const const_iterator& __it); void
void erase(const_iterator __first, const_iterator __last); erase(const const_iterator& __it);
void resize(size_type __num_elements_hint); void
void clear(); erase(const_iterator __first, const_iterator __last);
private: void
size_type _M_next_size(size_type __n) const resize(size_type __num_elements_hint);
void
clear();
private:
size_type
_M_next_size(size_type __n) const
{ return __stl_next_prime(__n); } { return __stl_next_prime(__n); }
void _M_initialize_buckets(size_type __n) void
_M_initialize_buckets(size_type __n)
{ {
const size_type __n_buckets = _M_next_size(__n); const size_type __n_buckets = _M_next_size(__n);
_M_buckets.reserve(__n_buckets); _M_buckets.reserve(__n_buckets);
...@@ -503,31 +584,29 @@ private: ...@@ -503,31 +584,29 @@ private:
_M_num_elements = 0; _M_num_elements = 0;
} }
size_type _M_bkt_num_key(const key_type& __key) const size_type
{ _M_bkt_num_key(const key_type& __key) const
return _M_bkt_num_key(__key, _M_buckets.size()); { return _M_bkt_num_key(__key, _M_buckets.size()); }
}
size_type _M_bkt_num(const value_type& __obj) const size_type
{ _M_bkt_num(const value_type& __obj) const
return _M_bkt_num_key(_M_get_key(__obj)); { return _M_bkt_num_key(_M_get_key(__obj)); }
}
size_type _M_bkt_num_key(const key_type& __key, size_t __n) const size_type
{ _M_bkt_num_key(const key_type& __key, size_t __n) const
return _M_hash(__key) % __n; { return _M_hash(__key) % __n; }
}
size_type _M_bkt_num(const value_type& __obj, size_t __n) const size_type
{ _M_bkt_num(const value_type& __obj, size_t __n) const
return _M_bkt_num_key(_M_get_key(__obj), __n); { return _M_bkt_num_key(_M_get_key(__obj), __n); }
}
_Node* _M_new_node(const value_type& __obj) _Node*
_M_new_node(const value_type& __obj)
{ {
_Node* __n = _M_get_node(); _Node* __n = _M_get_node();
__n->_M_next = 0; __n->_M_next = 0;
try { try
{
_Construct(&__n->_M_val, __obj); _Construct(&__n->_M_val, __obj);
return __n; return __n;
} }
...@@ -538,87 +617,102 @@ private: ...@@ -538,87 +617,102 @@ private:
} }
} }
void _M_delete_node(_Node* __n) void
_M_delete_node(_Node* __n)
{ {
_Destroy(&__n->_M_val); _Destroy(&__n->_M_val);
_M_put_node(__n); _M_put_node(__n);
} }
void _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last); void
void _M_erase_bucket(const size_type __n, _Node* __last); _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last);
void _M_copy_from(const hashtable& __ht); void
_M_erase_bucket(const size_type __n, _Node* __last);
}; void
_M_copy_from(const hashtable& __ht);
};
template <class _Val, class _Key, class _HF, class _ExK, class _EqK, template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
class _All> class _All>
_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++() _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
{ operator++()
{
const _Node* __old = _M_cur; const _Node* __old = _M_cur;
_M_cur = _M_cur->_M_next; _M_cur = _M_cur->_M_next;
if (!_M_cur) { if (!_M_cur)
{
size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val); size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size()) while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
_M_cur = _M_ht->_M_buckets[__bucket]; _M_cur = _M_ht->_M_buckets[__bucket];
} }
return *this; return *this;
} }
template <class _Val, class _Key, class _HF, class _ExK, class _EqK, template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
class _All> class _All>
inline _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> inline _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++(int) _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
{ operator++(int)
{
iterator __tmp = *this; iterator __tmp = *this;
++*this; ++*this;
return __tmp; return __tmp;
} }
template <class _Val, class _Key, class _HF, class _ExK, class _EqK, template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
class _All> class _All>
_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++() _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
{ operator++()
{
const _Node* __old = _M_cur; const _Node* __old = _M_cur;
_M_cur = _M_cur->_M_next; _M_cur = _M_cur->_M_next;
if (!_M_cur) { if (!_M_cur)
{
size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val); size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size()) while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
_M_cur = _M_ht->_M_buckets[__bucket]; _M_cur = _M_ht->_M_buckets[__bucket];
} }
return *this; return *this;
} }
template <class _Val, class _Key, class _HF, class _ExK, class _EqK, template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
class _All> class _All>
inline _Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> inline _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++(int) _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
{ operator++(int)
{
const_iterator __tmp = *this; const_iterator __tmp = *this;
++*this; ++*this;
return __tmp; return __tmp;
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
bool
operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
{
typedef typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_Node _Node;
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2)
{
typedef typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::_Node _Node;
if (__ht1._M_buckets.size() != __ht2._M_buckets.size()) if (__ht1._M_buckets.size() != __ht2._M_buckets.size())
return false; return false;
for (size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n) {
for (size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n)
{
_Node* __cur1 = __ht1._M_buckets[__n]; _Node* __cur1 = __ht1._M_buckets[__n];
_Node* __cur2 = __ht2._M_buckets[__n]; _Node* __cur2 = __ht2._M_buckets[__n];
// Check same length of lists // Check same length of lists
for ( ; __cur1 && __cur2; for (; __cur1 && __cur2;
__cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next) __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
{} {}
if (__cur1 || __cur2) if (__cur1 || __cur2)
return false; return false;
// Now check one's elements are in the other // Now check one's elements are in the other
for (__cur1 = __ht1._M_buckets[__n] ; __cur1; __cur1 = __cur1->_M_next) for (__cur1 = __ht1._M_buckets[__n] ; __cur1;
__cur1 = __cur1->_M_next)
{ {
bool _found__cur1 = false; bool _found__cur1 = false;
for (_Node* __cur2 = __ht2._M_buckets[__n]; for (_Node* __cur2 = __ht2._M_buckets[__n];
...@@ -635,27 +729,26 @@ bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1, ...@@ -635,27 +729,26 @@ bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
} }
} }
return true; return true;
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
inline bool operator!=(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1, inline bool
const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2) { operator!=(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
return !(__ht1 == __ht2); const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
} { return !(__ht1 == __ht2); }
template <class _Val, class _Key, class _HF, class _Extract, class _EqKey, template <class _Val, class _Key, class _HF, class _Extract, class _EqKey,
class _All> class _All>
inline void swap(hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht1, inline void
hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht2) { swap(hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht1,
__ht1.swap(__ht2); hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht2)
} { __ht1.swap(__ht2); }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator, bool>
pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator, bool> hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> insert_unique_noresize(const value_type& __obj)
::insert_unique_noresize(const value_type& __obj) {
{
const size_type __n = _M_bkt_num(__obj); const size_type __n = _M_bkt_num(__obj);
_Node* __first = _M_buckets[__n]; _Node* __first = _M_buckets[__n];
...@@ -668,18 +761,19 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -668,18 +761,19 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
_M_buckets[__n] = __tmp; _M_buckets[__n] = __tmp;
++_M_num_elements; ++_M_num_elements;
return pair<iterator, bool>(iterator(__tmp, this), true); return pair<iterator, bool>(iterator(__tmp, this), true);
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
::insert_equal_noresize(const value_type& __obj) insert_equal_noresize(const value_type& __obj)
{ {
const size_type __n = _M_bkt_num(__obj); const size_type __n = _M_bkt_num(__obj);
_Node* __first = _M_buckets[__n]; _Node* __first = _M_buckets[__n];
for (_Node* __cur = __first; __cur; __cur = __cur->_M_next) for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj))) { if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
{
_Node* __tmp = _M_new_node(__obj); _Node* __tmp = _M_new_node(__obj);
__tmp->_M_next = __cur->_M_next; __tmp->_M_next = __cur->_M_next;
__cur->_M_next = __tmp; __cur->_M_next = __tmp;
...@@ -692,12 +786,13 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -692,12 +786,13 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
_M_buckets[__n] = __tmp; _M_buckets[__n] = __tmp;
++_M_num_elements; ++_M_num_elements;
return iterator(__tmp, this); return iterator(__tmp, this);
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::reference typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::reference
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::find_or_insert(const value_type& __obj) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ find_or_insert(const value_type& __obj)
{
resize(_M_num_elements + 1); resize(_M_num_elements + 1);
size_type __n = _M_bkt_num(__obj); size_type __n = _M_bkt_num(__obj);
...@@ -712,19 +807,23 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::find_or_insert(const value_type& __obj) ...@@ -712,19 +807,23 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::find_or_insert(const value_type& __obj)
_M_buckets[__n] = __tmp; _M_buckets[__n] = __tmp;
++_M_num_elements; ++_M_num_elements;
return __tmp->_M_val; return __tmp->_M_val;
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator, pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator,
typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator> typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator>
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::equal_range(const key_type& __key) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ equal_range(const key_type& __key)
{
typedef pair<iterator, iterator> _Pii; typedef pair<iterator, iterator> _Pii;
const size_type __n = _M_bkt_num_key(__key); const size_type __n = _M_bkt_num_key(__key);
for (_Node* __first = _M_buckets[__n]; __first; __first = __first->_M_next) for (_Node* __first = _M_buckets[__n]; __first;
if (_M_equals(_M_get_key(__first->_M_val), __key)) { __first = __first->_M_next)
for (_Node* __cur = __first->_M_next; __cur; __cur = __cur->_M_next) if (_M_equals(_M_get_key(__first->_M_val), __key))
{
for (_Node* __cur = __first->_M_next; __cur;
__cur = __cur->_M_next)
if (!_M_equals(_M_get_key(__cur->_M_val), __key)) if (!_M_equals(_M_get_key(__cur->_M_val), __key))
return _Pii(iterator(__first, this), iterator(__cur, this)); return _Pii(iterator(__first, this), iterator(__cur, this));
for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m) for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
...@@ -734,23 +833,23 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::equal_range(const key_type& __key) ...@@ -734,23 +833,23 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::equal_range(const key_type& __key)
return _Pii(iterator(__first, this), end()); return _Pii(iterator(__first, this), end());
} }
return _Pii(end(), end()); return _Pii(end(), end());
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::const_iterator, pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator,
typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::const_iterator> typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator>
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
::equal_range(const key_type& __key) const equal_range(const key_type& __key) const
{ {
typedef pair<const_iterator, const_iterator> _Pii; typedef pair<const_iterator, const_iterator> _Pii;
const size_type __n = _M_bkt_num_key(__key); const size_type __n = _M_bkt_num_key(__key);
for (const _Node* __first = _M_buckets[__n] ; for (const _Node* __first = _M_buckets[__n]; __first;
__first; __first = __first->_M_next)
__first = __first->_M_next) { {
if (_M_equals(_M_get_key(__first->_M_val), __key)) { if (_M_equals(_M_get_key(__first->_M_val), __key))
for (const _Node* __cur = __first->_M_next; {
__cur; for (const _Node* __cur = __first->_M_next; __cur;
__cur = __cur->_M_next) __cur = __cur->_M_next)
if (!_M_equals(_M_get_key(__cur->_M_val), __key)) if (!_M_equals(_M_get_key(__cur->_M_val), __key))
return _Pii(const_iterator(__first, this), return _Pii(const_iterator(__first, this),
...@@ -763,33 +862,39 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -763,33 +862,39 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
} }
} }
return _Pii(end(), end()); return _Pii(end(), end());
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::size_type typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::size_type
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const key_type& __key) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ erase(const key_type& __key)
{
const size_type __n = _M_bkt_num_key(__key); const size_type __n = _M_bkt_num_key(__key);
_Node* __first = _M_buckets[__n]; _Node* __first = _M_buckets[__n];
size_type __erased = 0; size_type __erased = 0;
if (__first) { if (__first)
{
_Node* __cur = __first; _Node* __cur = __first;
_Node* __next = __cur->_M_next; _Node* __next = __cur->_M_next;
while (__next) { while (__next)
if (_M_equals(_M_get_key(__next->_M_val), __key)) { {
if (_M_equals(_M_get_key(__next->_M_val), __key))
{
__cur->_M_next = __next->_M_next; __cur->_M_next = __next->_M_next;
_M_delete_node(__next); _M_delete_node(__next);
__next = __cur->_M_next; __next = __cur->_M_next;
++__erased; ++__erased;
--_M_num_elements; --_M_num_elements;
} }
else { else
{
__cur = __next; __cur = __next;
__next = __cur->_M_next; __next = __cur->_M_next;
} }
} }
if (_M_equals(_M_get_key(__first->_M_val), __key)) { if (_M_equals(_M_get_key(__first->_M_val), __key))
{
_M_buckets[__n] = __first->_M_next; _M_buckets[__n] = __first->_M_next;
_M_delete_node(__first); _M_delete_node(__first);
++__erased; ++__erased;
...@@ -797,94 +902,110 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const key_type& __key) ...@@ -797,94 +902,110 @@ hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const key_type& __key)
} }
} }
return __erased; return __erased;
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const iterator& __it) void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ erase(const iterator& __it)
{
_Node* __p = __it._M_cur; _Node* __p = __it._M_cur;
if (__p) { if (__p)
{
const size_type __n = _M_bkt_num(__p->_M_val); const size_type __n = _M_bkt_num(__p->_M_val);
_Node* __cur = _M_buckets[__n]; _Node* __cur = _M_buckets[__n];
if (__cur == __p) { if (__cur == __p)
{
_M_buckets[__n] = __cur->_M_next; _M_buckets[__n] = __cur->_M_next;
_M_delete_node(__cur); _M_delete_node(__cur);
--_M_num_elements; --_M_num_elements;
} }
else { else
{
_Node* __next = __cur->_M_next; _Node* __next = __cur->_M_next;
while (__next) { while (__next)
if (__next == __p) { {
if (__next == __p)
{
__cur->_M_next = __next->_M_next; __cur->_M_next = __next->_M_next;
_M_delete_node(__next); _M_delete_node(__next);
--_M_num_elements; --_M_num_elements;
break; break;
} }
else { else
{
__cur = __next; __cur = __next;
__next = __cur->_M_next; __next = __cur->_M_next;
} }
} }
} }
} }
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> void
::erase(iterator __first, iterator __last) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ erase(iterator __first, iterator __last)
size_type __f_bucket = __first._M_cur ? {
_M_bkt_num(__first._M_cur->_M_val) : _M_buckets.size(); size_type __f_bucket = __first._M_cur ? _M_bkt_num(__first._M_cur->_M_val)
size_type __l_bucket = __last._M_cur ? : _M_buckets.size();
_M_bkt_num(__last._M_cur->_M_val) : _M_buckets.size();
size_type __l_bucket = __last._M_cur ? _M_bkt_num(__last._M_cur->_M_val)
: _M_buckets.size();
if (__first._M_cur == __last._M_cur) if (__first._M_cur == __last._M_cur)
return; return;
else if (__f_bucket == __l_bucket) else if (__f_bucket == __l_bucket)
_M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur); _M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur);
else { else
{
_M_erase_bucket(__f_bucket, __first._M_cur, 0); _M_erase_bucket(__f_bucket, __first._M_cur, 0);
for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n) for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n)
_M_erase_bucket(__n, 0); _M_erase_bucket(__n, 0);
if (__l_bucket != _M_buckets.size()) if (__l_bucket != _M_buckets.size())
_M_erase_bucket(__l_bucket, __last._M_cur); _M_erase_bucket(__l_bucket, __last._M_cur);
} }
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
inline void inline void
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const_iterator __first, hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
const_iterator __last) erase(const_iterator __first, const_iterator __last)
{ {
erase(iterator(const_cast<_Node*>(__first._M_cur), erase(iterator(const_cast<_Node*>(__first._M_cur),
const_cast<hashtable*>(__first._M_ht)), const_cast<hashtable*>(__first._M_ht)),
iterator(const_cast<_Node*>(__last._M_cur), iterator(const_cast<_Node*>(__last._M_cur),
const_cast<hashtable*>(__last._M_ht))); const_cast<hashtable*>(__last._M_ht)));
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
inline void inline void
hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const const_iterator& __it) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ erase(const const_iterator& __it)
erase(iterator(const_cast<_Node*>(__it._M_cur), { erase(iterator(const_cast<_Node*>(__it._M_cur),
const_cast<hashtable*>(__it._M_ht))); const_cast<hashtable*>(__it._M_ht))); }
}
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> void
::resize(size_type __num_elements_hint) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ resize(size_type __num_elements_hint)
{
const size_type __old_n = _M_buckets.size(); const size_type __old_n = _M_buckets.size();
if (__num_elements_hint > __old_n) { if (__num_elements_hint > __old_n)
{
const size_type __n = _M_next_size(__num_elements_hint); const size_type __n = _M_next_size(__num_elements_hint);
if (__n > __old_n) { if (__n > __old_n)
{
_Vector_type __tmp(__n, (_Node*)(0), _M_buckets.get_allocator()); _Vector_type __tmp(__n, (_Node*)(0), _M_buckets.get_allocator());
try { try
for (size_type __bucket = 0; __bucket < __old_n; ++__bucket) { {
for (size_type __bucket = 0; __bucket < __old_n; ++__bucket)
{
_Node* __first = _M_buckets[__bucket]; _Node* __first = _M_buckets[__bucket];
while (__first) { while (__first)
size_type __new_bucket = _M_bkt_num(__first->_M_val, __n); {
size_type __new_bucket = _M_bkt_num(__first->_M_val,
__n);
_M_buckets[__bucket] = __first->_M_next; _M_buckets[__bucket] = __first->_M_next;
__first->_M_next = __tmp[__new_bucket]; __first->_M_next = __tmp[__new_bucket];
__tmp[__new_bucket] = __first; __tmp[__new_bucket] = __first;
...@@ -893,9 +1014,13 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -893,9 +1014,13 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
} }
_M_buckets.swap(__tmp); _M_buckets.swap(__tmp);
} }
catch(...) { catch(...)
for (size_type __bucket = 0; __bucket < __tmp.size(); ++__bucket) { {
while (__tmp[__bucket]) { for (size_type __bucket = 0; __bucket < __tmp.size();
++__bucket)
{
while (__tmp[__bucket])
{
_Node* __next = __tmp[__bucket]->_M_next; _Node* __next = __tmp[__bucket]->_M_next;
_M_delete_node(__tmp[__bucket]); _M_delete_node(__tmp[__bucket]);
__tmp[__bucket] = __next; __tmp[__bucket] = __next;
...@@ -905,50 +1030,59 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -905,50 +1030,59 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
} }
} }
} }
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> void
::_M_erase_bucket(const size_type __n, _Node* __first, _Node* __last) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last)
{
_Node* __cur = _M_buckets[__n]; _Node* __cur = _M_buckets[__n];
if (__cur == __first) if (__cur == __first)
_M_erase_bucket(__n, __last); _M_erase_bucket(__n, __last);
else { else
{
_Node* __next; _Node* __next;
for (__next = __cur->_M_next; for (__next = __cur->_M_next;
__next != __first; __next != __first;
__cur = __next, __next = __cur->_M_next) __cur = __next, __next = __cur->_M_next)
; ;
while (__next != __last) { while (__next != __last)
{
__cur->_M_next = __next->_M_next; __cur->_M_next = __next->_M_next;
_M_delete_node(__next); _M_delete_node(__next);
__next = __cur->_M_next; __next = __cur->_M_next;
--_M_num_elements; --_M_num_elements;
} }
} }
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> void
::_M_erase_bucket(const size_type __n, _Node* __last) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ _M_erase_bucket(const size_type __n, _Node* __last)
{
_Node* __cur = _M_buckets[__n]; _Node* __cur = _M_buckets[__n];
while (__cur != __last) { while (__cur != __last)
{
_Node* __next = __cur->_M_next; _Node* __next = __cur->_M_next;
_M_delete_node(__cur); _M_delete_node(__cur);
__cur = __next; __cur = __next;
_M_buckets[__n] = __cur; _M_buckets[__n] = __cur;
--_M_num_elements; --_M_num_elements;
} }
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::clear() void
{ hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
for (size_type __i = 0; __i < _M_buckets.size(); ++__i) { clear()
{
for (size_type __i = 0; __i < _M_buckets.size(); ++__i)
{
_Node* __cur = _M_buckets[__i]; _Node* __cur = _M_buckets[__i];
while (__cur != 0) { while (__cur != 0)
{
_Node* __next = __cur->_M_next; _Node* __next = __cur->_M_next;
_M_delete_node(__cur); _M_delete_node(__cur);
__cur = __next; __cur = __next;
...@@ -956,26 +1090,29 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::clear() ...@@ -956,26 +1090,29 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::clear()
_M_buckets[__i] = 0; _M_buckets[__i] = 0;
} }
_M_num_elements = 0; _M_num_elements = 0;
} }
template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All> template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> void
::_M_copy_from(const hashtable& __ht) hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
{ _M_copy_from(const hashtable& __ht)
{
_M_buckets.clear(); _M_buckets.clear();
_M_buckets.reserve(__ht._M_buckets.size()); _M_buckets.reserve(__ht._M_buckets.size());
_M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (_Node*) 0); _M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (_Node*) 0);
try { try
{
for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) { for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) {
const _Node* __cur = __ht._M_buckets[__i]; const _Node* __cur = __ht._M_buckets[__i];
if (__cur) { if (__cur)
{
_Node* __local_copy = _M_new_node(__cur->_M_val); _Node* __local_copy = _M_new_node(__cur->_M_val);
_M_buckets[__i] = __local_copy; _M_buckets[__i] = __local_copy;
for (_Node* __next = __cur->_M_next; for (_Node* __next = __cur->_M_next;
__next; __next;
__cur = __next, __next = __cur->_M_next) { __cur = __next, __next = __cur->_M_next)
{
__local_copy->_M_next = _M_new_node(__next->_M_val); __local_copy->_M_next = _M_new_node(__next->_M_val);
__local_copy = __local_copy->_M_next; __local_copy = __local_copy->_M_next;
} }
...@@ -988,7 +1125,7 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> ...@@ -988,7 +1125,7 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
clear(); clear();
__throw_exception_again; __throw_exception_again;
} }
} }
} // namespace __gnu_cxx } // namespace __gnu_cxx
#endif #endif
libstdc++-v3/include/ext/rb_tree
// rb_tree extension -*- C++ -*- // rb_tree extension -*- C++ -*-
// Copyright (C) 2002 Free Software Foundation, Inc. // Copyright (C) 2002, 2003, 2004 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
...@@ -81,7 +81,8 @@ namespace __gnu_cxx ...@@ -81,7 +81,8 @@ namespace __gnu_cxx
*/ */
template <class _Key, class _Value, class _KeyOfValue, class _Compare, template <class _Key, class _Value, class _KeyOfValue, class _Compare,
class _Alloc = allocator<_Value> > class _Alloc = allocator<_Value> >
struct rb_tree : public _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> struct rb_tree
: public _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>
{ {
typedef _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Base; typedef _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Base;
typedef typename _Base::allocator_type allocator_type; typedef typename _Base::allocator_type allocator_type;
......
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