Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: Rewrite HashMap as a wrapper around HashSet

Browse Source 
There is really no need to have two implementation of the same thing.
Only difference now is that HashMap's value type has to be movable but
this wasn't an issue
This commit is contained in:
Bananymous
2026-04-21 00:18:18 +03:00
parent a8e496310b
commit 40f3546aca
3 changed files with 192 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
userspace/libraries/LibInput/KeyboardLayout.cpp
View File

@@ -19,20 +19,14 @@
namespace LibInput
{
struct StringViewLower
struct StringViewLowerComp
{
BAN::StringView value;
StringViewLower(BAN::StringView sv)
: value(sv)
{ }
bool operator==(const StringViewLower& other) const
constexpr bool operator()(const BAN::StringView& a, const BAN::StringView& b) const
{
if (value.size() != other.value.size())
if (a.size() != b.size())
return false;
for (size_t i = 0; i < value.size(); i++)
if (tolower(value[i]) != tolower(other.value[i]))
for (size_t i = 0; i < a.size(); i++)
if (tolower(a[i]) != tolower(b[i]))
return false;
return true;
}
@@ -40,16 +34,16 @@ namespace LibInput
struct StringViewLowerHash
{
BAN::hash_t operator()(const StringViewLower& value) const
BAN::hash_t operator()(const BAN::StringView& str) const
{
constexpr BAN::hash_t FNV_offset_basis = 0x811c9dc5;
constexpr BAN::hash_t FNV_prime = 0x01000193;
BAN::hash_t hash = FNV_offset_basis;
for (size_t i = 0; i < value.value.size(); i++)
for (size_t i = 0; i < str.size(); i++)
{
hash *= FNV_prime;
hash ^= (uint8_t)tolower(value.value[i]);
hash ^= (uint8_t)tolower(str[i]);
}
return hash;
@@ -113,7 +107,7 @@ namespace LibInput
return keycode;
}
static BAN::HashMap<StringViewLower, Key, StringViewLowerHash> s_name_to_key;
static BAN::HashMap<BAN::StringView, Key, StringViewLowerHash, StringViewLowerComp> s_name_to_key;
static BAN::ErrorOr<void> initialize_name_to_key();
static BAN::Optional<Key> parse_key(BAN::StringView name)

1
userspace/programs/resolver/main.cpp
View File

@@ -3,6 +3,7 @@
#include <BAN/Endianness.h>
#include <BAN/HashMap.h>
#include <BAN/IPv4.h>
#include <BAN/LinkedList.h>
#include <BAN/String.h>
#include <BAN/StringView.h>
#include <BAN/Vector.h>