BlackMATov/flat.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/flat.hpp.git synced 2025-12-15 10:16:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

add try_emplace and insert_or_assign functions #27

Browse Source
This commit is contained in:
Matvey Cherevko
2019-06-03 00:12:40 +07:00
parent 8237a106ea
commit d7ecb21109
3 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -477,6 +477,11 @@ std::pair<iterator, bool> insert(const value_type& value);
iterator insert(const_iterator hint, value_type&& value); iterator insert(const_iterator hint, value_type&& value);
iterator insert(const_iterator hint, const value_type& value); iterator insert(const_iterator hint, const value_type& value);
template < typename TT >
std::pair<iterator, bool> insert_or_assign(key_type&& key, TT&& value);
template < typename TT >
std::pair<iterator, bool> insert_or_assign(const key_type& key, TT&& value);
template < typename InputIter > template < typename InputIter >
void insert(InputIter first, InputIter last); void insert(InputIter first, InputIter last);
template < typename InputIter > template < typename InputIter >
@@ -490,6 +495,11 @@ std::pair<iterator, bool> emplace(Args&&... args);
template < typename... Args > template < typename... Args >
iterator emplace_hint(const_iterator hint, Args&&... args); iterator emplace_hint(const_iterator hint, Args&&... args);
template < typename... Args >
std::pair<iterator, bool> try_emplace(key_type&& key, Args&&... args);
template < typename... Args >
std::pair<iterator, bool> try_emplace(const key_type& key, Args&&... args);
void clear(); void clear();
iterator erase(const_iterator iter); iterator erase(const_iterator iter);
iterator erase(const_iterator first, const_iterator last); iterator erase(const_iterator first, const_iterator last);

42
headers/flat.hpp/flat_map.hpp
View File

@@ -399,6 +399,28 @@ namespace flat_hpp
: insert(value).first; : insert(value).first;
} }
template < typename TT >
std::pair<iterator, bool> insert_or_assign(key_type&& key, TT&& value) {
iterator iter = lower_bound(key);
if ( iter == end() || this->operator()(key, *iter) ) {
iter = emplace_hint(iter, std::move(key), std::forward<TT>(value));
return {iter, true};
}
(*iter).second = std::forward<TT>(value);
return {iter, false};
}
template < typename TT >
std::pair<iterator, bool> insert_or_assign(const key_type& key, TT&& value) {
iterator iter = lower_bound(key);
if ( iter == end() || this->operator()(key, *iter) ) {
iter = emplace_hint(iter, key, std::forward<TT>(value));
return {iter, true};
}
(*iter).second = std::forward<TT>(value);
return {iter, false};
}
template < typename InputIter > template < typename InputIter >
void insert(InputIter first, InputIter last) { void insert(InputIter first, InputIter last) {
insert_range_(first, last); insert_range_(first, last);
@@ -427,6 +449,26 @@ namespace flat_hpp
return insert(hint, value_type(std::forward<Args>(args)...)); return insert(hint, value_type(std::forward<Args>(args)...));
} }
template < typename... Args >
std::pair<iterator, bool> try_emplace(key_type&& key, Args&&... args) {
iterator iter = lower_bound(key);
if ( iter == end() || this->operator()(key, *iter) ) {
iter = emplace_hint(iter, std::move(key), std::forward<Args>(args)...);
return {iter, true};
}
return {iter, false};
}
template < typename... Args >
std::pair<iterator, bool> try_emplace(const key_type& key, Args&&... args) {
iterator iter = lower_bound(key);
if ( iter == end() || this->operator()(key, *iter) ) {
iter = emplace_hint(iter, key, std::forward<Args>(args)...);
return {iter, true};
}
return {iter, false};
}
void clear() void clear()
noexcept(noexcept(std::declval<container_type&>().clear())) { noexcept(noexcept(std::declval<container_type&>().clear())) {
data_.clear(); data_.clear();

28
untests/flat_map_tests.cpp
View File

@@ -369,6 +369,34 @@ TEST_CASE("flat_map") {
s1.insert(sorted_range, {{1,3},{2,2},{2,2},{3,1}}); s1.insert(sorted_range, {{1,3},{2,2},{2,2},{3,1}});
REQUIRE(s1 == map_t{{1,3},{2,2},{3,1}}); REQUIRE(s1 == map_t{{1,3},{2,2},{3,1}});
} }
{
map_t s0;
auto i0 = s0.insert_or_assign(1, 4);
REQUIRE(i0 == std::make_pair(s0.begin(), true));
REQUIRE(s0 == map_t{{1,4}});
auto i1 = s0.insert_or_assign(1, 8);
REQUIRE(i1 == std::make_pair(s0.begin(), false));
REQUIRE(s0 == map_t{{1,8}});
const obj_t k0{2};
auto i2 = s0.insert_or_assign(k0, 6);
REQUIRE(i2 == std::make_pair(s0.begin() + 1, true));
REQUIRE(s0 == map_t{{1,8}, {2,6}});
auto i3 = s0.insert_or_assign(k0, 2);
REQUIRE(i3 == std::make_pair(s0.begin() + 1, false));
REQUIRE(s0 == map_t{{1,8}, {2,2}});
}
{
map_t s0;
auto i0 = s0.try_emplace(1, 4);
REQUIRE(i0 == std::make_pair(s0.begin(), true));
REQUIRE(s0 == map_t{{1,4}});
auto i1 = s0.try_emplace(1, 8);
REQUIRE(i1 == std::make_pair(s0.begin(), false));
REQUIRE(s0 == map_t{{1,4}});
}
} }
SECTION("erasers") { SECTION("erasers") {
using map_t = flat_map<int, unsigned>; using map_t = flat_map<int, unsigned>;