RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 00:42:44 +00:00
Code Issues Activity Actions

AK: Rename CaseInsensitiveStringViewTraits to reflect intent

Browse source 
Now it is called `CaseInsensitiveASCIIStringViewTraits`, so we can be
more specific about what data structure does it operate onto. ;)
This commit is contained in:
gustrb 2023-03-14 08:40:53 -03:00 • committed by Linus Groh
parent 8ba6cd6ab9
commit 5141c86587
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
AK/StringView.h
View file

@ -359,8 +359,7 @@ struct Traits<StringView> : public GenericTraits<StringView> {
static unsigned hash(StringView s) { return s.hash(); } static unsigned hash(StringView s) { return s.hash(); }
}; };
// FIXME: Rename this to indicate that it's about ASCII-only case insensitivity. struct CaseInsensitiveASCIIStringViewTraits : public Traits<StringView> {
struct CaseInsensitiveStringViewTraits : public Traits<StringView> {
static unsigned hash(StringView s) static unsigned hash(StringView s)
{ {
if (s.is_empty()) if (s.is_empty())
@ -386,6 +385,6 @@ struct CaseInsensitiveStringViewTraits : public Traits<StringView> {
} }
#if USING_AK_GLOBALLY #if USING_AK_GLOBALLY
using AK::CaseInsensitiveStringViewTraits; using AK::CaseInsensitiveASCIIStringViewTraits;
using AK::StringView; using AK::StringView;
#endif #endif

2
Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
View file

@ -613,7 +613,7 @@ static constexpr Array<Location, @size@> s_time_zone_locations { {
TRY(hashes.try_ensure_capacity(values.size())); TRY(hashes.try_ensure_capacity(values.size()));
auto hash = [](auto const& value) { auto hash = [](auto const& value) {
return CaseInsensitiveStringViewTraits::hash(value); return CaseInsensitiveASCIIStringViewTraits::hash(value);
}; };
for (auto const& value : values) for (auto const& value : values)

2
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
View file

@ -1316,7 +1316,7 @@ bool code_point_has_@enum_snake@(u32 code_point, @enum_title@ @enum_snake@)
for (auto const& prop : prop_list) { for (auto const& prop : prop_list) {
if constexpr (IsSame<RemoveCVReference<decltype(prop)>, DeprecatedString>) { if constexpr (IsSame<RemoveCVReference<decltype(prop)>, DeprecatedString>) {
hashes.set(CaseInsensitiveStringViewTraits::hash(prop), prop); hashes.set(CaseInsensitiveASCIIStringViewTraits::hash(prop), prop);
options.sensitivity = CaseSensitivity::CaseInsensitive; options.sensitivity = CaseSensitivity::CaseInsensitive;
} else { } else {
hashes.set(prop.key.hash(), prop.key); hashes.set(prop.key.hash(), prop.key);

2
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
View file

@ -454,7 +454,7 @@ Optional<@return_type@> @method_name@(StringView key)
)~~~"); )~~~");
} else { } else {
generator.append(R"~~~( generator.append(R"~~~(
auto hash = CaseInsensitiveStringViewTraits::hash(key); auto hash = CaseInsensitiveASCIIStringViewTraits::hash(key);
)~~~"); )~~~");
} }

2
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp
View file

@ -90,7 +90,7 @@ ErrorOr<void> generate_implementation_file(JsonArray& identifier_data, Core::Fil
namespace Web::CSS { namespace Web::CSS {
HashMap<StringView, ValueID, AK::CaseInsensitiveStringViewTraits> g_stringview_to_value_id_map { HashMap<StringView, ValueID, AK::CaseInsensitiveASCIIStringViewTraits> g_stringview_to_value_id_map {
)~~~"); )~~~");
identifier_data.for_each([&](auto& name) { identifier_data.for_each([&](auto& name) {

2
Tests/AK/TestHashMap.cpp
View file

@ -111,7 +111,7 @@ TEST_CASE(case_insensitive)
TEST_CASE(case_insensitive_stringview) TEST_CASE(case_insensitive_stringview)
{ {
HashMap<StringView, int, CaseInsensitiveStringViewTraits> casemap; HashMap<StringView, int, CaseInsensitiveASCIIStringViewTraits> casemap;
EXPECT_EQ(casemap.set("nickserv"sv, 3), AK::HashSetResult::InsertedNewEntry); EXPECT_EQ(casemap.set("nickserv"sv, 3), AK::HashSetResult::InsertedNewEntry);
EXPECT_EQ(casemap.set("NickServ"sv, 3), AK::HashSetResult::ReplacedExistingEntry); EXPECT_EQ(casemap.set("NickServ"sv, 3), AK::HashSetResult::ReplacedExistingEntry);
EXPECT_EQ(casemap.size(), 1u); EXPECT_EQ(casemap.size(), 1u);

6
Tests/AK/TestStringView.cpp
View file

@ -196,7 +196,7 @@ TEST_CASE(case_insensitive_hash)
auto string3 = "aBcDeF"sv; auto string3 = "aBcDeF"sv;
auto string4 = "foo"sv; auto string4 = "foo"sv;
EXPECT_EQ(CaseInsensitiveStringViewTraits::hash(string1), CaseInsensitiveStringViewTraits::hash(string2)); EXPECT_EQ(CaseInsensitiveASCIIStringViewTraits::hash(string1), CaseInsensitiveASCIIStringViewTraits::hash(string2));
EXPECT_EQ(CaseInsensitiveStringViewTraits::hash(string1), CaseInsensitiveStringViewTraits::hash(string3)); EXPECT_EQ(CaseInsensitiveASCIIStringViewTraits::hash(string1), CaseInsensitiveASCIIStringViewTraits::hash(string3));
EXPECT_NE(CaseInsensitiveStringViewTraits::hash(string1), CaseInsensitiveStringViewTraits::hash(string4)); EXPECT_NE(CaseInsensitiveASCIIStringViewTraits::hash(string1), CaseInsensitiveASCIIStringViewTraits::hash(string4));
} }