beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 15:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
ladybird/AK/DeprecatedFlyString.cpp

109 lines
2.7 KiB
C++
Raw Permalink Normal View History

AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
/*
Meta: Update my e-mail address everywhere
2024-10-04 11:19:50 +00:00
* Copyright (c) 2020, Andreas Kling <andreas@ladybird.org>
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
*
Everything: Move to SPDX license identifiers in all files. SPDX License Identifiers are a more compact / standardized way of representing file license information. See: https://spdx.dev/resources/use/#identifiers This was done with the `ambr` search and replace tool. ambr --no-parent-ignore --key-from-file --rep-from-file key.txt rep.txt *
2021-04-22 08:24:48 +00:00
* SPDX-License-Identifier: BSD-2-Clause
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
*/
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
#include <AK/ByteString.h>
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
#include <AK/DeprecatedFlyString.h>
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
#include <AK/HashTable.h>
AK: Make string-to-number conversion helpers return Optional Get rid of the weird old signature: - int StringType::to_int(bool& ok) const And replace it with sensible new signature: - Optional<int> StringType::to_int() const
2020-06-12 19:07:52 +00:00
#include <AK/Optional.h>
Kernel: Switch singletons to use new Singleton class MemoryManager cannot use the Singleton class because MemoryManager::initialize is called before the global constructors are run. That caused the Singleton to be re-initialized, causing it to create another MemoryManager instance. Fixes #3226
2020-08-25 01:35:19 +00:00
#include <AK/Singleton.h>
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
#include <AK/StringUtils.h>
AK: Reduce header dependency graph of String.h String.h no longer pulls in StringView.h. We do this by moving a bunch of String functions out-of-line.
2020-03-23 12:45:10 +00:00
#include <AK/StringView.h>
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
namespace AK {
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
struct DeprecatedFlyStringImplTraits : public Traits<StringImpl const*> {
static unsigned hash(StringImpl const* s) { return s->hash(); }
Everywhere: Run clang-format
2022-04-01 17:58:27 +00:00
static bool equals(StringImpl const* a, StringImpl const* b)
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
{
AK: Use StringImpl::operator== in FlyString
2020-10-06 15:16:39 +00:00
return *a == *b;
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
}
};
AK: Make Deprecated{Fly,}String and StringImpl const-correct
2023-02-19 21:59:26 +00:00
static Singleton<HashTable<StringImpl const*, DeprecatedFlyStringImplTraits>> s_table;
Kernel: Switch singletons to use new Singleton class MemoryManager cannot use the Singleton class because MemoryManager::initialize is called before the global constructors are run. That caused the Singleton to be re-initialized, causing it to create another MemoryManager instance. Fixes #3226
2020-08-25 01:35:19 +00:00
AK: Make Deprecated{Fly,}String and StringImpl const-correct
2023-02-19 21:59:26 +00:00
static HashTable<StringImpl const*, DeprecatedFlyStringImplTraits>& fly_impls()
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
{
Kernel: Switch singletons to use new Singleton class MemoryManager cannot use the Singleton class because MemoryManager::initialize is called before the global constructors are run. That caused the Singleton to be re-initialized, causing it to create another MemoryManager instance. Fixes #3226
2020-08-25 01:35:19 +00:00
return *s_table;
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
void DeprecatedFlyString::did_destroy_impl(Badge<StringImpl>, StringImpl& impl)
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
{
fly_impls().remove(&impl);
}
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
DeprecatedFlyString::DeprecatedFlyString(ByteString const& string)
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
: m_impl(string.impl())
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
{
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
if (string.impl()->is_fly())
AK: Some FlyString improvements We're now clever enough to notice when we're constructing a FlyString from a String that is actually already a FlyString. :^)
2020-05-05 08:08:14 +00:00
return;
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
auto it = fly_impls().find(string.impl());
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
if (it == fly_impls().end()) {
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
fly_impls().set(string.impl());
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
string.impl()->set_fly({}, true);
m_impl = string.impl();
} else {
Everywhere: Rename ASSERT => VERIFY (...and ASSERT_NOT_REACHED => VERIFY_NOT_REACHED) Since all of these checks are done in release builds as well, let's rename them to VERIFY to prevent confusion, as everyone is used to assertions being compiled out in release. We can introduce a new ASSERT macro that is specifically for debug checks, but I'm doing this wholesale conversion first since we've accumulated thousands of these already, and it's not immediately obvious which ones are suitable for ASSERT.
2021-02-23 19:42:32 +00:00
VERIFY((*it)->is_fly());
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
m_impl = **it;
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
}
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
DeprecatedFlyString::DeprecatedFlyString(StringView string)
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
: m_impl(StringImpl::the_empty_stringimpl())
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
{
AK: Try to avoid String allocation in FlyString(StringView) If we're constructing a FlyString from a StringView, and we already have a matching StringImpl in the table, use HashTable::find() to locate the existing string without creating a temporary String.
2021-05-15 07:50:51 +00:00
if (string.is_null())
return;
auto it = fly_impls().find(string.hash(), [&](auto& candidate) {
AK+Everywhere: Remove the null state of DeprecatedString This commit removes DeprecatedString's "null" state, and replaces all its users with one of the following: - A normal, empty DeprecatedString - Optional<DeprecatedString> Note that null states of DeprecatedFlyString/StringView/etc are *not* affected by this commit. However, DeprecatedString::empty() is now considered equal to a null StringView.
2023-10-10 11:30:58 +00:00
return string == *candidate;
AK: Try to avoid String allocation in FlyString(StringView) If we're constructing a FlyString from a StringView, and we already have a matching StringImpl in the table, use HashTable::find() to locate the existing string without creating a temporary String.
2021-05-15 07:50:51 +00:00
});
if (it == fly_impls().end()) {
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
auto new_string = string.to_byte_string();
AK: Try to avoid String allocation in FlyString(StringView) If we're constructing a FlyString from a StringView, and we already have a matching StringImpl in the table, use HashTable::find() to locate the existing string without creating a temporary String.
2021-05-15 07:50:51 +00:00
fly_impls().set(new_string.impl());
new_string.impl()->set_fly({}, true);
m_impl = new_string.impl();
} else {
VERIFY((*it)->is_fly());
AK+LibJS: Remove null state from DeprecatedFlyString :^)
2024-01-24 20:15:48 +00:00
m_impl = **it;
AK: Try to avoid String allocation in FlyString(StringView) If we're constructing a FlyString from a StringView, and we already have a matching StringImpl in the table, use HashTable::find() to locate the existing string without creating a temporary String.
2021-05-15 07:50:51 +00:00
}
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
}
Everywhere: Rename equals_ignoring_case => equals_ignoring_ascii_case Let's make it clear that these functions deal with ASCII case only.
2023-03-10 07:48:54 +00:00
bool DeprecatedFlyString::equals_ignoring_ascii_case(StringView other) const
AK: Add FlyString::equals_ignoring_case(StringView) And share the code with String by moving the logic to StringUtils. :^)
2020-03-22 12:07:45 +00:00
{
Everywhere: Rename equals_ignoring_case => equals_ignoring_ascii_case Let's make it clear that these functions deal with ASCII case only.
2023-03-10 07:48:54 +00:00
return StringUtils::equals_ignoring_ascii_case(view(), other);
AK: Add FlyString::equals_ignoring_case(StringView) And share the code with String by moving the logic to StringUtils. :^)
2020-03-22 12:07:45 +00:00
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
bool DeprecatedFlyString::starts_with(StringView str, CaseSensitivity case_sensitivity) const
AK: Add case insensitive version of starts_with
2020-07-18 16:59:38 +00:00
{
return StringUtils::starts_with(view(), str, case_sensitivity);
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
bool DeprecatedFlyString::ends_with(StringView str, CaseSensitivity case_sensitivity) const
AK: Unify FlyString/StringView::ends_with implementation on StringUtils::ends_with This creates a unified implementation of ends_with with case sensitivity across String/StringView/FlyString.
2020-05-26 10:21:34 +00:00
{
return StringUtils::ends_with(view(), str, case_sensitivity);
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
DeprecatedFlyString DeprecatedFlyString::to_lowercase() const
AK: Add FlyString::to_lowercase() and LogStream operator<<(FlyString)
2020-03-22 18:07:02 +00:00
{
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
return ByteString(*m_impl).to_lowercase();
AK: Add FlyString::to_lowercase() and LogStream operator<<(FlyString)
2020-03-22 18:07:02 +00:00
}
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
bool DeprecatedFlyString::operator==(ByteString const& other) const
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
{
AK: Implement FlyString's comparison operators in terms of StringView's
2022-01-29 14:57:31 +00:00
return m_impl == other.impl() || view() == other.view();
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
bool DeprecatedFlyString::operator==(StringView string) const
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
{
AK: Implement FlyString's comparison operators in terms of StringView's
2022-01-29 14:57:31 +00:00
return view() == string;
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
}
AK+Everywhere: Rename FlyString to DeprecatedFlyString DeprecatedFlyString relies heavily on DeprecatedString's StringImpl, so let's rename it to A) match the name of DeprecatedString, B) write a new FlyString class that is tied to String.
2023-01-09 00:23:00 +00:00
bool DeprecatedFlyString::operator==(char const* string) const
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
{
AK: Implement FlyString's comparison operators in terms of StringView's
2022-01-29 14:57:31 +00:00
return view() == string;
AK: Add some string comparison operators Some of these are very inefficient. It's nice to have some optimization opportunities in the future though. :^)
2020-03-28 08:11:00 +00:00
}
AK: Add FlyString, a simple flyweight string class FlyString is a flyweight string class that wraps a RefPtr<StringImpl> known to be unique among the set of FlyStrings. The class is very unoptimized at the moment. When to use FlyString: - When you want O(1) string comparison - When you want to deduplicate a lot of identical strings When not to use FlyString: - For strings that don't need either of the above features - For strings that are likely to be unique
2020-03-22 09:12:55 +00:00
}
Reference in a new issue Copy permalink