system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Rewrite HashMap::clone signature with template-args and const

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-13 20:25:22 +02:00 committed by Jelle Raaijmakers
parent dabc6dd962
commit 6421899078
2 changed files with 79 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AK/HashMap.h
View file

@ -281,9 +281,10 @@ public:
return hash;
}
ErrorOr<HashMap<K, V>> clone()
template<typename NewKeyTraits = KeyTraits, typename NewValueTraits = ValueTraits, bool NewIsOrdered = IsOrdered>
ErrorOr<HashMap<K, V, NewKeyTraits, NewValueTraits, NewIsOrdered>> clone() const
{
HashMap<K, V> hash_map_clone;
HashMap<K, V, NewKeyTraits, NewValueTraits, NewIsOrdered> hash_map_clone;
for (auto& it : *this)
TRY(hash_map_clone.try_set(it.key, it.value));
return hash_map_clone;

76
Tests/AK/TestHashMap.cpp
View file

@ -251,3 +251,79 @@ TEST_CASE(take)
baz = map.take("baz"_short_string);
EXPECT(!baz.has_value());
}
TEST_CASE(clone_same_template_args)
{
HashMap<int, int> orig;
orig.set(1, 10);
orig.set(2, 20);
orig.set(3, 30);
EXPECT_EQ(orig.size(), static_cast<size_t>(3));
EXPECT_EQ(orig.get(2), Optional<int>(20));
auto second = TRY_OR_FAIL(orig.clone());
EXPECT_EQ(orig.size(), static_cast<size_t>(3));
EXPECT_EQ(orig.get(2), Optional<int>(20));
EXPECT_EQ(second.size(), static_cast<size_t>(3));
EXPECT_EQ(second.get(2), Optional<int>(20));
}
TEST_CASE(clone_different_traits)
{
HashMap<StringView, StringView> orig;
orig.set("Well"sv, "hello friends!"sv);
orig.set("Thank"sv, "you, very cool!"sv);
EXPECT_EQ(orig.size(), static_cast<size_t>(2));
EXPECT_EQ(orig.get("Well"sv), Optional<StringView>("hello friends!"sv));
EXPECT_EQ(orig.get("weLL"sv), Optional<StringView>());
auto second = TRY_OR_FAIL(orig.clone<CaseInsensitiveASCIIStringViewTraits>());
EXPECT_EQ(orig.size(), static_cast<size_t>(2));
EXPECT_EQ(orig.get("Well"sv), Optional<StringView>("hello friends!"sv));
EXPECT_EQ(orig.get("weLL"sv), Optional<StringView>());
EXPECT_EQ(second.size(), static_cast<size_t>(2));
EXPECT_EQ(second.get("Well"sv), Optional<StringView>("hello friends!"sv));
EXPECT_EQ(second.get("weLL"sv), Optional<StringView>("hello friends!"sv));
}
TEST_CASE(move_construct)
{
HashMap<int, int> orig;
orig.set(1, 10);
orig.set(2, 20);
orig.set(3, 30);
EXPECT_EQ(orig.size(), static_cast<size_t>(3));
EXPECT_EQ(orig.get(2), Optional<int>(20));
HashMap<int, int> second = move(orig);
EXPECT_EQ(orig.size(), static_cast<size_t>(0));
EXPECT_EQ(orig.get(2), Optional<int>());
EXPECT_EQ(second.size(), static_cast<size_t>(3));
EXPECT_EQ(second.get(2), Optional<int>(20));
}
TEST_CASE(move_assign)
{
HashMap<int, int> orig;
HashMap<int, int> second;
orig.set(1, 10);
orig.set(2, 20);
orig.set(3, 30);
EXPECT_EQ(orig.size(), static_cast<size_t>(3));
EXPECT_EQ(orig.get(2), Optional<int>(20));
EXPECT_EQ(second.size(), static_cast<size_t>(0));
EXPECT_EQ(second.get(2), Optional<int>());
// 'Hashtable::operator=(Hashtable&&)' allocates temporarily an empty table,
// so we can't use NoAllocationGuard here. :(
second = move(orig);
EXPECT_EQ(orig.size(), static_cast<size_t>(0));
EXPECT_EQ(orig.get(2), Optional<int>());
EXPECT_EQ(second.size(), static_cast<size_t>(3));
EXPECT_EQ(second.get(2), Optional<int>(20));
}