diff options
| -rw-r--r-- | common/hashmap.h | 18 | ||||
| -rw-r--r-- | test/common/hashmap.h | 29 |
2 files changed, 47 insertions, 0 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index 81a136f671..b645a37b01 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -240,6 +240,7 @@ public: void clear(bool shrinkArray = 0); + void erase(iterator entry); void erase(const Key &key); uint size() const { return _size; } @@ -591,6 +592,23 @@ void HashMap<Key, Val, HashFunc, EqualFunc>::setVal(const Key &key, const Val &v } template<class Key, class Val, class HashFunc, class EqualFunc> +void HashMap<Key, Val, HashFunc, EqualFunc>::erase(iterator entry) { + // Check whether we have a valid iterator + assert(entry._hashmap == this); + const uint ctr = entry._idx; + assert(ctr <= _mask); + Node * const node = _storage[ctr]; + assert(node != NULL); + assert(node != HASHMAP_DUMMY_NODE); + + // If we remove a key, we replace it with a dummy node. + freeNode(node); + _storage[ctr] = HASHMAP_DUMMY_NODE; + _size--; + _deleted++; +} + +template<class Key, class Val, class HashFunc, class EqualFunc> void HashMap<Key, Val, HashFunc, EqualFunc>::erase(const Key &key) { uint ctr = lookup(key); diff --git a/test/common/hashmap.h b/test/common/hashmap.h index b90d91467c..f54c65b801 100644 --- a/test/common/hashmap.h +++ b/test/common/hashmap.h @@ -71,6 +71,35 @@ class HashMapTestSuite : public CxxTest::TestSuite TS_ASSERT(container.empty()); } + void test_add_remove_iterator() { + Common::HashMap<int, int> container; + container[0] = 17; + container[1] = 33; + container[2] = 45; + container[3] = 12; + container[4] = 96; + TS_ASSERT(container.contains(1)); + container.erase(container.find(1)); + TS_ASSERT(!container.contains(1)); + container[1] = 42; + TS_ASSERT(container.contains(1)); + container.erase(container.find(0)); + TS_ASSERT(!container.empty()); + container.erase(container.find(1)); + TS_ASSERT(!container.empty()); + container.erase(container.find(2)); + TS_ASSERT(!container.empty()); + container.erase(container.find(3)); + TS_ASSERT(!container.empty()); + container.erase(container.find(4)); + TS_ASSERT(container.empty()); + container[1] = 33; + TS_ASSERT(container.contains(1)); + TS_ASSERT(!container.empty()); + container.erase(container.find(1)); + TS_ASSERT(container.empty()); + } + void test_lookup() { Common::HashMap<int, int> container; container[0] = 17; |