RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:27:45 +00:00
Code Issues Activity Actions

AK: Make Hash{Map,Table}::remove_all_matching() return removal success

Browse source 
These functions now return whether one or more entries were removed.
This commit is contained in:
Andreas Kling 2022-01-05 16:57:45 +01:00
parent c7ac0c2c80
commit 5279a04c78
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
AK/HashMap.h
View file

@ -75,14 +75,18 @@ public:
} }
template<typename TUnaryPredicate> template<typename TUnaryPredicate>
void remove_all_matching(TUnaryPredicate predicate) bool remove_all_matching(TUnaryPredicate predicate)
{ {
bool something_was_removed = false;
for (auto it = begin(); it != end();) { for (auto it = begin(); it != end();) {
if (predicate(it->key, it->value)) if (predicate(it->key, it->value)) {
it = remove(it); it = remove(it);
else something_was_removed = true;
} else {
++it; ++it;
}
} }
return something_was_removed;
} }
using HashTableType = HashTable<Entry, EntryTraits, IsOrdered>; using HashTableType = HashTable<Entry, EntryTraits, IsOrdered>;

10
AK/HashTable.h
View file

@ -419,14 +419,18 @@ public:
} }
template<typename TUnaryPredicate> template<typename TUnaryPredicate>
void remove_all_matching(TUnaryPredicate predicate) bool remove_all_matching(TUnaryPredicate predicate)
{ {
bool something_was_removed = false;
for (auto it = begin(); it != end();) { for (auto it = begin(); it != end();) {
if (predicate(*it)) if (predicate(*it)) {
it = remove(it); it = remove(it);
else something_was_removed = true;
} else {
++it; ++it;
}
} }
return something_was_removed;
} }
private: private:

9
Tests/AK/TestHashMap.cpp
View file

@ -82,17 +82,18 @@ TEST_CASE(remove_all_matching)
EXPECT_EQ(map.size(), 4u); EXPECT_EQ(map.size(), 4u);
map.remove_all_matching([&](int key, String const& value) { EXPECT_EQ(map.remove_all_matching([&](int key, String const& value) { return key == 1 || value == "Two"; }), true);
return key == 1 || value == "Two";
});
EXPECT_EQ(map.size(), 2u); EXPECT_EQ(map.size(), 2u);
EXPECT(map.contains(3)); EXPECT(map.contains(3));
EXPECT(map.contains(4)); EXPECT(map.contains(4));
map.remove_all_matching([&](int, String const&) { return true; }); EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return true; }), true);
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return false; }), false);
EXPECT(map.is_empty()); EXPECT(map.is_empty());
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return true; }), false);
} }
TEST_CASE(case_insensitive) TEST_CASE(case_insensitive)

7
Tests/AK/TestHashTable.cpp
View file

@ -95,13 +95,16 @@ TEST_CASE(table_remove_all_matching)
EXPECT_EQ(ints.size(), 4u); EXPECT_EQ(ints.size(), 4u);
ints.remove_all_matching([&](int value) { return value > 2; }); EXPECT_EQ(ints.remove_all_matching([&](int value) { return value > 2; }), true);
EXPECT_EQ(ints.remove_all_matching([&](int) { return false; }), false);
EXPECT_EQ(ints.size(), 2u); EXPECT_EQ(ints.size(), 2u);
ints.remove_all_matching([&](int) { return true; }); EXPECT_EQ(ints.remove_all_matching([&](int) { return true; }), true);
EXPECT(ints.is_empty()); EXPECT(ints.is_empty());
EXPECT_EQ(ints.remove_all_matching([&](int) { return true; }), false);
} }
TEST_CASE(case_insensitive) TEST_CASE(case_insensitive)