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

LibJS: Rename PrimitiveString::has_utf8_string to has_deprecated_string

Browse source 
And rename the member variable from m_utf8_string to m_deprecated_string
to match.
This commit is contained in:
Timothy Flynn 2023-01-13 09:36:12 -05:00 • committed by Linus Groh
parent 79e81e8a15
commit 3a004e8f1a
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp
View file

@ -26,7 +26,7 @@ PrimitiveString::PrimitiveString(PrimitiveString& lhs, PrimitiveString& rhs)
} }
PrimitiveString::PrimitiveString(DeprecatedString string) PrimitiveString::PrimitiveString(DeprecatedString string)
: m_utf8_string(move(string)) : m_deprecated_string(move(string))
{ {
} }
@ -37,8 +37,8 @@ PrimitiveString::PrimitiveString(Utf16String string)
PrimitiveString::~PrimitiveString() PrimitiveString::~PrimitiveString()
{ {
if (has_utf8_string()) if (has_deprecated_string())
vm().string_cache().remove(*m_utf8_string); vm().string_cache().remove(*m_deprecated_string);
} }
void PrimitiveString::visit_edges(Cell::Visitor& visitor) void PrimitiveString::visit_edges(Cell::Visitor& visitor)
@ -59,8 +59,8 @@ bool PrimitiveString::is_empty() const
if (has_utf16_string()) if (has_utf16_string())
return m_utf16_string->is_empty(); return m_utf16_string->is_empty();
if (has_utf8_string()) if (has_deprecated_string())
return m_utf8_string->is_empty(); return m_deprecated_string->is_empty();
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
@ -68,12 +68,12 @@ ThrowCompletionOr<DeprecatedString> PrimitiveString::deprecated_string() const
{ {
TRY(resolve_rope_if_needed()); TRY(resolve_rope_if_needed());
if (!has_utf8_string()) { if (!has_deprecated_string()) {
VERIFY(has_utf16_string()); VERIFY(has_utf16_string());
m_utf8_string = TRY(m_utf16_string->to_utf8(vm())); m_deprecated_string = TRY(m_utf16_string->to_utf8(vm()));
} }
return *m_utf8_string; return *m_deprecated_string;
} }
ThrowCompletionOr<Utf16String> PrimitiveString::utf16_string() const ThrowCompletionOr<Utf16String> PrimitiveString::utf16_string() const
@ -81,8 +81,8 @@ ThrowCompletionOr<Utf16String> PrimitiveString::utf16_string() const
TRY(resolve_rope_if_needed()); TRY(resolve_rope_if_needed());
if (!has_utf16_string()) { if (!has_utf16_string()) {
VERIFY(has_utf8_string()); VERIFY(has_deprecated_string());
m_utf16_string = TRY(Utf16String::create(vm(), *m_utf8_string)); m_utf16_string = TRY(Utf16String::create(vm(), *m_deprecated_string));
} }
return *m_utf16_string; return *m_utf16_string;
@ -274,7 +274,7 @@ ThrowCompletionOr<void> PrimitiveString::resolve_rope_if_needed() const
previous = current; previous = current;
} }
m_utf8_string = builder.to_deprecated_string(); m_deprecated_string = builder.to_deprecated_string();
m_is_rope = false; m_is_rope = false;
m_lhs = nullptr; m_lhs = nullptr;
m_rhs = nullptr; m_rhs = nullptr;

4
Userland/Libraries/LibJS/Runtime/PrimitiveString.h
View file

@ -35,7 +35,7 @@ public:
u32 hash() const; u32 hash() const;
ThrowCompletionOr<DeprecatedString> deprecated_string() const; ThrowCompletionOr<DeprecatedString> deprecated_string() const;
bool has_utf8_string() const { return m_utf8_string.has_value(); } bool has_deprecated_string() const { return m_deprecated_string.has_value(); }
ThrowCompletionOr<Utf16String> utf16_string() const; ThrowCompletionOr<Utf16String> utf16_string() const;
ThrowCompletionOr<Utf16View> utf16_string_view() const; ThrowCompletionOr<Utf16View> utf16_string_view() const;
@ -57,7 +57,7 @@ private:
mutable PrimitiveString* m_lhs { nullptr }; mutable PrimitiveString* m_lhs { nullptr };
mutable PrimitiveString* m_rhs { nullptr }; mutable PrimitiveString* m_rhs { nullptr };
mutable Optional<DeprecatedString> m_utf8_string; mutable Optional<DeprecatedString> m_deprecated_string;
mutable Optional<Utf16String> m_utf16_string; mutable Optional<Utf16String> m_utf16_string;
}; };