From ec5537cc331492bb5a4a76828d6d02808579dc31 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 27 Jun 2005 16:35:49 +0000 Subject: [PATCH] re PR libstdc++/22102 ([DR233] Implement resolution of DR 233) 2005-06-27 Paolo Carlini PR libstdc++/22102 * include/bits/stl_tree.h (insert_unique(iterator, const _Val&), insert_equal((iterator, const _Val&)): Reimplement to check both before and after, as per the algorithm "ignore hint if wrong" of ISO paper N1780. From-SVN: r101355 --- libstdc++-v3/ChangeLog | 8 +++ libstdc++-v3/include/bits/stl_tree.h | 75 +++++++++++++++++++++------- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9d28642ea7d..45b0fc5a5c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2005-06-27 Paolo Carlini + + PR libstdc++/22102 + * include/bits/stl_tree.h (insert_unique(iterator, const _Val&), + insert_equal((iterator, const _Val&)): Reimplement to check both + before and after, as per the algorithm "ignore hint if wrong" of + ISO paper N1780. + 2005-06-27 Benjamin Kosnik Ami Tavory diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index c5145636075..91f9f906b3c 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -893,8 +893,8 @@ namespace std _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: insert_unique(iterator __position, const _Val& __v) { - if (__position._M_node == _M_end() - || __position._M_node == _M_rightmost()) + // end() + if (__position._M_node == _M_end()) { if (size() > 0 && _M_impl._M_key_compare(_S_key(_M_rightmost()), @@ -903,24 +903,45 @@ namespace std else return insert_unique(__v).first; } - else + else if (_M_impl._M_key_compare(_KeyOfValue()(__v), + _S_key(__position._M_node))) { + // First, try before... + iterator __before = __position; + if (__position._M_node == _M_leftmost()) // begin() + return _M_insert(_M_leftmost(), _M_leftmost(), __v); + else if (_M_impl._M_key_compare(_S_key((--__before)._M_node), + _KeyOfValue()(__v))) + { + if (_S_right(__before._M_node) == 0) + return _M_insert(0, __before._M_node, __v); + else + return _M_insert(__position._M_node, + __position._M_node, __v); + } + else + return insert_unique(__v).first; + } + else if (_M_impl._M_key_compare(_S_key(__position._M_node), + _KeyOfValue()(__v))) + { + // ... then try after. iterator __after = __position; - ++__after; - if (_M_impl._M_key_compare(_S_key(__position._M_node), - _KeyOfValue()(__v)) - && _M_impl._M_key_compare(_KeyOfValue()(__v), - _S_key(__after._M_node))) + if (__position._M_node == _M_rightmost()) + return _M_insert(0, _M_rightmost(), __v); + else if (_M_impl._M_key_compare(_KeyOfValue()(__v), + _S_key((++__after)._M_node))) { if (_S_right(__position._M_node) == 0) return _M_insert(0, __position._M_node, __v); else return _M_insert(__after._M_node, __after._M_node, __v); - // First argument just needs to be non-null. } else return insert_unique(__v).first; } + else + return __position; // Equivalent keys. } template:: insert_equal(iterator __position, const _Val& __v) { - if (__position._M_node == _M_end() - || __position._M_node == _M_rightmost()) + // end() + if (__position._M_node == _M_end()) { if (size() > 0 - && !_M_impl._M_key_compare(_KeyOfValue()(__v), + && !_M_impl._M_key_compare(_KeyOfValue()(__v), _S_key(_M_rightmost()))) return _M_insert(0, _M_rightmost(), __v); else return insert_equal(__v); } + else if (!_M_impl._M_key_compare(_S_key(__position._M_node), + _KeyOfValue()(__v))) + { + // First, try before... + iterator __before = __position; + if (__position._M_node == _M_leftmost()) // begin() + return _M_insert(_M_leftmost(), _M_leftmost(), __v); + else if (!_M_impl._M_key_compare(_KeyOfValue()(__v), + _S_key((--__before)._M_node))) + { + if (_S_right(__before._M_node) == 0) + return _M_insert(0, __before._M_node, __v); + else + return _M_insert(__position._M_node, + __position._M_node, __v); + } + else + return insert_equal(__v); + } else { + // ... then try after. iterator __after = __position; - ++__after; - if (!_M_impl._M_key_compare(_KeyOfValue()(__v), - _S_key(__position._M_node)) - && !_M_impl._M_key_compare(_S_key(__after._M_node), - _KeyOfValue()(__v))) + if (__position._M_node == _M_rightmost()) + return _M_insert(0, _M_rightmost(), __v); + else if (!_M_impl._M_key_compare(_S_key((++__after)._M_node), + _KeyOfValue()(__v))) { if (_S_right(__position._M_node) == 0) return _M_insert(0, __position._M_node, __v); else return _M_insert(__after._M_node, __after._M_node, __v); - // First argument just needs to be non-null. } else return insert_equal(__v);