diff --git a/AK/ByteString.cpp b/AK/ByteString.cpp index 5e7469efce2aa9..d65826ad34adae 100644 --- a/AK/ByteString.cpp +++ b/AK/ByteString.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -16,7 +16,7 @@ namespace AK { -bool ByteString::operator==(DeprecatedFlyString const& fly_string) const +bool ByteString::operator==(FlyByteString const& fly_string) const { return m_impl == fly_string.impl() || view() == fly_string.view(); } @@ -337,7 +337,7 @@ ByteString escape_html_entities(StringView html) return builder.to_byte_string(); } -ByteString::ByteString(DeprecatedFlyString const& string) +ByteString::ByteString(FlyByteString const& string) : m_impl(string.impl()) { } diff --git a/AK/ByteString.h b/AK/ByteString.h index fc859ce17bf03a..f7eaf86d458b1e 100644 --- a/AK/ByteString.h +++ b/AK/ByteString.h @@ -86,7 +86,7 @@ class ByteString { { } - ByteString(DeprecatedFlyString const&); + ByteString(FlyByteString const&); static ErrorOr from_utf8(ReadonlyBytes); static ErrorOr from_utf8(StringView string) { return from_utf8(string.bytes()); } @@ -227,7 +227,7 @@ class ByteString { bool operator==(StringView) const; - bool operator==(DeprecatedFlyString const&) const; + bool operator==(FlyByteString const&) const; bool operator<(ByteString const&) const; bool operator>=(ByteString const& other) const { return !(*this < other); } diff --git a/AK/CMakeLists.txt b/AK/CMakeLists.txt index 03237b41092d15..b9275e470f75f6 100644 --- a/AK/CMakeLists.txt +++ b/AK/CMakeLists.txt @@ -7,7 +7,7 @@ set(AK_SOURCES ConstrainedStream.cpp CountingStream.cpp DOSPackedTime.cpp - DeprecatedFlyString.cpp + FlyByteString.cpp Error.cpp FloatingPointStringConversions.cpp FlyString.cpp diff --git a/AK/Error.h b/AK/Error.h index 9ed9a53124a617..508bceb3a4494b 100644 --- a/AK/Error.h +++ b/AK/Error.h @@ -43,7 +43,7 @@ class [[nodiscard]] Error { } static Error from_string_view(StringView string_literal) { return Error(string_literal); } - template T> + template T> static Error from_string_view(T) { // `Error::from_string_view(ByteString::formatted(...))` is a somewhat common mistake, which leads to a UAF situation. diff --git a/AK/DeprecatedFlyString.cpp b/AK/FlyByteString.cpp similarity index 63% rename from AK/DeprecatedFlyString.cpp rename to AK/FlyByteString.cpp index 252fc3c8b21c06..915611222f32f5 100644 --- a/AK/DeprecatedFlyString.cpp +++ b/AK/FlyByteString.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include @@ -14,7 +14,7 @@ namespace AK { -struct DeprecatedFlyStringImplTraits : public Traits { +struct FlyByteStringImplTraits : public Traits { static unsigned hash(StringImpl const* s) { return s->hash(); } static bool equals(StringImpl const* a, StringImpl const* b) { @@ -22,19 +22,19 @@ struct DeprecatedFlyStringImplTraits : public Traits { } }; -static Singleton> s_table; +static Singleton> s_table; -static HashTable& fly_impls() +static HashTable& fly_impls() { return *s_table; } -void DeprecatedFlyString::did_destroy_impl(Badge, StringImpl& impl) +void FlyByteString::did_destroy_impl(Badge, StringImpl& impl) { fly_impls().remove(&impl); } -DeprecatedFlyString::DeprecatedFlyString(ByteString const& string) +FlyByteString::FlyByteString(ByteString const& string) : m_impl(string.impl()) { if (string.impl()->is_fly()) @@ -51,7 +51,7 @@ DeprecatedFlyString::DeprecatedFlyString(ByteString const& string) } } -DeprecatedFlyString::DeprecatedFlyString(StringView string) +FlyByteString::FlyByteString(StringView string) : m_impl(StringImpl::the_empty_stringimpl()) { if (string.is_null()) @@ -70,37 +70,37 @@ DeprecatedFlyString::DeprecatedFlyString(StringView string) } } -bool DeprecatedFlyString::equals_ignoring_ascii_case(StringView other) const +bool FlyByteString::equals_ignoring_ascii_case(StringView other) const { return StringUtils::equals_ignoring_ascii_case(view(), other); } -bool DeprecatedFlyString::starts_with(StringView str, CaseSensitivity case_sensitivity) const +bool FlyByteString::starts_with(StringView str, CaseSensitivity case_sensitivity) const { return StringUtils::starts_with(view(), str, case_sensitivity); } -bool DeprecatedFlyString::ends_with(StringView str, CaseSensitivity case_sensitivity) const +bool FlyByteString::ends_with(StringView str, CaseSensitivity case_sensitivity) const { return StringUtils::ends_with(view(), str, case_sensitivity); } -DeprecatedFlyString DeprecatedFlyString::to_lowercase() const +FlyByteString FlyByteString::to_lowercase() const { return ByteString(*m_impl).to_lowercase(); } -bool DeprecatedFlyString::operator==(ByteString const& other) const +bool FlyByteString::operator==(ByteString const& other) const { return m_impl == other.impl() || view() == other.view(); } -bool DeprecatedFlyString::operator==(StringView string) const +bool FlyByteString::operator==(StringView string) const { return view() == string; } -bool DeprecatedFlyString::operator==(char const* string) const +bool FlyByteString::operator==(char const* string) const { return view() == string; } diff --git a/AK/DeprecatedFlyString.h b/AK/FlyByteString.h similarity index 67% rename from AK/DeprecatedFlyString.h rename to AK/FlyByteString.h index 1242fb0d6969b7..85334667eb9154 100644 --- a/AK/DeprecatedFlyString.h +++ b/AK/FlyByteString.h @@ -11,42 +11,42 @@ namespace AK { -class DeprecatedFlyString { +class FlyByteString { public: - DeprecatedFlyString() + FlyByteString() : m_impl(StringImpl::the_empty_stringimpl()) { } - DeprecatedFlyString(DeprecatedFlyString const& other) + FlyByteString(FlyByteString const& other) : m_impl(other.impl()) { } - DeprecatedFlyString(DeprecatedFlyString&& other) + FlyByteString(FlyByteString&& other) : m_impl(move(other.m_impl)) { } - DeprecatedFlyString(ByteString const&); - DeprecatedFlyString(StringView); - DeprecatedFlyString(char const* string) - : DeprecatedFlyString(static_cast(string)) + FlyByteString(ByteString const&); + FlyByteString(StringView); + FlyByteString(char const* string) + : FlyByteString(static_cast(string)) { } - static DeprecatedFlyString from_fly_impl(NonnullRefPtr impl) + static FlyByteString from_fly_impl(NonnullRefPtr impl) { VERIFY(impl->is_fly()); - DeprecatedFlyString string; + FlyByteString string; string.m_impl = move(impl); return string; } - DeprecatedFlyString& operator=(DeprecatedFlyString const& other) + FlyByteString& operator=(FlyByteString const& other) { m_impl = other.m_impl; return *this; } - DeprecatedFlyString& operator=(DeprecatedFlyString&& other) + FlyByteString& operator=(FlyByteString&& other) { m_impl = move(other.m_impl); return *this; @@ -54,7 +54,7 @@ class DeprecatedFlyString { bool is_empty() const { return !m_impl->length(); } - bool operator==(DeprecatedFlyString const& other) const { return m_impl == other.m_impl; } + bool operator==(FlyByteString const& other) const { return m_impl == other.m_impl; } bool operator==(ByteString const&) const; @@ -69,7 +69,7 @@ class DeprecatedFlyString { ALWAYS_INLINE u32 hash() const { return m_impl->existing_hash(); } ALWAYS_INLINE StringView view() const { return m_impl->view(); } - DeprecatedFlyString to_lowercase() const; + FlyByteString to_lowercase() const; template Optional to_number(TrimWhitespace trim_whitespace = TrimWhitespace::Yes) const @@ -94,12 +94,12 @@ class DeprecatedFlyString { }; template<> -struct Traits : public DefaultTraits { - static unsigned hash(DeprecatedFlyString const& s) { return s.hash(); } +struct Traits : public DefaultTraits { + static unsigned hash(FlyByteString const& s) { return s.hash(); } }; } #if USING_AK_GLOBALLY -using AK::DeprecatedFlyString; +using AK::FlyByteString; #endif diff --git a/AK/FlyString.cpp b/AK/FlyString.cpp index 55fb34dd47d826..374be84af83d00 100644 --- a/AK/FlyString.cpp +++ b/AK/FlyString.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include @@ -148,12 +148,12 @@ size_t FlyString::number_of_fly_strings() return all_fly_strings().size(); } -DeprecatedFlyString FlyString::to_deprecated_fly_string() const +FlyByteString FlyString::to_deprecated_fly_string() const { - return DeprecatedFlyString(bytes_as_string_view()); + return FlyByteString(bytes_as_string_view()); } -ErrorOr FlyString::from_deprecated_fly_string(DeprecatedFlyString const& deprecated_fly_string) +ErrorOr FlyString::from_deprecated_fly_string(FlyByteString const& deprecated_fly_string) { return FlyString::from_utf8(deprecated_fly_string.view()); } diff --git a/AK/FlyString.h b/AK/FlyString.h index fd2c21e51a9ec7..f1639ce0b4fb2a 100644 --- a/AK/FlyString.h +++ b/AK/FlyString.h @@ -25,7 +25,7 @@ class FlyString { static ErrorOr from_utf8(StringView); static FlyString from_utf8_without_validation(ReadonlyBytes); template - requires(IsOneOf, ByteString, DeprecatedFlyString, FlyString, String>) + requires(IsOneOf, ByteString, FlyByteString, FlyString, String>) static ErrorOr from_utf8(T&&) = delete; FlyString(String const&); @@ -56,8 +56,8 @@ class FlyString { [[nodiscard]] static size_t number_of_fly_strings(); // FIXME: Remove these once all code has been ported to FlyString - [[nodiscard]] DeprecatedFlyString to_deprecated_fly_string() const; - static ErrorOr from_deprecated_fly_string(DeprecatedFlyString const&); + [[nodiscard]] FlyByteString to_deprecated_fly_string() const; + static ErrorOr from_deprecated_fly_string(FlyByteString const&); template requires(IsSame, StringView>) static ErrorOr from_deprecated_fly_string(T&&) = delete; diff --git a/AK/Format.h b/AK/Format.h index 99e62aeb3154b0..aadbfb90a83691 100644 --- a/AK/Format.h +++ b/AK/Format.h @@ -504,7 +504,7 @@ template<> struct Formatter : Formatter { }; template<> -struct Formatter : Formatter { +struct Formatter : Formatter { }; template diff --git a/AK/Forward.h b/AK/Forward.h index ad8b42c8349a1b..c0fb67ae83cc0e 100644 --- a/AK/Forward.h +++ b/AK/Forward.h @@ -32,7 +32,7 @@ class ConstrainedStream; template class Coroutine; class CountingStream; -class DeprecatedFlyString; +class FlyByteString; class ByteString; class DeprecatedStringCodePointIterator; class Duration; @@ -174,7 +174,6 @@ using AK::CircularQueue; using AK::ConstrainedStream; using AK::Coroutine; using AK::CountingStream; -using AK::DeprecatedFlyString; using AK::DeprecatedStringCodePointIterator; using AK::DoublyLinkedList; using AK::Duration; @@ -182,6 +181,7 @@ using AK::Error; using AK::ErrorOr; using AK::FixedArray; using AK::FixedPoint; +using AK::FlyByteString; using AK::FlyString; using AK::Function; using AK::GenericLexer; diff --git a/AK/String.h b/AK/String.h index b353f9cdf618bc..e56d98533bdbbe 100644 --- a/AK/String.h +++ b/AK/String.h @@ -59,7 +59,7 @@ class String : public Detail::StringBase { [[nodiscard]] static String from_utf8_with_replacement_character(StringView, WithBOMHandling = WithBOMHandling::Yes); template - requires(IsOneOf, ByteString, DeprecatedFlyString, FlyString, String>) + requires(IsOneOf, ByteString, FlyByteString, FlyString, String>) static ErrorOr from_utf8(T&&) = delete; [[nodiscard]] static String from_utf8_without_validation(ReadonlyBytes); diff --git a/AK/StringImpl.cpp b/AK/StringImpl.cpp index 69fffb5bb4e489..fc7605535d6529 100644 --- a/AK/StringImpl.cpp +++ b/AK/StringImpl.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ StringImpl::StringImpl(ConstructWithInlineBufferTag, size_t length) StringImpl::~StringImpl() { if (m_fly) - DeprecatedFlyString::did_destroy_impl({}, *this); + FlyByteString::did_destroy_impl({}, *this); } NonnullRefPtr StringImpl::create_uninitialized(size_t length, char*& buffer) diff --git a/AK/StringImpl.h b/AK/StringImpl.h index 435b5815aca38b..5643df82921abd 100644 --- a/AK/StringImpl.h +++ b/AK/StringImpl.h @@ -78,7 +78,7 @@ class StringImpl : public RefCounted { unsigned case_insensitive_hash() const; bool is_fly() const { return m_fly; } - void set_fly(Badge, bool fly) const { m_fly = fly; } + void set_fly(Badge, bool fly) const { m_fly = fly; } private: enum ConstructTheEmptyStringImplTag { diff --git a/AK/StringView.cpp b/AK/StringView.cpp index 7d23e1aa3a6d45..3b8e445cb76fa6 100644 --- a/AK/StringView.cpp +++ b/AK/StringView.cpp @@ -14,7 +14,7 @@ #ifndef KERNEL # include -# include +# include # include # include #endif @@ -40,7 +40,7 @@ StringView::StringView(ByteString const& string) { } -StringView::StringView(DeprecatedFlyString const& string) +StringView::StringView(FlyByteString const& string) : m_characters(string.characters()) , m_length(string.length()) { diff --git a/AK/StringView.h b/AK/StringView.h index f6c1d2fc3c9f5e..876cb7d47381a5 100644 --- a/AK/StringView.h +++ b/AK/StringView.h @@ -52,7 +52,7 @@ class StringView { StringView(String const&); StringView(FlyString const&); StringView(ByteString const&); - StringView(DeprecatedFlyString const&); + StringView(FlyByteString const&); #endif explicit StringView(ByteBuffer&&) = delete; @@ -60,10 +60,10 @@ class StringView { explicit StringView(String&&) = delete; explicit StringView(FlyString&&) = delete; explicit StringView(ByteString&&) = delete; - explicit StringView(DeprecatedFlyString&&) = delete; + explicit StringView(FlyByteString&&) = delete; #endif - template StringType> + template StringType> StringView& operator=(StringType&&) = delete; [[nodiscard]] constexpr bool is_null() const diff --git a/Meta/gn/secondary/AK/BUILD.gn b/Meta/gn/secondary/AK/BUILD.gn index 948e4f783726d2..57a40011ed9735 100644 --- a/Meta/gn/secondary/AK/BUILD.gn +++ b/Meta/gn/secondary/AK/BUILD.gn @@ -61,8 +61,6 @@ shared_library("AK") { "DateConstants.h", "DefaultDelete.h", "Demangle.h", - "DeprecatedFlyString.cpp", - "DeprecatedFlyString.h", "Diagnostics.h", "DisjointChunks.h", "DistinctNumeric.h", @@ -78,6 +76,8 @@ shared_library("AK") { "FloatingPoint.h", "FloatingPointStringConversions.cpp", "FloatingPointStringConversions.h", + "FlyByteString.cpp", + "FlyByteString.h", "FlyString.cpp", "FlyString.h", "Format.cpp", diff --git a/Tests/AK/TestByteString.cpp b/Tests/AK/TestByteString.cpp index 4ae19128638108..c591f3bdf5b7ef 100644 --- a/Tests/AK/TestByteString.cpp +++ b/Tests/AK/TestByteString.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include @@ -142,18 +142,18 @@ TEST_CASE(to_uppercase) TEST_CASE(flystring) { { - DeprecatedFlyString a("foo"); - DeprecatedFlyString b("foo"); + FlyByteString a("foo"); + FlyByteString b("foo"); EXPECT_EQ(a.impl(), b.impl()); } { ByteString a = "foo"; - DeprecatedFlyString b = a; + FlyByteString b = a; StringBuilder builder; builder.append('f'); builder.append("oo"sv); - DeprecatedFlyString c = builder.to_byte_string(); + FlyByteString c = builder.to_byte_string(); EXPECT_EQ(a.impl(), b.impl()); EXPECT_EQ(a.impl(), c.impl()); } diff --git a/Tests/AK/TestStringUtils.cpp b/Tests/AK/TestStringUtils.cpp index fea8dbc0212f75..1c3b361de9344d 100644 --- a/Tests/AK/TestStringUtils.cpp +++ b/Tests/AK/TestStringUtils.cpp @@ -23,11 +23,11 @@ TEST_CASE(hash_compatible) static_assert(AK::Concepts::HashCompatible); static_assert(AK::Concepts::HashCompatible); - static_assert(AK::Concepts::HashCompatible); + static_assert(AK::Concepts::HashCompatible); static_assert(AK::Concepts::HashCompatible); - static_assert(AK::Concepts::HashCompatible); - static_assert(AK::Concepts::HashCompatible); - static_assert(AK::Concepts::HashCompatible); + static_assert(AK::Concepts::HashCompatible); + static_assert(AK::Concepts::HashCompatible); + static_assert(AK::Concepts::HashCompatible); static_assert(AK::Concepts::HashCompatible); static_assert(AK::Concepts::HashCompatible); diff --git a/Tests/LibPDF/BenchmarkPDF.cpp b/Tests/LibPDF/BenchmarkPDF.cpp index 35155098a206ea..baf981e5d6e180 100644 --- a/Tests/LibPDF/BenchmarkPDF.cpp +++ b/Tests/LibPDF/BenchmarkPDF.cpp @@ -18,9 +18,9 @@ static PDF::Value make_array(Vector floats) return PDF::Value { make_object(move(values)) }; } -static PDF::PDFErrorOr> make_function(int type, ReadonlyBytes data, Vector domain, Vector range, Function&)> extra_keys = nullptr) +static PDF::PDFErrorOr> make_function(int type, ReadonlyBytes data, Vector domain, Vector range, Function&)> extra_keys = nullptr) { - HashMap map; + HashMap map; map.set(PDF::CommonNames::FunctionType, PDF::Value { type }); map.set(PDF::CommonNames::Domain, make_array(move(domain))); map.set(PDF::CommonNames::Range, make_array(move(range))); diff --git a/Tests/LibPDF/TestPDF.cpp b/Tests/LibPDF/TestPDF.cpp index 41d7be2a618584..ce74ed7ee11eff 100644 --- a/Tests/LibPDF/TestPDF.cpp +++ b/Tests/LibPDF/TestPDF.cpp @@ -162,9 +162,9 @@ static PDF::Value make_array(Vector floats) return PDF::Value { make_object(move(values)) }; } -static PDF::PDFErrorOr> make_function(int type, ReadonlyBytes data, Vector domain, Vector range, Function&)> extra_keys = nullptr) +static PDF::PDFErrorOr> make_function(int type, ReadonlyBytes data, Vector domain, Vector range, Function&)> extra_keys = nullptr) { - HashMap map; + HashMap map; map.set(PDF::CommonNames::FunctionType, PDF::Value { type }); map.set(PDF::CommonNames::Domain, make_array(move(domain))); map.set(PDF::CommonNames::Range, make_array(move(range))); diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp index 74d3ad7afa4456..0bdf274957775a 100644 --- a/Userland/DevTools/Profiler/Profile.cpp +++ b/Userland/DevTools/Profiler/Profile.cpp @@ -481,7 +481,7 @@ ErrorOr> Profile::load_from_perfcore_file(StringView path auto const& frame = stack_array.at(i); auto ptr = frame.as_integer(); u32 offset = 0; - DeprecatedFlyString object_name; + FlyByteString object_name; ByteString symbol; if (maybe_kernel_base.has_value() && ptr >= maybe_kernel_base.value()) { @@ -681,7 +681,7 @@ ProfileNode::ProfileNode(Process const& process) { } -ProfileNode::ProfileNode(Process const& process, DeprecatedFlyString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) +ProfileNode::ProfileNode(Process const& process, FlyByteString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) : m_process(process) , m_symbol(move(symbol)) , m_pid(pid) diff --git a/Userland/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h index 00d7c431440742..fe2052f9973cda 100644 --- a/Userland/DevTools/Profiler/Profile.h +++ b/Userland/DevTools/Profiler/Profile.h @@ -16,7 +16,7 @@ #include "SignpostsModel.h" #include "SourceModel.h" #include -#include +#include #include #include #include @@ -35,7 +35,7 @@ extern OwnPtr g_kernel_debug_info; class ProfileNode : public RefCounted { public: - static NonnullRefPtr create(Process const& process, DeprecatedFlyString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) + static NonnullRefPtr create(Process const& process, FlyByteString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) { return adopt_ref(*new ProfileNode(process, object_name, move(symbol), address, offset, timestamp, pid)); } @@ -54,7 +54,7 @@ class ProfileNode : public RefCounted { bool has_seen_event(size_t event_index) const { return m_seen_events.get(event_index); } void did_see_event(size_t event_index) { m_seen_events.set(event_index, true); } - DeprecatedFlyString const& object_name() const { return m_object_name; } + FlyByteString const& object_name() const { return m_object_name; } ByteString const& symbol() const { return m_symbol; } FlatPtr address() const { return m_address; } u32 offset() const { return m_offset; } @@ -75,7 +75,7 @@ class ProfileNode : public RefCounted { m_children.append(child); } - ProfileNode& find_or_create_child(DeprecatedFlyString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) + ProfileNode& find_or_create_child(FlyByteString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t pid) { for (size_t i = 0; i < m_children.size(); ++i) { auto& child = m_children[i]; @@ -113,12 +113,12 @@ class ProfileNode : public RefCounted { private: explicit ProfileNode(Process const&); - explicit ProfileNode(Process const&, DeprecatedFlyString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t); + explicit ProfileNode(Process const&, FlyByteString const& object_name, ByteString symbol, FlatPtr address, u32 offset, u64 timestamp, pid_t); bool m_root { false }; Process const& m_process; ProfileNode* m_parent { nullptr }; - DeprecatedFlyString m_object_name; + FlyByteString m_object_name; ByteString m_symbol; pid_t m_pid { 0 }; FlatPtr m_address { 0 }; @@ -167,7 +167,7 @@ class Profile { Vector> const& roots() const { return m_roots; } struct Frame { - DeprecatedFlyString object_name; + FlyByteString object_name; ByteString symbol; FlatPtr address { 0 }; u32 offset { 0 }; diff --git a/Userland/Libraries/LibAudio/FlacLoader.cpp b/Userland/Libraries/LibAudio/FlacLoader.cpp index c8834a710d02cf..c0a611a648d926 100644 --- a/Userland/Libraries/LibAudio/FlacLoader.cpp +++ b/Userland/Libraries/LibAudio/FlacLoader.cpp @@ -6,8 +6,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/Userland/Libraries/LibAudio/LoaderError.h b/Userland/Libraries/LibAudio/LoaderError.h index 7d57798e7919d9..5fb0b1e6eade34 100644 --- a/Userland/Libraries/LibAudio/LoaderError.h +++ b/Userland/Libraries/LibAudio/LoaderError.h @@ -6,8 +6,8 @@ #pragma once -#include #include +#include #include #include diff --git a/Userland/Libraries/LibCpp/AST.h b/Userland/Libraries/LibCpp/AST.h index 9b354b353c8e20..f8058158818b77 100644 --- a/Userland/Libraries/LibCpp/AST.h +++ b/Userland/Libraries/LibCpp/AST.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ class ASTNode : public RefCounted { VERIFY(m_end.has_value()); return m_end.value(); } - DeprecatedFlyString const& filename() const + FlyByteString const& filename() const { return m_filename; } @@ -77,7 +77,7 @@ class ASTNode : public RefCounted { ASTNode const* m_parent { nullptr }; Optional m_start; Optional m_end; - DeprecatedFlyString m_filename; + FlyByteString m_filename; }; class TranslationUnit : public ASTNode { diff --git a/Userland/Libraries/LibCpp/Preprocessor.h b/Userland/Libraries/LibCpp/Preprocessor.h index 337c40d7090c54..a55baffbdd7c68 100644 --- a/Userland/Libraries/LibCpp/Preprocessor.h +++ b/Userland/Libraries/LibCpp/Preprocessor.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ class Preprocessor { ByteString key; Vector parameters; ByteString value; - DeprecatedFlyString filename; + FlyByteString filename; size_t line { 0 }; size_t column { 0 }; }; diff --git a/Userland/Libraries/LibDebug/DebugInfo.cpp b/Userland/Libraries/LibDebug/DebugInfo.cpp index ae885347aee18d..ba0df288fce843 100644 --- a/Userland/Libraries/LibDebug/DebugInfo.cpp +++ b/Userland/Libraries/LibDebug/DebugInfo.cpp @@ -91,8 +91,8 @@ ErrorOr DebugInfo::prepare_lines() return {}; })); - HashMap> memoized_full_paths; - auto compute_full_path = [&](DeprecatedFlyString const& file_path) -> Optional { + HashMap> memoized_full_paths; + auto compute_full_path = [&](FlyByteString const& file_path) -> Optional { if (file_path.view().contains("Toolchain/"sv) || file_path.view().contains("libgcc"sv)) return {}; if (file_path.view().starts_with("./"sv) && !m_source_root.is_empty()) diff --git a/Userland/Libraries/LibDebug/DebugInfo.h b/Userland/Libraries/LibDebug/DebugInfo.h index 1fc11492d7f53d..7e62590a15d22f 100644 --- a/Userland/Libraries/LibDebug/DebugInfo.h +++ b/Userland/Libraries/LibDebug/DebugInfo.h @@ -28,7 +28,7 @@ class DebugInfo { ELF::Image const& elf() const { return m_elf; } struct SourcePosition { - DeprecatedFlyString file_path; + FlyByteString file_path; size_t line_number { 0 }; Optional address_of_first_statement; diff --git a/Userland/Libraries/LibDebug/Dwarf/LineProgram.cpp b/Userland/Libraries/LibDebug/Dwarf/LineProgram.cpp index 68b97f0b7db64d..62376d8f60fa63 100644 --- a/Userland/Libraries/LibDebug/Dwarf/LineProgram.cpp +++ b/Userland/Libraries/LibDebug/Dwarf/LineProgram.cpp @@ -138,7 +138,7 @@ void LineProgram::append_to_line_info() full_path.append('/'); full_path.append(m_source_files[m_file_index].name); - m_lines.append({ m_address, DeprecatedFlyString { full_path.string_view() }, m_line }); + m_lines.append({ m_address, FlyByteString { full_path.string_view() }, m_line }); } void LineProgram::reset_registers() diff --git a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h index e30cbba3180966..e647e1fe19af11 100644 --- a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h +++ b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -113,20 +113,20 @@ class LineProgram { struct LineInfo { FlatPtr address { 0 }; - DeprecatedFlyString file; + FlyByteString file; size_t line { 0 }; }; Vector const& lines() const { return m_lines; } struct DirectoryAndFile { - DeprecatedFlyString directory; - DeprecatedFlyString filename; + FlyByteString directory; + FlyByteString filename; }; DirectoryAndFile get_directory_and_file(size_t file_index) const; struct FileEntry { - DeprecatedFlyString name; + FlyByteString name; size_t directory_index { 0 }; }; Vector const& source_files() const { return m_source_files; } diff --git a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp index d85b292144a7c7..f5305091bf0a44 100644 --- a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp +++ b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGfx/Font/Typeface.h b/Userland/Libraries/LibGfx/Font/Typeface.h index abca29689b39ed..06cc3404e54571 100644 --- a/Userland/Libraries/LibGfx/Font/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/Typeface.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include diff --git a/Userland/Libraries/LibJS/AST.cpp b/Userland/Libraries/LibJS/AST.cpp index be737fc4df8ec8..920628b2d281fe 100644 --- a/Userland/Libraries/LibJS/AST.cpp +++ b/Userland/Libraries/LibJS/AST.cpp @@ -64,7 +64,7 @@ static void print_indent(int indent) out("{}", ByteString::repeated(' ', indent * 2)); } -static void update_function_name(Value value, DeprecatedFlyString const& name) +static void update_function_name(Value value, FlyByteString const& name) { if (!value.is_function()) return; @@ -88,7 +88,7 @@ void LabelledStatement::dump(int indent) const } // 15.2.5 Runtime Semantics: InstantiateOrdinaryFunctionExpression, https://tc39.es/ecma262/#sec-runtime-semantics-instantiateordinaryfunctionexpression -Value FunctionExpression::instantiate_ordinary_function_expression(VM& vm, DeprecatedFlyString given_name) const +Value FunctionExpression::instantiate_ordinary_function_expression(VM& vm, FlyByteString given_name) const { auto& realm = *vm.current_realm(); @@ -255,19 +255,19 @@ ThrowCompletionOr ClassField::class_element_evaluation }; } -static Optional nullopt_or_private_identifier_description(Expression const& expression) +static Optional nullopt_or_private_identifier_description(Expression const& expression) { if (is(expression)) return static_cast(expression).string(); return {}; } -Optional ClassField::private_bound_identifier() const +Optional ClassField::private_bound_identifier() const { return nullopt_or_private_identifier_description(*m_key); } -Optional ClassMethod::private_bound_identifier() const +Optional ClassMethod::private_bound_identifier() const { return nullopt_or_private_identifier_description(*m_key); } @@ -299,7 +299,7 @@ ThrowCompletionOr StaticInitializer::class_element_eva return ClassValue { normal_completion(body_function) }; } -ThrowCompletionOr ClassExpression::create_class_constructor(VM& vm, Environment* class_environment, Environment* environment, Value super_class, ReadonlySpan element_keys, Optional const& binding_name, DeprecatedFlyString const& class_name) const +ThrowCompletionOr ClassExpression::create_class_constructor(VM& vm, Environment* class_environment, Environment* environment, Value super_class, ReadonlySpan element_keys, Optional const& binding_name, FlyByteString const& class_name) const { auto& realm = *vm.current_realm(); @@ -1350,7 +1350,7 @@ void CatchClause::dump(int indent) const { print_indent(indent); m_parameter.visit( - [&](DeprecatedFlyString const& parameter) { + [&](FlyByteString const& parameter) { if (parameter.is_empty()) outln("CatchClause"); else @@ -1499,7 +1499,7 @@ void ScopeNode::add_hoisted_function(NonnullRefPtr de m_functions_hoistable_with_annexB_extension.append(move(declaration)); } -DeprecatedFlyString ExportStatement::local_name_for_default = "*default*"; +FlyByteString ExportStatement::local_name_for_default = "*default*"; static void dump_assert_clauses(ModuleRequest const& request) { @@ -1517,7 +1517,7 @@ void ExportStatement::dump(int indent) const print_indent(indent + 1); outln("(ExportEntries)"); - auto string_or_null = [](Optional const& string) -> ByteString { + auto string_or_null = [](Optional const& string) -> ByteString { if (!string.has_value()) { return "null"; } @@ -1565,7 +1565,7 @@ void ImportStatement::dump(int indent) const } } -bool ExportStatement::has_export(DeprecatedFlyString const& export_name) const +bool ExportStatement::has_export(FlyByteString const& export_name) const { return any_of(m_entries.begin(), m_entries.end(), [&](auto& entry) { // Make sure that empty exported names does not overlap with anything @@ -1575,7 +1575,7 @@ bool ExportStatement::has_export(DeprecatedFlyString const& export_name) const }); } -bool ImportStatement::has_bound_name(DeprecatedFlyString const& name) const +bool ImportStatement::has_bound_name(FlyByteString const& name) const { return any_of(m_entries.begin(), m_entries.end(), [&](auto& entry) { return entry.local_name == name; @@ -1689,7 +1689,7 @@ ThrowCompletionOr Program::global_declaration_instantiation(VM& vm, Global Vector functions_to_initialize; // 7. Let declaredFunctionNames be a new empty List. - HashTable declared_function_names; + HashTable declared_function_names; // 8. For each element d of varDeclarations, in reverse List order, do @@ -1724,7 +1724,7 @@ ThrowCompletionOr Program::global_declaration_instantiation(VM& vm, Global })); // 9. Let declaredVarNames be a new empty List. - HashTable declared_var_names; + HashTable declared_var_names; // 10. For each element d of varDeclarations, do TRY(for_each_var_scoped_variable_declaration([&](Declaration const& declaration) { @@ -1854,7 +1854,7 @@ ThrowCompletionOr Program::global_declaration_instantiation(VM& vm, Global return {}; } -ModuleRequest::ModuleRequest(DeprecatedFlyString module_specifier_, Vector attributes) +ModuleRequest::ModuleRequest(FlyByteString module_specifier_, Vector attributes) : module_specifier(move(module_specifier_)) , attributes(move(attributes)) { diff --git a/Userland/Libraries/LibJS/AST.h b/Userland/Libraries/LibJS/AST.h index e13f272782cc4c..0cc10676416081 100644 --- a/Userland/Libraries/LibJS/AST.h +++ b/Userland/Libraries/LibJS/AST.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include #include @@ -169,7 +169,7 @@ class Statement : public ASTNode { // 14.13 Labelled Statements, https://tc39.es/ecma262/#sec-labelled-statements class LabelledStatement final : public Statement { public: - LabelledStatement(SourceRange source_range, DeprecatedFlyString label, NonnullRefPtr labelled_item) + LabelledStatement(SourceRange source_range, FlyByteString label, NonnullRefPtr labelled_item) : Statement(move(source_range)) , m_label(move(label)) , m_labelled_item(move(labelled_item)) @@ -178,16 +178,16 @@ class LabelledStatement final : public Statement { virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; - DeprecatedFlyString const& label() const { return m_label; } - DeprecatedFlyString& label() { return m_label; } + FlyByteString const& label() const { return m_label; } + FlyByteString& label() { return m_label; } NonnullRefPtr const& labelled_item() const { return m_labelled_item; } private: virtual bool is_labelled_statement() const final { return true; } - DeprecatedFlyString m_label; + FlyByteString m_label; NonnullRefPtr m_labelled_item; }; @@ -195,18 +195,18 @@ class LabelableStatement : public Statement { public: using Statement::Statement; - Vector const& labels() const { return m_labels; } - virtual void add_label(DeprecatedFlyString string) { m_labels.append(move(string)); } + Vector const& labels() const { return m_labels; } + virtual void add_label(FlyByteString string) { m_labels.append(move(string)); } protected: - Vector m_labels; + Vector m_labels; }; class IterationStatement : public Statement { public: using Statement::Statement; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; private: virtual bool is_iteration_statement() const final { return true; } @@ -326,8 +326,8 @@ class ScopeNode : public Statement { ThrowCompletionOr for_each_function_hoistable_with_annexB_extension(ThrowCompletionOrVoidCallback&& callback) const; - Vector const& local_variables_names() const { return m_local_variables_names; } - size_t add_local_variable(DeprecatedFlyString name) + Vector const& local_variables_names() const { return m_local_variables_names; } + size_t add_local_variable(FlyByteString name) { auto index = m_local_variables_names.size(); m_local_variables_names.append(move(name)); @@ -349,15 +349,15 @@ class ScopeNode : public Statement { Vector> m_functions_hoistable_with_annexB_extension; - Vector m_local_variables_names; + Vector m_local_variables_names; }; // ImportEntry Record, https://tc39.es/ecma262/#table-importentry-record-fields struct ImportEntry { - Optional import_name; // [[ImportName]]: stored string if Optional is not empty, NAMESPACE-OBJECT otherwise - DeprecatedFlyString local_name; // [[LocalName]] + Optional import_name; // [[ImportName]]: stored string if Optional is not empty, NAMESPACE-OBJECT otherwise + FlyByteString local_name; // [[LocalName]] - ImportEntry(Optional import_name_, DeprecatedFlyString local_name_) + ImportEntry(Optional import_name_, FlyByteString local_name_) : import_name(move(import_name_)) , local_name(move(local_name_)) { @@ -391,7 +391,7 @@ class ImportStatement final : public Statement { virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - bool has_bound_name(DeprecatedFlyString const& name) const; + bool has_bound_name(FlyByteString const& name) const; Vector const& entries() const { return m_entries; } ModuleRequest const& module_request() const { return m_module_request; } @@ -413,10 +413,10 @@ struct ExportEntry { EmptyNamedExport, } kind; - Optional export_name; // [[ExportName]] - Optional local_or_import_name; // Either [[ImportName]] or [[LocalName]] + Optional export_name; // [[ExportName]] + Optional local_or_import_name; // Either [[ImportName]] or [[LocalName]] - ExportEntry(Kind export_kind, Optional export_name_, Optional local_or_import_name_) + ExportEntry(Kind export_kind, Optional export_name_, Optional local_or_import_name_) : kind(export_kind) , export_name(move(export_name_)) , local_or_import_name(move(local_or_import_name_)) @@ -428,7 +428,7 @@ struct ExportEntry { return m_module_request != nullptr; } - static ExportEntry indirect_export_entry(ModuleRequest const& module_request, Optional export_name, Optional import_name) + static ExportEntry indirect_export_entry(ModuleRequest const& module_request, Optional export_name, Optional import_name) { ExportEntry entry { Kind::NamedExport, move(export_name), move(import_name) }; entry.m_module_request = &module_request; @@ -446,7 +446,7 @@ struct ExportEntry { friend class ExportStatement; public: - static ExportEntry named_export(DeprecatedFlyString export_name, DeprecatedFlyString local_name) + static ExportEntry named_export(FlyByteString export_name, FlyByteString local_name) { return ExportEntry { Kind::NamedExport, move(export_name), move(local_name) }; } @@ -456,7 +456,7 @@ struct ExportEntry { return ExportEntry { Kind::ModuleRequestAllButDefault, {}, {} }; } - static ExportEntry all_module_request(DeprecatedFlyString export_name) + static ExportEntry all_module_request(FlyByteString export_name) { return ExportEntry { Kind::ModuleRequestAll, move(export_name), {} }; } @@ -469,7 +469,7 @@ struct ExportEntry { class ExportStatement final : public Statement { public: - static DeprecatedFlyString local_name_for_default; + static FlyByteString local_name_for_default; ExportStatement(SourceRange source_range, RefPtr statement, Vector entries, bool is_default_export, Optional module_request) : Statement(move(source_range)) @@ -488,7 +488,7 @@ class ExportStatement final : public Statement { virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - bool has_export(DeprecatedFlyString const& export_name) const; + bool has_export(FlyByteString const& export_name) const; bool has_statement() const { return m_statement; } Vector const& entries() const { return m_entries; } @@ -655,13 +655,13 @@ struct BindingPattern : RefCounted { class Identifier final : public Expression { public: - explicit Identifier(SourceRange source_range, DeprecatedFlyString string) + explicit Identifier(SourceRange source_range, FlyByteString string) : Expression(move(source_range)) , m_string(move(string)) { } - DeprecatedFlyString const& string() const { return m_string; } + FlyByteString const& string() const { return m_string; } bool is_local() const { return m_local_variable_index.has_value(); } size_t local_variable_index() const @@ -680,7 +680,7 @@ class Identifier final : public Expression { private: virtual bool is_identifier() const override { return true; } - DeprecatedFlyString m_string; + FlyByteString m_string; Optional m_local_variable_index; bool m_is_global { false }; @@ -708,7 +708,7 @@ class FunctionNode { Statement const& body() const { return *m_body; } Vector const& parameters() const { return m_parameters; } i32 function_length() const { return m_function_length; } - Vector const& local_variables_names() const { return m_local_variables_names; } + Vector const& local_variables_names() const { return m_local_variables_names; } bool is_strict_mode() const { return m_is_strict_mode; } bool might_need_arguments_object() const { return m_parsing_insights.might_need_arguments_object; } bool contains_direct_call_to_eval() const { return m_parsing_insights.contains_direct_call_to_eval; } @@ -718,12 +718,12 @@ class FunctionNode { bool uses_this_from_environment() const { return m_parsing_insights.uses_this_from_environment; } virtual bool has_name() const = 0; - virtual Value instantiate_ordinary_function_expression(VM&, DeprecatedFlyString given_name) const = 0; + virtual Value instantiate_ordinary_function_expression(VM&, FlyByteString given_name) const = 0; virtual ~FunctionNode() {}; protected: - FunctionNode(RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights parsing_insights, bool is_arrow_function, Vector local_variables_names) + FunctionNode(RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights parsing_insights, bool is_arrow_function, Vector local_variables_names) : m_name(move(name)) , m_source_text(move(source_text)) , m_body(move(body)) @@ -753,7 +753,7 @@ class FunctionNode { bool m_is_arrow_function : 1 { false }; FunctionParsingInsights m_parsing_insights; - Vector m_local_variables_names; + Vector m_local_variables_names; }; class FunctionDeclaration final @@ -762,7 +762,7 @@ class FunctionDeclaration final public: static bool must_have_name() { return true; } - FunctionDeclaration(SourceRange source_range, RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights insights, Vector local_variables_names) + FunctionDeclaration(SourceRange source_range, RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights insights, Vector local_variables_names) : Declaration(move(source_range)) , FunctionNode(move(name), move(source_text), move(body), move(parameters), function_length, kind, is_strict_mode, insights, false, move(local_variables_names)) { @@ -778,7 +778,7 @@ class FunctionDeclaration final void set_should_do_additional_annexB_steps() { m_is_hoisted = true; } bool has_name() const override { return true; } - Value instantiate_ordinary_function_expression(VM&, DeprecatedFlyString) const override { VERIFY_NOT_REACHED(); } + Value instantiate_ordinary_function_expression(VM&, FlyByteString) const override { VERIFY_NOT_REACHED(); } virtual ~FunctionDeclaration() {}; @@ -792,7 +792,7 @@ class FunctionExpression final public: static bool must_have_name() { return false; } - FunctionExpression(SourceRange source_range, RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights insights, Vector local_variables_names, bool is_arrow_function = false) + FunctionExpression(SourceRange source_range, RefPtr name, ByteString source_text, NonnullRefPtr body, Vector parameters, i32 function_length, FunctionKind kind, bool is_strict_mode, FunctionParsingInsights insights, Vector local_variables_names, bool is_arrow_function = false) : Expression(move(source_range)) , FunctionNode(move(name), move(source_text), move(body), move(parameters), function_length, kind, is_strict_mode, insights, is_arrow_function, move(local_variables_names)) { @@ -805,7 +805,7 @@ class FunctionExpression final bool has_name() const override { return !name().is_empty(); } - Value instantiate_ordinary_function_expression(VM&, DeprecatedFlyString given_name) const override; + Value instantiate_ordinary_function_expression(VM&, FlyByteString given_name) const override; virtual ~FunctionExpression() {}; @@ -910,7 +910,7 @@ class WhileStatement final : public IterationStatement { virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; private: NonnullRefPtr m_test; @@ -931,7 +931,7 @@ class DoWhileStatement final : public IterationStatement { virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; private: NonnullRefPtr m_test; @@ -976,7 +976,7 @@ class ForStatement final : public IterationStatement { virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; private: RefPtr m_init; @@ -1000,7 +1000,7 @@ class ForInStatement final : public IterationStatement { Statement const& body() const { return *m_body; } virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; virtual void dump(int indent) const override; private: @@ -1024,7 +1024,7 @@ class ForOfStatement final : public IterationStatement { Statement const& body() const { return *m_body; } virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; virtual void dump(int indent) const override; private: @@ -1044,7 +1044,7 @@ class ForAwaitOfStatement final : public IterationStatement { } virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const override; virtual void dump(int indent) const override; private: @@ -1290,20 +1290,20 @@ class RegExpLiteral final : public Expression { class PrivateIdentifier final : public Expression { public: - explicit PrivateIdentifier(SourceRange source_range, DeprecatedFlyString string) + explicit PrivateIdentifier(SourceRange source_range, FlyByteString string) : Expression(move(source_range)) , m_string(move(string)) { } - DeprecatedFlyString const& string() const { return m_string; } + FlyByteString const& string() const { return m_string; } virtual void dump(int indent) const override; virtual bool is_private_identifier() const override { return true; } private: - DeprecatedFlyString m_string; + FlyByteString m_string; }; class ClassElement : public ASTNode { @@ -1327,7 +1327,7 @@ class ClassElement : public ASTNode { using ClassValue = Variant; virtual ThrowCompletionOr class_element_evaluation(VM&, Object& home_object, Value) const = 0; - virtual Optional private_bound_identifier() const { return {}; } + virtual Optional private_bound_identifier() const { return {}; } private: bool m_is_static { false }; @@ -1355,7 +1355,7 @@ class ClassMethod final : public ClassElement { virtual void dump(int indent) const override; virtual ThrowCompletionOr class_element_evaluation(VM&, Object& home_object, Value property_key) const override; - virtual Optional private_bound_identifier() const override; + virtual Optional private_bound_identifier() const override; private: virtual bool is_class_method() const override { return true; } @@ -1382,7 +1382,7 @@ class ClassField final : public ClassElement { virtual void dump(int indent) const override; virtual ThrowCompletionOr class_element_evaluation(VM&, Object& home_object, Value property_key) const override; - virtual Optional private_bound_identifier() const override; + virtual Optional private_bound_identifier() const override; private: NonnullRefPtr m_key; @@ -1445,7 +1445,7 @@ class ClassExpression final : public Expression { bool has_name() const { return m_name; } - ThrowCompletionOr create_class_constructor(VM&, Environment* class_environment, Environment* environment, Value super_class, ReadonlySpan element_keys, Optional const& binding_name = {}, DeprecatedFlyString const& class_name = {}) const; + ThrowCompletionOr create_class_constructor(VM&, Environment* class_environment, Environment* environment, Value super_class, ReadonlySpan element_keys, Optional const& binding_name = {}, FlyByteString const& class_name = {}) const; private: virtual bool is_class_expression() const override { return true; } @@ -1488,7 +1488,7 @@ class ClassDeclaration final : public Declaration { // 10.2.1.3 Runtime Semantics: EvaluateBody, https://tc39.es/ecma262/#sec-runtime-semantics-evaluatebody class ClassFieldInitializerStatement final : public Statement { public: - ClassFieldInitializerStatement(SourceRange source_range, NonnullRefPtr expression, DeprecatedFlyString field_name) + ClassFieldInitializerStatement(SourceRange source_range, NonnullRefPtr expression, FlyByteString field_name) : Statement(move(source_range)) , m_expression(move(expression)) , m_class_field_identifier_name(move(field_name)) @@ -1500,7 +1500,7 @@ class ClassFieldInitializerStatement final : public Statement { private: NonnullRefPtr m_expression; - DeprecatedFlyString m_class_field_identifier_name; // [[ClassFieldIdentifierName]] + FlyByteString m_class_field_identifier_name; // [[ClassFieldIdentifierName]] }; class SpreadExpression final : public Expression { @@ -2041,7 +2041,7 @@ class ConditionalExpression final : public Expression { class CatchClause final : public ASTNode { public: - CatchClause(SourceRange source_range, DeprecatedFlyString parameter, NonnullRefPtr body) + CatchClause(SourceRange source_range, FlyByteString parameter, NonnullRefPtr body) : ASTNode(move(source_range)) , m_parameter(move(parameter)) , m_body(move(body)) @@ -2061,7 +2061,7 @@ class CatchClause final : public ASTNode { virtual void dump(int indent) const override; private: - Variant> m_parameter; + Variant> m_parameter; NonnullRefPtr m_body; }; @@ -2131,7 +2131,7 @@ class SwitchStatement final : public ScopeNode { virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; + virtual Bytecode::CodeGenerationErrorOr> generate_labelled_evaluation(Bytecode::Generator&, Vector const&, Optional preferred_dst = {}) const; void add_case(NonnullRefPtr switch_case) { m_cases.append(move(switch_case)); } @@ -2142,22 +2142,22 @@ class SwitchStatement final : public ScopeNode { class BreakStatement final : public Statement { public: - BreakStatement(SourceRange source_range, Optional target_label) + BreakStatement(SourceRange source_range, Optional target_label) : Statement(move(source_range)) , m_target_label(move(target_label)) { } - Optional const& target_label() const { return m_target_label; } + Optional const& target_label() const { return m_target_label; } virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; private: - Optional m_target_label; + Optional m_target_label; }; class ContinueStatement final : public Statement { public: - ContinueStatement(SourceRange source_range, Optional target_label) + ContinueStatement(SourceRange source_range, Optional target_label) : Statement(move(source_range)) , m_target_label(move(target_label)) { @@ -2165,10 +2165,10 @@ class ContinueStatement final : public Statement { virtual Bytecode::CodeGenerationErrorOr> generate_bytecode(Bytecode::Generator&, Optional preferred_dst = {}) const override; - Optional const& target_label() const { return m_target_label; } + Optional const& target_label() const { return m_target_label; } private: - Optional m_target_label; + Optional m_target_label; }; class DebuggerStatement final : public Statement { diff --git a/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp b/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp index 5d81d2954a7fc5..79a3be5808a9a1 100644 --- a/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp +++ b/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp @@ -788,7 +788,7 @@ Bytecode::CodeGenerationErrorOr> LabelledStatement::gene // 14.13.4 Runtime Semantics: LabelledEvaluation, https://tc39.es/ecma262/#sec-runtime-semantics-labelledevaluation // LabelledStatement : LabelIdentifier : LabelledItem -Bytecode::CodeGenerationErrorOr> LabelledStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> LabelledStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { Bytecode::Generator::SourceLocationScope scope(generator, *this); // Convert the m_labelled_item NNRP to a reference early so we don't have to do it every single time we want to use it. @@ -836,7 +836,7 @@ Bytecode::CodeGenerationErrorOr> LabelledStatement::gene return stmt_result; } -Bytecode::CodeGenerationErrorOr> IterationStatement::generate_labelled_evaluation(Bytecode::Generator&, Vector const&, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> IterationStatement::generate_labelled_evaluation(Bytecode::Generator&, Vector const&, [[maybe_unused]] Optional preferred_dst) const { return Bytecode::CodeGenerationError { this, @@ -850,7 +850,7 @@ Bytecode::CodeGenerationErrorOr> WhileStatement::generat return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> WhileStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> WhileStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { Bytecode::Generator::SourceLocationScope scope(generator, *this); // test @@ -902,7 +902,7 @@ Bytecode::CodeGenerationErrorOr> DoWhileStatement::gener return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> DoWhileStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> DoWhileStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { Bytecode::Generator::SourceLocationScope scope(generator, *this); // jump always (true) body @@ -960,7 +960,7 @@ Bytecode::CodeGenerationErrorOr> ForStatement::generate_ return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> ForStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> ForStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { Bytecode::Generator::SourceLocationScope scope(generator, *this); // init @@ -2632,7 +2632,7 @@ Bytecode::CodeGenerationErrorOr> TryStatement::generate_ bool did_create_variable_scope_for_catch_clause = false; TRY(m_handler->parameter().visit( - [&](DeprecatedFlyString const& parameter) -> Bytecode::CodeGenerationErrorOr { + [&](FlyByteString const& parameter) -> Bytecode::CodeGenerationErrorOr { if (!parameter.is_empty()) { generator.begin_variable_scope(); did_create_variable_scope_for_catch_clause = true; @@ -2733,7 +2733,7 @@ Bytecode::CodeGenerationErrorOr> SwitchStatement::genera return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> SwitchStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> SwitchStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { Bytecode::Generator::SourceLocationScope scope(generator, *this); @@ -3115,7 +3115,7 @@ static Bytecode::CodeGenerationErrorOr for_in_of_he } // 14.7.5.7 ForIn/OfBodyEvaluation ( lhs, stmt, iteratorRecord, iterationKind, lhsKind, labelSet [ , iteratorKind ] ), https://tc39.es/ecma262/#sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset -static Bytecode::CodeGenerationErrorOr> for_in_of_body_evaluation(Bytecode::Generator& generator, ASTNode const& node, Variant, NonnullRefPtr> const& lhs, ASTNode const& body, ForInOfHeadEvaluationResult const& head_result, Vector const& label_set, Bytecode::BasicBlock& loop_end, Bytecode::BasicBlock& loop_update, IteratorHint iterator_kind = IteratorHint::Sync, [[maybe_unused]] Optional preferred_dst = {}) +static Bytecode::CodeGenerationErrorOr> for_in_of_body_evaluation(Bytecode::Generator& generator, ASTNode const& node, Variant, NonnullRefPtr> const& lhs, ASTNode const& body, ForInOfHeadEvaluationResult const& head_result, Vector const& label_set, Bytecode::BasicBlock& loop_end, Bytecode::BasicBlock& loop_update, IteratorHint iterator_kind = IteratorHint::Sync, [[maybe_unused]] Optional preferred_dst = {}) { // 1. If iteratorKind is not present, set iteratorKind to sync. @@ -3348,7 +3348,7 @@ Bytecode::CodeGenerationErrorOr> ForInStatement::generat } // 14.7.5.5 Runtime Semantics: ForInOfLoopEvaluation, https://tc39.es/ecma262/#sec-runtime-semantics-forinofloopevaluation -Bytecode::CodeGenerationErrorOr> ForInStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> ForInStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { auto& loop_end = generator.make_block(); auto& loop_update = generator.make_block(); @@ -3364,7 +3364,7 @@ Bytecode::CodeGenerationErrorOr> ForOfStatement::generat return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> ForOfStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> ForOfStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { auto& loop_end = generator.make_block(); auto& loop_update = generator.make_block(); @@ -3380,7 +3380,7 @@ Bytecode::CodeGenerationErrorOr> ForAwaitOfStatement::ge return generate_labelled_evaluation(generator, {}); } -Bytecode::CodeGenerationErrorOr> ForAwaitOfStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const +Bytecode::CodeGenerationErrorOr> ForAwaitOfStatement::generate_labelled_evaluation(Bytecode::Generator& generator, Vector const& label_set, [[maybe_unused]] Optional preferred_dst) const { auto& loop_end = generator.make_block(); auto& loop_update = generator.make_block(); diff --git a/Userland/Libraries/LibJS/Bytecode/Executable.h b/Userland/Libraries/LibJS/Bytecode/Executable.h index 9bdf2bcb17d7e0..860d431311a73b 100644 --- a/Userland/Libraries/LibJS/Bytecode/Executable.h +++ b/Userland/Libraries/LibJS/Bytecode/Executable.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -58,7 +58,7 @@ class Executable final : public Cell { virtual ~Executable() override; - DeprecatedFlyString name; + FlyByteString name; Vector bytecode; Vector property_lookup_caches; Vector global_variable_caches; @@ -83,15 +83,15 @@ class Executable final : public Cell { HashMap source_map; - Vector local_variable_names; + Vector local_variable_names; size_t local_index_base { 0 }; Optional length_identifier; ByteString const& get_string(StringTableIndex index) const { return string_table->get(index); } - DeprecatedFlyString const& get_identifier(IdentifierTableIndex index) const { return identifier_table->get(index); } + FlyByteString const& get_identifier(IdentifierTableIndex index) const { return identifier_table->get(index); } - Optional get_identifier(Optional const& index) const + Optional get_identifier(Optional const& index) const { if (!index.has_value()) return {}; diff --git a/Userland/Libraries/LibJS/Bytecode/Generator.cpp b/Userland/Libraries/LibJS/Bytecode/Generator.cpp index a7b1d651a3513e..eb24c4a03d7264 100644 --- a/Userland/Libraries/LibJS/Bytecode/Generator.cpp +++ b/Userland/Libraries/LibJS/Bytecode/Generator.cpp @@ -199,7 +199,7 @@ CodeGenerationErrorOr Generator::emit_function_declaration_instantiation(E return {}; } -CodeGenerationErrorOr> Generator::compile(VM& vm, ASTNode const& node, FunctionKind enclosing_function_kind, GCPtr function, MustPropagateCompletion must_propagate_completion, Vector local_variable_names) +CodeGenerationErrorOr> Generator::compile(VM& vm, ASTNode const& node, FunctionKind enclosing_function_kind, GCPtr function, MustPropagateCompletion must_propagate_completion, Vector local_variable_names) { Generator generator(vm, function, must_propagate_completion); @@ -462,7 +462,7 @@ CodeGenerationErrorOr> Generator::compile(VM& vm, ASTNo CodeGenerationErrorOr> Generator::generate_from_ast_node(VM& vm, ASTNode const& node, FunctionKind enclosing_function_kind) { - Vector local_variable_names; + Vector local_variable_names; if (is(node)) local_variable_names = static_cast(node).local_variables_names(); return compile(vm, node, enclosing_function_kind, {}, MustPropagateCompletion::Yes, move(local_variable_names)); @@ -568,7 +568,7 @@ void Generator::end_variable_scope() } } -void Generator::begin_continuable_scope(Label continue_target, Vector const& language_label_set) +void Generator::begin_continuable_scope(Label continue_target, Vector const& language_label_set) { m_continuable_scopes.append({ continue_target, language_label_set }); start_boundary(BlockBoundaryType::Continue); @@ -585,7 +585,7 @@ Label Generator::nearest_breakable_scope() const return m_breakable_scopes.last().bytecode_target; } -void Generator::begin_breakable_scope(Label breakable_target, Vector const& language_label_set) +void Generator::begin_breakable_scope(Label breakable_target, Vector const& language_label_set) { m_breakable_scopes.append({ breakable_target, language_label_set }); start_boundary(BlockBoundaryType::Break); @@ -969,7 +969,7 @@ void Generator::generate_scoped_jump(JumpType type) VERIFY_NOT_REACHED(); } -void Generator::generate_labelled_jump(JumpType type, DeprecatedFlyString const& label) +void Generator::generate_labelled_jump(JumpType type, FlyByteString const& label) { TemporaryChange temp { m_current_unwind_context, m_current_unwind_context }; size_t current_boundary = m_boundaries.size(); @@ -1020,7 +1020,7 @@ void Generator::generate_break() generate_scoped_jump(JumpType::Break); } -void Generator::generate_break(DeprecatedFlyString const& break_label) +void Generator::generate_break(FlyByteString const& break_label) { generate_labelled_jump(JumpType::Break, break_label); } @@ -1030,7 +1030,7 @@ void Generator::generate_continue() generate_scoped_jump(JumpType::Continue); } -void Generator::generate_continue(DeprecatedFlyString const& continue_label) +void Generator::generate_continue(FlyByteString const& continue_label) { generate_labelled_jump(JumpType::Continue, continue_label); } diff --git a/Userland/Libraries/LibJS/Bytecode/Generator.h b/Userland/Libraries/LibJS/Bytecode/Generator.h index efdeb94def7e6b..b347941ce32061 100644 --- a/Userland/Libraries/LibJS/Bytecode/Generator.h +++ b/Userland/Libraries/LibJS/Bytecode/Generator.h @@ -153,9 +153,9 @@ class Generator { CodeGenerationErrorOr> emit_named_evaluation_if_anonymous_function(Expression const&, Optional lhs_name, Optional preferred_dst = {}); - void begin_continuable_scope(Label continue_target, Vector const& language_label_set); + void begin_continuable_scope(Label continue_target, Vector const& language_label_set); void end_continuable_scope(); - void begin_breakable_scope(Label breakable_target, Vector const& language_label_set); + void begin_breakable_scope(Label breakable_target, Vector const& language_label_set); void end_breakable_scope(); [[nodiscard]] Label nearest_continuable_scope() const; @@ -198,7 +198,7 @@ class Generator { return m_regex_table->insert(move(regex)); } - IdentifierTableIndex intern_identifier(DeprecatedFlyString string) + IdentifierTableIndex intern_identifier(FlyByteString string) { return m_identifier_table->insert(move(string)); } @@ -265,10 +265,10 @@ class Generator { bool must_enter_finalizer() const { return m_boundaries.contains_slow(BlockBoundaryType::ReturnToFinally); } void generate_break(); - void generate_break(DeprecatedFlyString const& break_label); + void generate_break(FlyByteString const& break_label); void generate_continue(); - void generate_continue(DeprecatedFlyString const& continue_label); + void generate_continue(FlyByteString const& continue_label); template void emit_return(ScopedOperand value) @@ -343,14 +343,14 @@ class Generator { private: VM& m_vm; - static CodeGenerationErrorOr> compile(VM&, ASTNode const&, FunctionKind, GCPtr, MustPropagateCompletion, Vector local_variable_names); + static CodeGenerationErrorOr> compile(VM&, ASTNode const&, FunctionKind, GCPtr, MustPropagateCompletion, Vector local_variable_names); enum class JumpType { Continue, Break, }; void generate_scoped_jump(JumpType); - void generate_labelled_jump(JumpType, DeprecatedFlyString const& label); + void generate_labelled_jump(JumpType, FlyByteString const& label); Generator(VM&, GCPtr, MustPropagateCompletion); ~Generator() = default; @@ -362,7 +362,7 @@ class Generator { struct LabelableScope { Label bytecode_target; - Vector language_label_set; + Vector language_label_set; }; BasicBlock* m_current_basic_block { nullptr }; diff --git a/Userland/Libraries/LibJS/Bytecode/IdentifierTable.cpp b/Userland/Libraries/LibJS/Bytecode/IdentifierTable.cpp index 121bbacab2a24e..87f24b5d97e2f4 100644 --- a/Userland/Libraries/LibJS/Bytecode/IdentifierTable.cpp +++ b/Userland/Libraries/LibJS/Bytecode/IdentifierTable.cpp @@ -8,14 +8,14 @@ namespace JS::Bytecode { -IdentifierTableIndex IdentifierTable::insert(DeprecatedFlyString string) +IdentifierTableIndex IdentifierTable::insert(FlyByteString string) { m_identifiers.append(move(string)); VERIFY(m_identifiers.size() <= NumericLimits::max()); return { static_cast(m_identifiers.size() - 1) }; } -DeprecatedFlyString const& IdentifierTable::get(IdentifierTableIndex index) const +FlyByteString const& IdentifierTable::get(IdentifierTableIndex index) const { return m_identifiers[index.value]; } diff --git a/Userland/Libraries/LibJS/Bytecode/IdentifierTable.h b/Userland/Libraries/LibJS/Bytecode/IdentifierTable.h index 1e02723b2b0fed..8065a70eb18145 100644 --- a/Userland/Libraries/LibJS/Bytecode/IdentifierTable.h +++ b/Userland/Libraries/LibJS/Bytecode/IdentifierTable.h @@ -6,8 +6,8 @@ #pragma once -#include #include +#include #include namespace JS::Bytecode { @@ -24,13 +24,13 @@ class IdentifierTable { public: IdentifierTable() = default; - IdentifierTableIndex insert(DeprecatedFlyString); - DeprecatedFlyString const& get(IdentifierTableIndex) const; + IdentifierTableIndex insert(FlyByteString); + FlyByteString const& get(IdentifierTableIndex) const; void dump() const; bool is_empty() const { return m_identifiers.is_empty(); } private: - Vector m_identifiers; + Vector m_identifiers; }; } diff --git a/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp b/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp index 455f58c83ae1ba..e6edf76af1a438 100644 --- a/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp +++ b/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp @@ -809,7 +809,7 @@ void Interpreter::enter_object_environment(Object& object) running_execution_context().lexical_environment = new_object_environment(object, true, old_environment); } -ThrowCompletionOr> compile(VM& vm, ASTNode const& node, FunctionKind kind, DeprecatedFlyString const& name) +ThrowCompletionOr> compile(VM& vm, ASTNode const& node, FunctionKind kind, FlyByteString const& name) { auto executable_result = Bytecode::Generator::generate_from_ast_node(vm, node, kind); if (executable_result.is_error()) @@ -1156,7 +1156,7 @@ inline ThrowCompletionOr get_global(Interpreter& interpreter, IdentifierT return vm.throw_completion(ErrorType::UnknownIdentifier, identifier); } -inline ThrowCompletionOr put_by_property_key(VM& vm, Value base, Value this_value, Value value, Optional const& base_identifier, PropertyKey name, Op::PropertyKind kind, PropertyLookupCache* cache = nullptr) +inline ThrowCompletionOr put_by_property_key(VM& vm, Value base, Value this_value, Value value, Optional const& base_identifier, PropertyKey name, Op::PropertyKind kind, PropertyLookupCache* cache = nullptr) { // Better error message than to_object would give if (vm.in_strict_mode() && base.is_nullish()) @@ -1266,7 +1266,7 @@ inline Value new_function(VM& vm, FunctionNode const& function_node, Optional put_by_value(VM& vm, Value base, Optional const& base_identifier, Value property_key_value, Value value, Op::PropertyKind kind) +inline ThrowCompletionOr put_by_value(VM& vm, Value base, Optional const& base_identifier, Value property_key_value, Value value, Op::PropertyKind kind) { // OPTIMIZATION: Fast path for simple Int32 indexes in array-like objects. if ((kind == Op::PropertyKind::KeyValue || kind == Op::PropertyKind::DirectKeyValue) @@ -1370,7 +1370,7 @@ struct CalleeAndThis { Value this_value; }; -inline ThrowCompletionOr get_callee_and_this_from_environment(Bytecode::Interpreter& interpreter, DeprecatedFlyString const& name, EnvironmentCoordinate& cache) +inline ThrowCompletionOr get_callee_and_this_from_environment(Bytecode::Interpreter& interpreter, FlyByteString const& name, EnvironmentCoordinate& cache) { auto& vm = interpreter.vm(); @@ -1458,7 +1458,7 @@ inline MarkedVector argument_list_evaluation(VM& vm, Value arguments) return argument_values; } -inline ThrowCompletionOr create_variable(VM& vm, DeprecatedFlyString const& name, Op::EnvironmentMode mode, bool is_global, bool is_immutable, bool is_strict) +inline ThrowCompletionOr create_variable(VM& vm, FlyByteString const& name, Op::EnvironmentMode mode, bool is_global, bool is_immutable, bool is_strict) { if (mode == Op::EnvironmentMode::Lexical) { VERIFY(!is_global); @@ -1493,8 +1493,8 @@ inline ThrowCompletionOr new_class(VM& vm, Value supe auto* class_environment = vm.lexical_environment(); vm.running_execution_context().lexical_environment = vm.running_execution_context().saved_lexical_environments.take_last(); - Optional binding_name; - DeprecatedFlyString class_name; + Optional binding_name; + FlyByteString class_name; if (!class_expression.has_name() && lhs_name.has_value()) { class_name = interpreter.current_executable().get_identifier(lhs_name.value()); } else { diff --git a/Userland/Libraries/LibJS/Bytecode/Interpreter.h b/Userland/Libraries/LibJS/Bytecode/Interpreter.h index fb56283355a755..5e390dc7f2cfd3 100644 --- a/Userland/Libraries/LibJS/Bytecode/Interpreter.h +++ b/Userland/Libraries/LibJS/Bytecode/Interpreter.h @@ -103,7 +103,7 @@ class Interpreter { extern bool g_dump_bytecode; -ThrowCompletionOr> compile(VM&, ASTNode const&, JS::FunctionKind kind, DeprecatedFlyString const& name); +ThrowCompletionOr> compile(VM&, ASTNode const&, JS::FunctionKind kind, FlyByteString const& name); ThrowCompletionOr> compile(VM&, ECMAScriptFunctionObject const&); } diff --git a/Userland/Libraries/LibJS/Bytecode/Op.h b/Userland/Libraries/LibJS/Bytecode/Op.h index 0c34724c6f232d..36c83a93018e79 100644 --- a/Userland/Libraries/LibJS/Bytecode/Op.h +++ b/Userland/Libraries/LibJS/Bytecode/Op.h @@ -1312,7 +1312,7 @@ class GetByValue final : public Instruction { Operand base() const { return m_base; } Operand property() const { return m_property; } - Optional base_identifier(Bytecode::Interpreter const&) const; + Optional base_identifier(Bytecode::Interpreter const&) const; private: Operand m_dst; diff --git a/Userland/Libraries/LibJS/Lexer.cpp b/Userland/Libraries/LibJS/Lexer.cpp index c5fb732857cc28..ba5b6e25cacf28 100644 --- a/Userland/Libraries/LibJS/Lexer.cpp +++ b/Userland/Libraries/LibJS/Lexer.cpp @@ -16,7 +16,7 @@ namespace JS { -HashMap Lexer::s_keywords; +HashMap Lexer::s_keywords; static constexpr TokenType parse_two_char_token(StringView view) { @@ -700,7 +700,7 @@ Token Lexer::next() // bunch of Invalid* tokens (bad numeric literals, unterminated comments etc.) StringView token_message; - Optional identifier; + Optional identifier; size_t identifier_length = 0; if (m_current_token.type() == TokenType::RegexLiteral && !is_eof() && is_ascii_alpha(m_current_char) && !did_consume_whitespace_or_comments) { diff --git a/Userland/Libraries/LibJS/Lexer.h b/Userland/Libraries/LibJS/Lexer.h index b36c81f9733674..8086eae873b362 100644 --- a/Userland/Libraries/LibJS/Lexer.h +++ b/Userland/Libraries/LibJS/Lexer.h @@ -80,12 +80,12 @@ class Lexer { Optional m_hit_invalid_unicode; - static HashMap s_keywords; + static HashMap s_keywords; struct ParsedIdentifiers : public RefCounted { // Resolved identifiers must be kept alive for the duration of the parsing stage, otherwise // the only references to these strings are deleted by the Token destructor. - HashTable identifiers; + HashTable identifiers; }; RefPtr m_parsed_identifiers; diff --git a/Userland/Libraries/LibJS/Module.cpp b/Userland/Libraries/LibJS/Module.cpp index 574178c9134dfa..e6987ebfd31ea8 100644 --- a/Userland/Libraries/LibJS/Module.cpp +++ b/Userland/Libraries/LibJS/Module.cpp @@ -134,7 +134,7 @@ ThrowCompletionOr Module::get_module_namespace(VM& vm) auto exported_names = TRY(get_exported_names(vm)); // b. Let unambiguousNames be a new empty List. - Vector unambiguous_names; + Vector unambiguous_names; // c. For each element name of exportedNames, do for (auto& name : exported_names) { @@ -157,7 +157,7 @@ ThrowCompletionOr Module::get_module_namespace(VM& vm) } // 10.4.6.12 ModuleNamespaceCreate ( module, exports ), https://tc39.es/ecma262/#sec-modulenamespacecreate -Object* Module::module_namespace_create(VM& vm, Vector unambiguous_names) +Object* Module::module_namespace_create(VM& vm, Vector unambiguous_names) { auto& realm = this->realm(); diff --git a/Userland/Libraries/LibJS/Module.h b/Userland/Libraries/LibJS/Module.h index dafe46510e5cb1..9db815038ceaf0 100644 --- a/Userland/Libraries/LibJS/Module.h +++ b/Userland/Libraries/LibJS/Module.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include @@ -38,7 +38,7 @@ struct ResolvedBinding { Type type { Null }; GCPtr module; - DeprecatedFlyString export_name; + FlyByteString export_name; bool is_valid() const { @@ -109,8 +109,8 @@ class Module : public Cell { virtual ThrowCompletionOr link(VM& vm) = 0; virtual ThrowCompletionOr evaluate(VM& vm) = 0; - virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set = {}) = 0; - virtual ThrowCompletionOr resolve_export(VM& vm, DeprecatedFlyString const& export_name, Vector resolve_set = {}) = 0; + virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set = {}) = 0; + virtual ThrowCompletionOr resolve_export(VM& vm, FlyByteString const& export_name, Vector resolve_set = {}) = 0; virtual ThrowCompletionOr inner_module_linking(VM& vm, Vector& stack, u32 index); virtual ThrowCompletionOr inner_module_evaluation(VM& vm, Vector& stack, u32 index); @@ -128,7 +128,7 @@ class Module : public Cell { } private: - Object* module_namespace_create(VM& vm, Vector unambiguous_names); + Object* module_namespace_create(VM& vm, Vector unambiguous_names); // These handles are only safe as long as the VM they live in is valid. // But evaluated modules SHOULD be stored in the VM so unless you intentionally diff --git a/Userland/Libraries/LibJS/Parser.cpp b/Userland/Libraries/LibJS/Parser.cpp index a3cde444fde594..462814e287c0b1 100644 --- a/Userland/Libraries/LibJS/Parser.cpp +++ b/Userland/Libraries/LibJS/Parser.cpp @@ -105,7 +105,7 @@ class ScopePusher { return scope_pusher; } - static ScopePusher catch_scope(Parser& parser, RefPtr const& pattern, DeprecatedFlyString const& parameter) + static ScopePusher catch_scope(Parser& parser, RefPtr const& pattern, FlyByteString const& parameter) { ScopePusher scope_pusher(parser, nullptr, ScopeLevel::NotTopLevel, ScopeType::Catch); if (pattern) { @@ -233,7 +233,7 @@ class ScopePusher { ScopePusher* parent_scope() { return m_parent_scope; } ScopePusher const* parent_scope() const { return m_parent_scope; } - [[nodiscard]] bool has_declaration(DeprecatedFlyString const& name) const + [[nodiscard]] bool has_declaration(FlyByteString const& name) const { return m_lexical_names.contains(name) || m_var_names.contains(name) || !m_functions_to_hoist.find_if([&name](auto& function) { return function->name() == name; }).is_end(); } @@ -478,7 +478,7 @@ class ScopePusher { } private: - void throw_identifier_declared(DeprecatedFlyString const& name, NonnullRefPtr const& declaration) + void throw_identifier_declared(FlyByteString const& name, NonnullRefPtr const& declaration) { m_parser.syntax_error(ByteString::formatted("Identifier '{}' already declared", name), declaration->source_range().start); } @@ -491,16 +491,16 @@ class ScopePusher { ScopePusher* m_parent_scope { nullptr }; ScopePusher* m_top_level_scope { nullptr }; - HashTable m_lexical_names; - HashTable m_var_names; - HashTable m_function_names; + HashTable m_lexical_names; + HashTable m_var_names; + HashTable m_function_names; - HashTable m_forbidden_lexical_names; - HashTable m_forbidden_var_names; + HashTable m_forbidden_lexical_names; + HashTable m_forbidden_var_names; Vector> m_functions_to_hoist; - HashTable m_bound_names; - HashTable m_function_parameters_candidates_for_local_variables; + HashTable m_bound_names; + HashTable m_function_parameters_candidates_for_local_variables; struct IdentifierGroup { bool captured_by_nested_function { false }; @@ -510,7 +510,7 @@ class ScopePusher { Vector> identifiers; Optional declaration_kind; }; - HashMap m_identifier_groups; + HashMap m_identifier_groups; Optional> m_function_parameters; @@ -1059,7 +1059,7 @@ RefPtr Parser::try_parse_arrow_function_expression(boo syntax_error("BindingIdentifier may not be 'arguments' or 'eval' in strict mode"); if (is_async && token.value() == "await"sv) syntax_error("'await' is a reserved identifier in async functions"); - auto identifier = create_ast_node({ m_source_code, rule_start.position(), position() }, token.DeprecatedFlyString_value()); + auto identifier = create_ast_node({ m_source_code, rule_start.position(), position() }, token.FlyByteString_value()); parameters.append({ identifier, {} }); } // If there's a newline between the closing paren and arrow it's not a valid arrow function, @@ -1330,11 +1330,11 @@ NonnullRefPtr Parser::parse_class_expression(bool expect_ Vector> elements; RefPtr super_class; RefPtr constructor; - HashTable found_private_names; + HashTable found_private_names; RefPtr class_name; if (expect_class_name || match_identifier() || match(TokenType::Yield) || match(TokenType::Await)) { - class_name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume_identifier_reference().DeprecatedFlyString_value()); + class_name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume_identifier_reference().FlyByteString_value()); } ScopePusher class_declaration_scope = ScopePusher::class_declaration_scope(*this, class_name); @@ -1634,13 +1634,13 @@ NonnullRefPtr Parser::parse_class_expression(bool expect_ constructor = create_ast_node( { m_source_code, rule_start.position(), position() }, class_name, "", move(constructor_body), Vector { FunctionParameter { move(argument_name), nullptr, true } }, 0, FunctionKind::Normal, - /* is_strict_mode */ true, parsing_insights, /* local_variables_names */ Vector {}); + /* is_strict_mode */ true, parsing_insights, /* local_variables_names */ Vector {}); } else { FunctionParsingInsights parsing_insights; constructor = create_ast_node( { m_source_code, rule_start.position(), position() }, class_name, "", move(constructor_body), Vector {}, 0, FunctionKind::Normal, - /* is_strict_mode */ true, parsing_insights, /* local_variables_names */ Vector {}); + /* is_strict_mode */ true, parsing_insights, /* local_variables_names */ Vector {}); } } @@ -2041,7 +2041,7 @@ NonnullRefPtr Parser::parse_object_expression() property_key = parse_property_key(); } else { property_key = create_ast_node({ m_source_code, rule_start.position(), position() }, identifier.value()); - property_value = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, identifier.DeprecatedFlyString_value()); + property_value = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, identifier.FlyByteString_value()); } } else { property_key = parse_property_key(); @@ -2449,7 +2449,7 @@ Parser::ExpressionResult Parser::parse_secondary_expression(NonnullRefPtr({ m_source_code, rule_start.position(), position() }, move(lhs), create_ast_node({ m_source_code, rule_start.position(), position() }, consume_and_allow_division().DeprecatedFlyString_value())); + return create_ast_node({ m_source_code, rule_start.position(), position() }, move(lhs), create_ast_node({ m_source_code, rule_start.position(), position() }, consume_and_allow_division().FlyByteString_value())); case TokenType::BracketOpen: { consume(TokenType::BracketOpen); auto expression = create_ast_node({ m_source_code, rule_start.position(), position() }, move(lhs), parse_expression(0), true); @@ -2628,7 +2628,7 @@ NonnullRefPtr Parser::parse_identifier() auto token = consume_identifier(); if (m_state.in_class_field_initializer && token.value() == "arguments"sv) syntax_error("'arguments' is not allowed in class field initializer"); - return create_identifier_and_register_in_current_scope({ m_source_code, identifier_start, position() }, token.DeprecatedFlyString_value()); + return create_identifier_and_register_in_current_scope({ m_source_code, identifier_start, position() }, token.FlyByteString_value()); } Vector Parser::parse_arguments() @@ -2923,11 +2923,11 @@ NonnullRefPtr Parser::parse_function_node(u16 parse_options, O } else if (FunctionNodeType::must_have_name() || match_identifier()) { name = create_identifier_and_register_in_current_scope( { m_source_code, rule_start.position(), position() }, - consume_identifier().DeprecatedFlyString_value()); + consume_identifier().FlyByteString_value()); } else if (is_function_expression && (match(TokenType::Yield) || match(TokenType::Await))) { name = create_identifier_and_register_in_current_scope( { m_source_code, rule_start.position(), position() }, - consume().DeprecatedFlyString_value()); + consume().FlyByteString_value()); } if (name) { @@ -3003,7 +3003,7 @@ Vector Parser::parse_formal_parameters(int& function_length, return pattern.release_nonnull(); auto token = consume_identifier(); - auto parameter_name = token.DeprecatedFlyString_value(); + auto parameter_name = token.FlyByteString_value(); check_identifier_name_for_assignment_validity(parameter_name); @@ -3038,7 +3038,7 @@ Vector Parser::parse_formal_parameters(int& function_length, syntax_error(message, Position { token.line_number(), token.line_column() }); break; } - return create_ast_node({ m_source_code, rule_start.position(), position() }, token.DeprecatedFlyString_value()); + return create_ast_node({ m_source_code, rule_start.position(), position() }, token.FlyByteString_value()); }; while (match(TokenType::CurlyOpen) || match(TokenType::BracketOpen) || match_identifier() || match(TokenType::TripleDot)) { @@ -3086,7 +3086,7 @@ Vector Parser::parse_formal_parameters(int& function_length, return parameters; } -static AK::Array s_reserved_words = { "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", "enum", "export", "extends", "false", "finally", "for", "function", "if", "import", "in", "instanceof", "new", "null", "return", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", "with" }; +static AK::Array s_reserved_words = { "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", "enum", "export", "extends", "false", "finally", "for", "function", "if", "import", "in", "instanceof", "new", "null", "return", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", "with" }; RefPtr Parser::parse_binding_pattern(Parser::AllowDuplicates allow_duplicates, Parser::AllowMemberExpressions allow_member_expressions) { @@ -3148,11 +3148,11 @@ RefPtr Parser::parse_binding_pattern(Parser::AllowDuplicat auto string_literal = parse_string_literal(token); name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, string_literal->value()); } else if (match(TokenType::BigIntLiteral)) { - auto string_value = consume().DeprecatedFlyString_value(); + auto string_value = consume().FlyByteString_value(); VERIFY(string_value.ends_with("n"sv)); - name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, DeprecatedFlyString(string_value.view().substring_view(0, string_value.length() - 1))); + name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, FlyByteString(string_value.view().substring_view(0, string_value.length() - 1))); } else { - name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume().DeprecatedFlyString_value()); + name = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume().FlyByteString_value()); } } else if (match(TokenType::BracketOpen)) { consume(); @@ -3191,7 +3191,7 @@ RefPtr Parser::parse_binding_pattern(Parser::AllowDuplicat return {}; alias = binding_pattern.release_nonnull(); } else if (match_identifier_name()) { - alias = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume().DeprecatedFlyString_value()); + alias = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, consume().FlyByteString_value()); } else { expected("identifier or binding pattern"); return {}; @@ -3229,7 +3229,7 @@ RefPtr Parser::parse_binding_pattern(Parser::AllowDuplicat alias = pattern.release_nonnull(); } else if (match_identifier_name()) { // BindingElement must always have an Empty name field - auto identifier_name = consume_identifier().DeprecatedFlyString_value(); + auto identifier_name = consume_identifier().FlyByteString_value(); alias = create_identifier_and_register_in_current_scope({ m_source_code, rule_start.position(), position() }, identifier_name); } else { expected("identifier or binding pattern"); @@ -3295,19 +3295,19 @@ RefPtr Parser::parse_lexical_binding(Optional auto binding_start = push_start(); if (match_identifier()) { - return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume_identifier().DeprecatedFlyString_value(), declaration_kind); + return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume_identifier().FlyByteString_value(), declaration_kind); } if (!m_state.in_generator_function_context && match(TokenType::Yield)) { if (m_state.strict_mode) syntax_error("Identifier must not be a reserved word in strict mode ('yield')"); - return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume().DeprecatedFlyString_value(), declaration_kind); + return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume().FlyByteString_value(), declaration_kind); } if (!m_state.await_expression_is_valid && match(TokenType::Async)) { if (m_program_type == Program::Type::Module) syntax_error("Identifier must not be a reserved word in modules ('async')"); - return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume().DeprecatedFlyString_value(), declaration_kind); + return create_identifier_and_register_in_current_scope({ m_source_code, binding_start.position(), position() }, consume().FlyByteString_value(), declaration_kind); } return {}; @@ -3467,7 +3467,7 @@ NonnullRefPtr Parser::parse_break_statement() { auto rule_start = push_start(); consume(TokenType::Break); - Optional target_label; + Optional target_label; if (match(TokenType::Semicolon)) { consume(); } else { @@ -3494,7 +3494,7 @@ NonnullRefPtr Parser::parse_continue_statement() syntax_error("'continue' not allow outside of a loop"); consume(TokenType::Continue); - Optional target_label; + Optional target_label; if (match(TokenType::Semicolon)) { consume(); return create_ast_node({ m_source_code, rule_start.position(), position() }, target_label); @@ -3563,7 +3563,7 @@ NonnullRefPtr Parser::parse_optional_chain(NonnullRefPtr({ m_source_code, start, position() }, identifier.DeprecatedFlyString_value()), + create_ast_node({ m_source_code, start, position() }, identifier.FlyByteString_value()), OptionalChain::Mode::Optional, }); } else { @@ -3589,7 +3589,7 @@ NonnullRefPtr Parser::parse_optional_chain(NonnullRefPtr({ m_source_code, start, position() }, identifier.DeprecatedFlyString_value()), + create_ast_node({ m_source_code, start, position() }, identifier.FlyByteString_value()), OptionalChain::Mode::NotOptional, }); } else { @@ -3756,7 +3756,7 @@ NonnullRefPtr Parser::parse_catch_clause() auto rule_start = push_start(); consume(TokenType::Catch); - DeprecatedFlyString parameter; + FlyByteString parameter; RefPtr pattern_parameter; auto should_expect_parameter = false; if (match(TokenType::ParenOpen)) { @@ -3776,7 +3776,7 @@ NonnullRefPtr Parser::parse_catch_clause() if (should_expect_parameter && parameter.is_empty() && !pattern_parameter) expected("an identifier or a binding pattern"); - HashTable bound_names; + HashTable bound_names; if (pattern_parameter) { // NOTE: Nothing in the callback throws an exception. @@ -4525,7 +4525,7 @@ void Parser::discard_saved_state() m_saved_state.take_last(); } -void Parser::check_identifier_name_for_assignment_validity(DeprecatedFlyString const& name, bool force_strict) +void Parser::check_identifier_name_for_assignment_validity(FlyByteString const& name, bool force_strict) { // FIXME: this is now called from multiple places maybe the error message should be dynamic? if (any_of(s_reserved_words, [&](auto& value) { return name == value; })) { @@ -4545,11 +4545,11 @@ bool Parser::match_with_clause() const return !m_state.current_token.trivia_contains_line_terminator() && m_state.current_token.original_value() == "assert"sv; } -DeprecatedFlyString Parser::consume_string_value() +FlyByteString Parser::consume_string_value() { VERIFY(match(TokenType::StringLiteral)); auto string_token = consume(); - DeprecatedFlyString value = parse_string_literal(string_token)->value(); + FlyByteString value = parse_string_literal(string_token)->value(); // This also checks IsStringWellFormedUnicode which makes sure there is no unpaired surrogate // Surrogates are at least 3 bytes @@ -4620,7 +4620,7 @@ ModuleRequest Parser::parse_module_request() return request; } -static DeprecatedFlyString default_string_value = "default"; +static FlyByteString default_string_value = "default"; NonnullRefPtr Parser::parse_import_statement(Program& program) { @@ -4709,13 +4709,13 @@ NonnullRefPtr Parser::parse_import_statement(Program& pro // ImportSpecifier : ImportedBinding auto require_as = !match_imported_binding(); auto name_position = position(); - auto name = consume().DeprecatedFlyString_value(); + auto name = consume().FlyByteString_value(); if (match_as()) { consume(TokenType::Identifier); auto alias_position = position(); - auto alias = consume_identifier().DeprecatedFlyString_value(); + auto alias = consume_identifier().FlyByteString_value(); check_identifier_name_for_assignment_validity(alias); entries_with_location.append({ { name, alias }, alias_position }); @@ -4736,7 +4736,7 @@ NonnullRefPtr Parser::parse_import_statement(Program& pro consume(TokenType::Identifier); auto alias_position = position(); - auto alias = consume_identifier().DeprecatedFlyString_value(); + auto alias = consume_identifier().FlyByteString_value(); check_identifier_name_for_assignment_validity(alias); entries_with_location.append({ { move(name), alias }, alias_position }); @@ -4823,7 +4823,7 @@ NonnullRefPtr Parser::parse_export_statement(Program& pro auto default_position = position(); consume(TokenType::Default); - Optional local_name; + Optional local_name; auto lookahead_token = next_token(); @@ -4937,7 +4937,7 @@ NonnullRefPtr Parser::parse_export_statement(Program& pro Required } check_for_from { FromSpecifier::NotAllowed }; - auto parse_module_export_name = [&](bool lhs) -> DeprecatedFlyString { + auto parse_module_export_name = [&](bool lhs) -> FlyByteString { // https://tc39.es/ecma262/#prod-ModuleExportName // ModuleExportName : // IdentifierName @@ -5162,7 +5162,7 @@ Parser::ForbiddenTokens Parser::ForbiddenTokens::forbid(std::initializer_list Parser::parse_function_node(u16, Optional const&); template NonnullRefPtr Parser::parse_function_node(u16, Optional const&); -NonnullRefPtr Parser::create_identifier_and_register_in_current_scope(SourceRange range, DeprecatedFlyString string, Optional declaration_kind) +NonnullRefPtr Parser::create_identifier_and_register_in_current_scope(SourceRange range, FlyByteString string, Optional declaration_kind) { auto id = create_ast_node(range, string); if (m_state.current_scope_pusher) diff --git a/Userland/Libraries/LibJS/Parser.h b/Userland/Libraries/LibJS/Parser.h index 1436af3964e203..ddbe3e4ed31e2e 100644 --- a/Userland/Libraries/LibJS/Parser.h +++ b/Userland/Libraries/LibJS/Parser.h @@ -261,7 +261,7 @@ class Parser { Token next_token(size_t steps = 1) const; - void check_identifier_name_for_assignment_validity(DeprecatedFlyString const&, bool force_strict = false); + void check_identifier_name_for_assignment_validity(FlyByteString const&, bool force_strict = false); bool try_parse_arrow_function_expression_failed_at_position(Position const&) const; void set_try_parse_arrow_function_expression_failed_at_position(Position const&, bool); @@ -271,7 +271,7 @@ class Parser { bool parse_directive(ScopeNode& body); void parse_statement_list(ScopeNode& output_node, AllowLabelledFunction allow_labelled_functions = AllowLabelledFunction::No); - DeprecatedFlyString consume_string_value(); + FlyByteString consume_string_value(); ModuleRequest parse_module_request(); struct RulePosition { @@ -334,12 +334,12 @@ class Parser { ParserState(Lexer, Program::Type); }; - [[nodiscard]] NonnullRefPtr create_identifier_and_register_in_current_scope(SourceRange range, DeprecatedFlyString string, Optional = {}); + [[nodiscard]] NonnullRefPtr create_identifier_and_register_in_current_scope(SourceRange range, FlyByteString string, Optional = {}); NonnullRefPtr m_source_code; Vector m_rule_starts; ParserState m_state; - DeprecatedFlyString m_filename; + FlyByteString m_filename; Vector m_saved_state; HashMap m_token_memoizations; Program::Type m_program_type; diff --git a/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp index 611a47421e8729..d79e33250a5097 100644 --- a/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp @@ -205,7 +205,7 @@ ThrowCompletionOr get_function_realm(VM& vm, FunctionObject const& funct } // 8.5.2.1 InitializeBoundName ( name, value, environment ), https://tc39.es/ecma262/#sec-initializeboundname -ThrowCompletionOr initialize_bound_name(VM& vm, DeprecatedFlyString const& name, Value value, Environment* environment) +ThrowCompletionOr initialize_bound_name(VM& vm, FlyByteString const& name, Value value, Environment* environment) { // 1. If environment is not undefined, then if (environment) { @@ -776,7 +776,7 @@ ThrowCompletionOr eval_declaration_instantiation(VM& vm, Program const& pr Vector functions_to_initialize; // 9. Let declaredFunctionNames be a new empty List. - HashTable declared_function_names; + HashTable declared_function_names; // 10. For each element d of varDeclarations, in reverse List order, do TRY(program.for_each_var_function_declaration_in_reverse_order([&](FunctionDeclaration const& function) -> ThrowCompletionOr { @@ -817,7 +817,7 @@ ThrowCompletionOr eval_declaration_instantiation(VM& vm, Program const& pr if (!strict) { // a. Let declaredFunctionOrVarNames be the list-concatenation of declaredFunctionNames and declaredVarNames. // The spec here uses 'declaredVarNames' but that has not been declared yet. - HashTable hoisted_functions; + HashTable hoisted_functions; // b. For each FunctionDeclaration f that is directly contained in the StatementList of a Block, CaseClause, or DefaultClause Contained within body, do TRY(program.for_each_function_hoistable_with_annexB_extension([&](FunctionDeclaration& function_declaration) -> ThrowCompletionOr { @@ -908,7 +908,7 @@ ThrowCompletionOr eval_declaration_instantiation(VM& vm, Program const& pr } // 12. Let declaredVarNames be a new empty List. - HashTable declared_var_names; + HashTable declared_var_names; // 13. For each element d of varDeclarations, do TRY(program.for_each_var_scoped_variable_declaration([&](VariableDeclaration const& declaration) { @@ -1106,7 +1106,7 @@ Object* create_mapped_arguments_object(VM& vm, FunctionObject& function, Vector< MUST(object->define_property_or_throw(vm.names.length, { .value = Value(length), .writable = true, .enumerable = false, .configurable = true })); // 17. Let mappedNames be a new empty List. - HashTable mapped_names; + HashTable mapped_names; // 18. Set index to numberOfParameters - 1. // 19. Repeat, while index ≥ 0, diff --git a/Userland/Libraries/LibJS/Runtime/AbstractOperations.h b/Userland/Libraries/LibJS/Runtime/AbstractOperations.h index 63ad0c8bd2b91c..a81ef73bf5594d 100644 --- a/Userland/Libraries/LibJS/Runtime/AbstractOperations.h +++ b/Userland/Libraries/LibJS/Runtime/AbstractOperations.h @@ -37,7 +37,7 @@ ThrowCompletionOr length_of_array_like(VM&, Object const&); ThrowCompletionOr> create_list_from_array_like(VM&, Value, Function(Value)> = {}); ThrowCompletionOr species_constructor(VM&, Object const&, FunctionObject& default_constructor); ThrowCompletionOr get_function_realm(VM&, FunctionObject const&); -ThrowCompletionOr initialize_bound_name(VM&, DeprecatedFlyString const&, Value, Environment*); +ThrowCompletionOr initialize_bound_name(VM&, FlyByteString const&, Value, Environment*); bool is_compatible_property_descriptor(bool extensible, PropertyDescriptor const&, Optional const& current); bool validate_and_apply_property_descriptor(Object*, PropertyKey const&, bool extensible, PropertyDescriptor const&, Optional const& current); ThrowCompletionOr get_prototype_from_constructor(VM&, FunctionObject const& constructor, NonnullGCPtr (Intrinsics::*intrinsic_default_prototype)()); diff --git a/Userland/Libraries/LibJS/Runtime/BoundFunction.h b/Userland/Libraries/LibJS/Runtime/BoundFunction.h index e5d4796f72d6a5..7e14c593e518a0 100644 --- a/Userland/Libraries/LibJS/Runtime/BoundFunction.h +++ b/Userland/Libraries/LibJS/Runtime/BoundFunction.h @@ -23,7 +23,7 @@ class BoundFunction final : public FunctionObject { virtual ThrowCompletionOr internal_call(Value this_argument, ReadonlySpan arguments_list) override; virtual ThrowCompletionOr> internal_construct(ReadonlySpan arguments_list, FunctionObject& new_target) override; - virtual DeprecatedFlyString const& name() const override { return m_name; } + virtual FlyByteString const& name() const override { return m_name; } virtual bool is_strict_mode() const override { return m_bound_target_function->is_strict_mode(); } virtual bool has_constructor() const override { return m_bound_target_function->has_constructor(); } @@ -40,7 +40,7 @@ class BoundFunction final : public FunctionObject { Value m_bound_this; // [[BoundThis]] Vector m_bound_arguments; // [[BoundArguments]] - DeprecatedFlyString m_name; + FlyByteString m_name; }; } diff --git a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h index 8c9e86b32c26b0..21ececb945018f 100644 --- a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h +++ b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include diff --git a/Userland/Libraries/LibJS/Runtime/Completion.h b/Userland/Libraries/LibJS/Runtime/Completion.h index 02ede17f010249..51cf93975a3641 100644 --- a/Userland/Libraries/LibJS/Runtime/Completion.h +++ b/Userland/Libraries/LibJS/Runtime/Completion.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include diff --git a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.cpp b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.cpp index 74fbf0cf982524..b7412dd66e85a1 100644 --- a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.cpp +++ b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.cpp @@ -52,7 +52,7 @@ void DeclarativeEnvironment::visit_edges(Visitor& visitor) } // 9.1.1.1.1 HasBinding ( N ), https://tc39.es/ecma262/#sec-declarative-environment-records-hasbinding-n -ThrowCompletionOr DeclarativeEnvironment::has_binding(DeprecatedFlyString const& name, Optional* out_index) const +ThrowCompletionOr DeclarativeEnvironment::has_binding(FlyByteString const& name, Optional* out_index) const { auto binding_and_index = find_binding_and_index(name); if (!binding_and_index.has_value()) @@ -63,7 +63,7 @@ ThrowCompletionOr DeclarativeEnvironment::has_binding(DeprecatedFlyString } // 9.1.1.1.2 CreateMutableBinding ( N, D ), https://tc39.es/ecma262/#sec-declarative-environment-records-createmutablebinding-n-d -ThrowCompletionOr DeclarativeEnvironment::create_mutable_binding(VM&, DeprecatedFlyString const& name, bool can_be_deleted) +ThrowCompletionOr DeclarativeEnvironment::create_mutable_binding(VM&, FlyByteString const& name, bool can_be_deleted) { // 1. Assert: envRec does not already have a binding for N. // NOTE: We skip this to avoid O(n) traversal of m_bindings. @@ -86,7 +86,7 @@ ThrowCompletionOr DeclarativeEnvironment::create_mutable_binding(VM&, Depr } // 9.1.1.1.3 CreateImmutableBinding ( N, S ), https://tc39.es/ecma262/#sec-declarative-environment-records-createimmutablebinding-n-s -ThrowCompletionOr DeclarativeEnvironment::create_immutable_binding(VM&, DeprecatedFlyString const& name, bool strict) +ThrowCompletionOr DeclarativeEnvironment::create_immutable_binding(VM&, FlyByteString const& name, bool strict) { // 1. Assert: envRec does not already have a binding for N. // NOTE: We skip this to avoid O(n) traversal of m_bindings. @@ -110,7 +110,7 @@ ThrowCompletionOr DeclarativeEnvironment::create_immutable_binding(VM&, De // 9.1.1.1.4 InitializeBinding ( N, V ), https://tc39.es/ecma262/#sec-declarative-environment-records-initializebinding-n-v // 4.1.1.1.1 InitializeBinding ( N, V, hint ), https://tc39.es/proposal-explicit-resource-management/#sec-declarative-environment-records -ThrowCompletionOr DeclarativeEnvironment::initialize_binding(VM& vm, DeprecatedFlyString const& name, Value value, Environment::InitializeBindingHint hint) +ThrowCompletionOr DeclarativeEnvironment::initialize_binding(VM& vm, FlyByteString const& name, Value value, Environment::InitializeBindingHint hint) { return initialize_binding_direct(vm, find_binding_and_index(name)->index().value(), value, hint); } @@ -137,7 +137,7 @@ ThrowCompletionOr DeclarativeEnvironment::initialize_binding_direct(VM& vm } // 9.1.1.1.5 SetMutableBinding ( N, V, S ), https://tc39.es/ecma262/#sec-declarative-environment-records-setmutablebinding-n-v-s -ThrowCompletionOr DeclarativeEnvironment::set_mutable_binding(VM& vm, DeprecatedFlyString const& name, Value value, bool strict) +ThrowCompletionOr DeclarativeEnvironment::set_mutable_binding(VM& vm, FlyByteString const& name, Value value, bool strict) { // 1. If envRec does not have a binding for N, then auto binding_and_index = find_binding_and_index(name); @@ -187,7 +187,7 @@ ThrowCompletionOr DeclarativeEnvironment::set_mutable_binding_direct(VM& v } // 9.1.1.1.6 GetBindingValue ( N, S ), https://tc39.es/ecma262/#sec-declarative-environment-records-getbindingvalue-n-s -ThrowCompletionOr DeclarativeEnvironment::get_binding_value(VM& vm, DeprecatedFlyString const& name, [[maybe_unused]] bool strict) +ThrowCompletionOr DeclarativeEnvironment::get_binding_value(VM& vm, FlyByteString const& name, [[maybe_unused]] bool strict) { // 1. Assert: envRec has a binding for N. auto binding_and_index = find_binding_and_index(name); @@ -198,7 +198,7 @@ ThrowCompletionOr DeclarativeEnvironment::get_binding_value(VM& vm, Depre } // 9.1.1.1.7 DeleteBinding ( N ), https://tc39.es/ecma262/#sec-declarative-environment-records-deletebinding-n -ThrowCompletionOr DeclarativeEnvironment::delete_binding(VM&, DeprecatedFlyString const& name) +ThrowCompletionOr DeclarativeEnvironment::delete_binding(VM&, FlyByteString const& name) { // 1. Assert: envRec has a binding for the name that is the value of N. auto binding_and_index = find_binding_and_index(name); @@ -218,7 +218,7 @@ ThrowCompletionOr DeclarativeEnvironment::delete_binding(VM&, DeprecatedFl return true; } -ThrowCompletionOr DeclarativeEnvironment::initialize_or_set_mutable_binding(VM& vm, DeprecatedFlyString const& name, Value value) +ThrowCompletionOr DeclarativeEnvironment::initialize_or_set_mutable_binding(VM& vm, FlyByteString const& name, Value value) { auto binding_and_index = find_binding_and_index(name); VERIFY(binding_and_index.has_value()); @@ -230,7 +230,7 @@ ThrowCompletionOr DeclarativeEnvironment::initialize_or_set_mutable_bindin return {}; } -void DeclarativeEnvironment::initialize_or_set_mutable_binding(Badge, VM& vm, DeprecatedFlyString const& name, Value value) +void DeclarativeEnvironment::initialize_or_set_mutable_binding(Badge, VM& vm, FlyByteString const& name, Value value) { MUST(initialize_or_set_mutable_binding(vm, name, value)); } diff --git a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.h b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.h index 2a632105946c0f..b44c68c999bd6d 100644 --- a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.h +++ b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironment.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -20,7 +20,7 @@ class DeclarativeEnvironment : public Environment { JS_DECLARE_ALLOCATOR(DeclarativeEnvironment); struct Binding { - DeprecatedFlyString name; + FlyByteString name; Value value; bool strict { false }; bool mutable_ { false }; @@ -33,21 +33,21 @@ class DeclarativeEnvironment : public Environment { virtual ~DeclarativeEnvironment() override = default; - virtual ThrowCompletionOr has_binding(DeprecatedFlyString const& name, Optional* = nullptr) const override final; - virtual ThrowCompletionOr create_mutable_binding(VM&, DeprecatedFlyString const& name, bool can_be_deleted) override final; - virtual ThrowCompletionOr create_immutable_binding(VM&, DeprecatedFlyString const& name, bool strict) override final; - virtual ThrowCompletionOr initialize_binding(VM&, DeprecatedFlyString const& name, Value, InitializeBindingHint) override final; - virtual ThrowCompletionOr set_mutable_binding(VM&, DeprecatedFlyString const& name, Value, bool strict) override final; - virtual ThrowCompletionOr get_binding_value(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr delete_binding(VM&, DeprecatedFlyString const& name) override; + virtual ThrowCompletionOr has_binding(FlyByteString const& name, Optional* = nullptr) const override final; + virtual ThrowCompletionOr create_mutable_binding(VM&, FlyByteString const& name, bool can_be_deleted) override final; + virtual ThrowCompletionOr create_immutable_binding(VM&, FlyByteString const& name, bool strict) override final; + virtual ThrowCompletionOr initialize_binding(VM&, FlyByteString const& name, Value, InitializeBindingHint) override final; + virtual ThrowCompletionOr set_mutable_binding(VM&, FlyByteString const& name, Value, bool strict) override final; + virtual ThrowCompletionOr get_binding_value(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr delete_binding(VM&, FlyByteString const& name) override; - void initialize_or_set_mutable_binding(Badge, VM&, DeprecatedFlyString const& name, Value value); - ThrowCompletionOr initialize_or_set_mutable_binding(VM&, DeprecatedFlyString const& name, Value value); + void initialize_or_set_mutable_binding(Badge, VM&, FlyByteString const& name, Value value); + ThrowCompletionOr initialize_or_set_mutable_binding(VM&, FlyByteString const& name, Value value); // This is not a method defined in the spec! Do not use this in any LibJS (or other spec related) code. - [[nodiscard]] Vector bindings() const + [[nodiscard]] Vector bindings() const { - Vector names; + Vector names; names.ensure_capacity(m_bindings.size()); for (auto const& binding : m_bindings) @@ -113,7 +113,7 @@ class DeclarativeEnvironment : public Environment { friend class ModuleEnvironment; - virtual Optional find_binding_and_index(DeprecatedFlyString const& name) const + virtual Optional find_binding_and_index(FlyByteString const& name) const { if (auto it = m_bindings_assoc.find(name); it != m_bindings_assoc.end()) { return BindingAndIndex { const_cast(&m_bindings.at(it->value)), it->value }; @@ -124,7 +124,7 @@ class DeclarativeEnvironment : public Environment { private: Vector m_bindings; - HashMap m_bindings_assoc; + HashMap m_bindings_assoc; Vector m_disposable_resource_stack; u64 m_environment_serial_number { 0 }; diff --git a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp index 7cd4fbc03f3def..215c03e499460d 100644 --- a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp @@ -33,7 +33,7 @@ namespace JS { JS_DEFINE_ALLOCATOR(ECMAScriptFunctionObject); -NonnullGCPtr ECMAScriptFunctionObject::create(Realm& realm, DeprecatedFlyString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind kind, bool is_strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) +NonnullGCPtr ECMAScriptFunctionObject::create(Realm& realm, FlyByteString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind kind, bool is_strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) { Object* prototype = nullptr; switch (kind) { @@ -53,12 +53,12 @@ NonnullGCPtr ECMAScriptFunctionObject::create(Realm& r return realm.heap().allocate(realm, move(name), move(source_text), ecmascript_code, move(parameters), m_function_length, move(local_variables_names), parent_environment, private_environment, *prototype, kind, is_strict, parsing_insights, is_arrow_function, move(class_field_initializer_name)); } -NonnullGCPtr ECMAScriptFunctionObject::create(Realm& realm, DeprecatedFlyString name, Object& prototype, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind kind, bool is_strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) +NonnullGCPtr ECMAScriptFunctionObject::create(Realm& realm, FlyByteString name, Object& prototype, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind kind, bool is_strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) { return realm.heap().allocate(realm, move(name), move(source_text), ecmascript_code, move(parameters), m_function_length, move(local_variables_names), parent_environment, private_environment, prototype, kind, is_strict, parsing_insights, is_arrow_function, move(class_field_initializer_name)); } -ECMAScriptFunctionObject::ECMAScriptFunctionObject(DeprecatedFlyString name, ByteString source_text, Statement const& ecmascript_code, Vector formal_parameters, i32 function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, Object& prototype, FunctionKind kind, bool strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) +ECMAScriptFunctionObject::ECMAScriptFunctionObject(FlyByteString name, ByteString source_text, Statement const& ecmascript_code, Vector formal_parameters, i32 function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, Object& prototype, FunctionKind kind, bool strict, FunctionParsingInsights parsing_insights, bool is_arrow_function, Variant class_field_initializer_name) : FunctionObject(prototype) , m_name(move(name)) , m_function_length(function_length) @@ -161,7 +161,7 @@ ECMAScriptFunctionObject::ECMAScriptFunctionObject(DeprecatedFlyString name, Byt m_arguments_object_needed = false; } - HashTable function_names; + HashTable function_names; // 18. Else if hasParameterExpressions is false, then // a. If functionNames contains "arguments" or lexicalNames contains "arguments", then @@ -210,7 +210,7 @@ ECMAScriptFunctionObject::ECMAScriptFunctionObject(DeprecatedFlyString name, Byt *environment_size += parameters_in_environment; - HashMap parameter_bindings; + HashMap parameter_bindings; auto arguments_object_needs_binding = m_arguments_object_needed && !m_local_variables_names.contains_slow(vm().names.arguments.as_string()); @@ -227,7 +227,7 @@ ECMAScriptFunctionObject::ECMAScriptFunctionObject(DeprecatedFlyString name, Byt // a. Let parameterBindings be parameterNames. } - HashMap instantiated_var_names; + HashMap instantiated_var_names; size_t* var_environment_size = nullptr; @@ -863,7 +863,7 @@ Completion ECMAScriptFunctionObject::ordinary_call_evaluate_body() return { Completion::Type::Return, generator_object }; } -void ECMAScriptFunctionObject::set_name(DeprecatedFlyString const& name) +void ECMAScriptFunctionObject::set_name(FlyByteString const& name) { auto& vm = this->vm(); m_name = name; diff --git a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h index 8d2f2aded2559c..86697731c23b70 100644 --- a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h +++ b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h @@ -39,8 +39,8 @@ class ECMAScriptFunctionObject final : public FunctionObject { Global, }; - static NonnullGCPtr create(Realm&, DeprecatedFlyString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function = false, Variant class_field_initializer_name = {}); - static NonnullGCPtr create(Realm&, DeprecatedFlyString name, Object& prototype, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function = false, Variant class_field_initializer_name = {}); + static NonnullGCPtr create(Realm&, FlyByteString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function = false, Variant class_field_initializer_name = {}); + static NonnullGCPtr create(Realm&, FlyByteString name, Object& prototype, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function = false, Variant class_field_initializer_name = {}); virtual void initialize(Realm&) override; virtual ~ECMAScriptFunctionObject() override = default; @@ -56,8 +56,8 @@ class ECMAScriptFunctionObject final : public FunctionObject { Statement const& ecmascript_code() const { return m_ecmascript_code; } Vector const& formal_parameters() const override { return m_formal_parameters; } - virtual DeprecatedFlyString const& name() const override { return m_name; } - void set_name(DeprecatedFlyString const& name); + virtual FlyByteString const& name() const override { return m_name; } + void set_name(FlyByteString const& name); void set_is_class_constructor() { m_is_class_constructor = true; } @@ -89,7 +89,7 @@ class ECMAScriptFunctionObject final : public FunctionObject { // Equivalent to absence of [[Construct]] virtual bool has_constructor() const override { return m_kind == FunctionKind::Normal && !m_is_arrow_function; } - virtual Vector const& local_variables_names() const override { return m_local_variables_names; } + virtual Vector const& local_variables_names() const override { return m_local_variables_names; } FunctionKind kind() const { return m_kind; } @@ -109,7 +109,7 @@ class ECMAScriptFunctionObject final : public FunctionObject { virtual Completion ordinary_call_evaluate_body(); private: - ECMAScriptFunctionObject(DeprecatedFlyString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, Object& prototype, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function, Variant class_field_initializer_name); + ECMAScriptFunctionObject(FlyByteString name, ByteString source_text, Statement const& ecmascript_code, Vector parameters, i32 m_function_length, Vector local_variables_names, Environment* parent_environment, PrivateEnvironment* private_environment, Object& prototype, FunctionKind, bool is_strict, FunctionParsingInsights, bool is_arrow_function, Variant class_field_initializer_name); virtual bool is_ecmascript_function_object() const override { return true; } virtual void visit_edges(Visitor&) override; @@ -117,12 +117,12 @@ class ECMAScriptFunctionObject final : public FunctionObject { ThrowCompletionOr prepare_for_ordinary_call(ExecutionContext& callee_context, Object* new_target); void ordinary_call_bind_this(ExecutionContext&, Value this_argument); - DeprecatedFlyString m_name; + FlyByteString m_name; GCPtr m_name_string; GCPtr m_bytecode_executable; i32 m_function_length { 0 }; - Vector m_local_variables_names; + Vector m_local_variables_names; // Internal Slots of ECMAScript Function Objects, https://tc39.es/ecma262/#table-internal-slots-of-ecmascript-function-objects GCPtr m_environment; // [[Environment]] @@ -159,14 +159,14 @@ class ECMAScriptFunctionObject final : public FunctionObject { No, Yes, }; - HashMap m_parameter_names; + HashMap m_parameter_names; Vector m_functions_to_initialize; bool m_arguments_object_needed { false }; bool m_is_module_wrapper { false }; bool m_function_environment_needed { false }; bool m_uses_this { false }; Vector m_var_names_to_initialize_binding; - Vector m_function_names_to_initialize_binding; + Vector m_function_names_to_initialize_binding; size_t m_function_environment_bindings_count { 0 }; size_t m_var_environment_bindings_count { 0 }; diff --git a/Userland/Libraries/LibJS/Runtime/Environment.h b/Userland/Libraries/LibJS/Runtime/Environment.h index 5c1d10769dd3c6..69925a68d51296 100644 --- a/Userland/Libraries/LibJS/Runtime/Environment.h +++ b/Userland/Libraries/LibJS/Runtime/Environment.h @@ -33,13 +33,13 @@ class Environment : public Cell { virtual Object* with_base_object() const { return nullptr; } - virtual ThrowCompletionOr has_binding([[maybe_unused]] DeprecatedFlyString const& name, [[maybe_unused]] Optional* out_index = nullptr) const { return false; } - virtual ThrowCompletionOr create_mutable_binding(VM&, [[maybe_unused]] DeprecatedFlyString const& name, [[maybe_unused]] bool can_be_deleted) { return {}; } - virtual ThrowCompletionOr create_immutable_binding(VM&, [[maybe_unused]] DeprecatedFlyString const& name, [[maybe_unused]] bool strict) { return {}; } - virtual ThrowCompletionOr initialize_binding(VM&, [[maybe_unused]] DeprecatedFlyString const& name, Value, InitializeBindingHint) { return {}; } - virtual ThrowCompletionOr set_mutable_binding(VM&, [[maybe_unused]] DeprecatedFlyString const& name, Value, [[maybe_unused]] bool strict) { return {}; } - virtual ThrowCompletionOr get_binding_value(VM&, [[maybe_unused]] DeprecatedFlyString const& name, [[maybe_unused]] bool strict) { return Value {}; } - virtual ThrowCompletionOr delete_binding(VM&, [[maybe_unused]] DeprecatedFlyString const& name) { return false; } + virtual ThrowCompletionOr has_binding([[maybe_unused]] FlyByteString const& name, [[maybe_unused]] Optional* out_index = nullptr) const { return false; } + virtual ThrowCompletionOr create_mutable_binding(VM&, [[maybe_unused]] FlyByteString const& name, [[maybe_unused]] bool can_be_deleted) { return {}; } + virtual ThrowCompletionOr create_immutable_binding(VM&, [[maybe_unused]] FlyByteString const& name, [[maybe_unused]] bool strict) { return {}; } + virtual ThrowCompletionOr initialize_binding(VM&, [[maybe_unused]] FlyByteString const& name, Value, InitializeBindingHint) { return {}; } + virtual ThrowCompletionOr set_mutable_binding(VM&, [[maybe_unused]] FlyByteString const& name, Value, [[maybe_unused]] bool strict) { return {}; } + virtual ThrowCompletionOr get_binding_value(VM&, [[maybe_unused]] FlyByteString const& name, [[maybe_unused]] bool strict) { return Value {}; } + virtual ThrowCompletionOr delete_binding(VM&, [[maybe_unused]] FlyByteString const& name) { return false; } // [[OuterEnv]] Environment* outer_environment() { return m_outer_environment; } diff --git a/Userland/Libraries/LibJS/Runtime/Error.h b/Userland/Libraries/LibJS/Runtime/Error.h index fd99bbff132a13..9576a43b4e67d1 100644 --- a/Userland/Libraries/LibJS/Runtime/Error.h +++ b/Userland/Libraries/LibJS/Runtime/Error.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include @@ -16,7 +16,7 @@ namespace JS { struct TracebackFrame { - DeprecatedFlyString function_name; + FlyByteString function_name; [[nodiscard]] SourceRange const& source_range() const; mutable Variant source_range_storage; diff --git a/Userland/Libraries/LibJS/Runtime/ExecutionContext.h b/Userland/Libraries/LibJS/Runtime/ExecutionContext.h index afe3911948080b..17e7bc96f74860 100644 --- a/Userland/Libraries/LibJS/Runtime/ExecutionContext.h +++ b/Userland/Libraries/LibJS/Runtime/ExecutionContext.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include #include diff --git a/Userland/Libraries/LibJS/Runtime/FunctionObject.h b/Userland/Libraries/LibJS/Runtime/FunctionObject.h index a5be65df29dbe0..dc5ecdcca474c3 100644 --- a/Userland/Libraries/LibJS/Runtime/FunctionObject.h +++ b/Userland/Libraries/LibJS/Runtime/FunctionObject.h @@ -26,7 +26,7 @@ class FunctionObject : public Object { virtual ThrowCompletionOr internal_call(Value this_argument, ReadonlySpan arguments_list) = 0; virtual ThrowCompletionOr> internal_construct([[maybe_unused]] ReadonlySpan arguments_list, [[maybe_unused]] FunctionObject& new_target) { VERIFY_NOT_REACHED(); } - virtual DeprecatedFlyString const& name() const = 0; + virtual FlyByteString const& name() const = 0; void set_function_name(Variant const& name_arg, Optional const& prefix = {}); void set_function_length(double length); @@ -38,7 +38,7 @@ class FunctionObject : public Object { // [[Realm]] virtual Realm* realm() const { return nullptr; } - virtual Vector const& local_variables_names() const { VERIFY_NOT_REACHED(); } + virtual Vector const& local_variables_names() const { VERIFY_NOT_REACHED(); } virtual Vector const& formal_parameters() const { VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibJS/Runtime/FunctionPrototype.h b/Userland/Libraries/LibJS/Runtime/FunctionPrototype.h index ccd8b97a52758e..5f5cc8ac17d5bb 100644 --- a/Userland/Libraries/LibJS/Runtime/FunctionPrototype.h +++ b/Userland/Libraries/LibJS/Runtime/FunctionPrototype.h @@ -19,7 +19,7 @@ class FunctionPrototype final : public FunctionObject { virtual ~FunctionPrototype() override = default; virtual ThrowCompletionOr internal_call(Value this_argument, ReadonlySpan arguments_list) override; - virtual DeprecatedFlyString const& name() const override { return m_name; } + virtual FlyByteString const& name() const override { return m_name; } private: explicit FunctionPrototype(Realm&); @@ -32,7 +32,7 @@ class FunctionPrototype final : public FunctionObject { // Totally unnecessary, but sadly still necessary. // TODO: Get rid of the pointless name() method. - DeprecatedFlyString m_name { "FunctionPrototype" }; + FlyByteString m_name { "FunctionPrototype" }; }; } diff --git a/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.cpp b/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.cpp index 85ab24ea7c0ffb..5143e067b40963 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.cpp +++ b/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.cpp @@ -41,7 +41,7 @@ ThrowCompletionOr GlobalEnvironment::get_this_binding(VM&) const } // 9.1.1.4.1 HasBinding ( N ), https://tc39.es/ecma262/#sec-global-environment-records-hasbinding-n -ThrowCompletionOr GlobalEnvironment::has_binding(DeprecatedFlyString const& name, Optional*) const +ThrowCompletionOr GlobalEnvironment::has_binding(FlyByteString const& name, Optional*) const { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, return true. @@ -54,7 +54,7 @@ ThrowCompletionOr GlobalEnvironment::has_binding(DeprecatedFlyString const } // 9.1.1.4.2 CreateMutableBinding ( N, D ), https://tc39.es/ecma262/#sec-global-environment-records-createmutablebinding-n-d -ThrowCompletionOr GlobalEnvironment::create_mutable_binding(VM& vm, DeprecatedFlyString const& name, bool can_be_deleted) +ThrowCompletionOr GlobalEnvironment::create_mutable_binding(VM& vm, FlyByteString const& name, bool can_be_deleted) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, throw a TypeError exception. @@ -66,7 +66,7 @@ ThrowCompletionOr GlobalEnvironment::create_mutable_binding(VM& vm, Deprec } // 9.1.1.4.3 CreateImmutableBinding ( N, S ), https://tc39.es/ecma262/#sec-global-environment-records-createimmutablebinding-n-s -ThrowCompletionOr GlobalEnvironment::create_immutable_binding(VM& vm, DeprecatedFlyString const& name, bool strict) +ThrowCompletionOr GlobalEnvironment::create_immutable_binding(VM& vm, FlyByteString const& name, bool strict) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, throw a TypeError exception. @@ -78,7 +78,7 @@ ThrowCompletionOr GlobalEnvironment::create_immutable_binding(VM& vm, Depr } // 9.1.1.4.4 InitializeBinding ( N, V, hint ), https://tc39.es/ecma262/#sec-global-environment-records-initializebinding-n-v -ThrowCompletionOr GlobalEnvironment::initialize_binding(VM& vm, DeprecatedFlyString const& name, Value value, InitializeBindingHint hint) +ThrowCompletionOr GlobalEnvironment::initialize_binding(VM& vm, FlyByteString const& name, Value value, InitializeBindingHint hint) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, then @@ -96,7 +96,7 @@ ThrowCompletionOr GlobalEnvironment::initialize_binding(VM& vm, Deprecated } // 9.1.1.4.5 SetMutableBinding ( N, V, S ), https://tc39.es/ecma262/#sec-global-environment-records-setmutablebinding-n-v-s -ThrowCompletionOr GlobalEnvironment::set_mutable_binding(VM& vm, DeprecatedFlyString const& name, Value value, bool strict) +ThrowCompletionOr GlobalEnvironment::set_mutable_binding(VM& vm, FlyByteString const& name, Value value, bool strict) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, then @@ -111,7 +111,7 @@ ThrowCompletionOr GlobalEnvironment::set_mutable_binding(VM& vm, Deprecate } // 9.1.1.4.6 GetBindingValue ( N, S ), https://tc39.es/ecma262/#sec-global-environment-records-getbindingvalue-n-s -ThrowCompletionOr GlobalEnvironment::get_binding_value(VM& vm, DeprecatedFlyString const& name, bool strict) +ThrowCompletionOr GlobalEnvironment::get_binding_value(VM& vm, FlyByteString const& name, bool strict) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, then @@ -129,7 +129,7 @@ ThrowCompletionOr GlobalEnvironment::get_binding_value(VM& vm, Deprecated } // 9.1.1.4.7 DeleteBinding ( N ), https://tc39.es/ecma262/#sec-global-environment-records-deletebinding-n -ThrowCompletionOr GlobalEnvironment::delete_binding(VM& vm, DeprecatedFlyString const& name) +ThrowCompletionOr GlobalEnvironment::delete_binding(VM& vm, FlyByteString const& name) { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. If ! DclRec.HasBinding(N) is true, then @@ -165,7 +165,7 @@ ThrowCompletionOr GlobalEnvironment::delete_binding(VM& vm, DeprecatedFlyS } // 9.1.1.4.12 HasVarDeclaration ( N ), https://tc39.es/ecma262/#sec-hasvardeclaration -bool GlobalEnvironment::has_var_declaration(DeprecatedFlyString const& name) const +bool GlobalEnvironment::has_var_declaration(FlyByteString const& name) const { // 1. Let varDeclaredNames be envRec.[[VarNames]]. // 2. If varDeclaredNames contains N, return true. @@ -174,7 +174,7 @@ bool GlobalEnvironment::has_var_declaration(DeprecatedFlyString const& name) con } // 9.1.1.4.13 HasLexicalDeclaration ( N ), https://tc39.es/ecma262/#sec-haslexicaldeclaration -bool GlobalEnvironment::has_lexical_declaration(DeprecatedFlyString const& name) const +bool GlobalEnvironment::has_lexical_declaration(FlyByteString const& name) const { // 1. Let DclRec be envRec.[[DeclarativeRecord]]. // 2. Return ! DclRec.HasBinding(N). @@ -182,7 +182,7 @@ bool GlobalEnvironment::has_lexical_declaration(DeprecatedFlyString const& name) } // 9.1.1.4.14 HasRestrictedGlobalProperty ( N ), https://tc39.es/ecma262/#sec-hasrestrictedglobalproperty -ThrowCompletionOr GlobalEnvironment::has_restricted_global_property(DeprecatedFlyString const& name) const +ThrowCompletionOr GlobalEnvironment::has_restricted_global_property(FlyByteString const& name) const { // 1. Let ObjRec be envRec.[[ObjectRecord]]. // 2. Let globalObject be ObjRec.[[BindingObject]]. @@ -204,7 +204,7 @@ ThrowCompletionOr GlobalEnvironment::has_restricted_global_property(Deprec } // 9.1.1.4.15 CanDeclareGlobalVar ( N ), https://tc39.es/ecma262/#sec-candeclareglobalvar -ThrowCompletionOr GlobalEnvironment::can_declare_global_var(DeprecatedFlyString const& name) const +ThrowCompletionOr GlobalEnvironment::can_declare_global_var(FlyByteString const& name) const { // 1. Let ObjRec be envRec.[[ObjectRecord]]. // 2. Let globalObject be ObjRec.[[BindingObject]]. @@ -222,7 +222,7 @@ ThrowCompletionOr GlobalEnvironment::can_declare_global_var(DeprecatedFlyS } // 9.1.1.4.16 CanDeclareGlobalFunction ( N ), https://tc39.es/ecma262/#sec-candeclareglobalfunction -ThrowCompletionOr GlobalEnvironment::can_declare_global_function(DeprecatedFlyString const& name) const +ThrowCompletionOr GlobalEnvironment::can_declare_global_function(FlyByteString const& name) const { // 1. Let ObjRec be envRec.[[ObjectRecord]]. // 2. Let globalObject be ObjRec.[[BindingObject]]. @@ -248,7 +248,7 @@ ThrowCompletionOr GlobalEnvironment::can_declare_global_function(Deprecate } // 9.1.1.4.17 CreateGlobalVarBinding ( N, D ), https://tc39.es/ecma262/#sec-createglobalvarbinding -ThrowCompletionOr GlobalEnvironment::create_global_var_binding(DeprecatedFlyString const& name, bool can_be_deleted) +ThrowCompletionOr GlobalEnvironment::create_global_var_binding(FlyByteString const& name, bool can_be_deleted) { auto& vm = this->vm(); @@ -283,7 +283,7 @@ ThrowCompletionOr GlobalEnvironment::create_global_var_binding(DeprecatedF } // 9.1.1.4.18 CreateGlobalFunctionBinding ( N, V, D ), https://tc39.es/ecma262/#sec-createglobalfunctionbinding -ThrowCompletionOr GlobalEnvironment::create_global_function_binding(DeprecatedFlyString const& name, Value value, bool can_be_deleted) +ThrowCompletionOr GlobalEnvironment::create_global_function_binding(FlyByteString const& name, Value value, bool can_be_deleted) { // 1. Let ObjRec be envRec.[[ObjectRecord]]. // 2. Let globalObject be ObjRec.[[BindingObject]]. diff --git a/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.h b/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.h index 7bda97591edaf1..ca4e3db32c5218 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.h +++ b/Userland/Libraries/LibJS/Runtime/GlobalEnvironment.h @@ -18,25 +18,25 @@ class GlobalEnvironment final : public Environment { virtual bool has_this_binding() const final { return true; } virtual ThrowCompletionOr get_this_binding(VM&) const final; - virtual ThrowCompletionOr has_binding(DeprecatedFlyString const& name, Optional* = nullptr) const override; - virtual ThrowCompletionOr create_mutable_binding(VM&, DeprecatedFlyString const& name, bool can_be_deleted) override; - virtual ThrowCompletionOr create_immutable_binding(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr initialize_binding(VM&, DeprecatedFlyString const& name, Value, Environment::InitializeBindingHint) override; - virtual ThrowCompletionOr set_mutable_binding(VM&, DeprecatedFlyString const& name, Value, bool strict) override; - virtual ThrowCompletionOr get_binding_value(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr delete_binding(VM&, DeprecatedFlyString const& name) override; + virtual ThrowCompletionOr has_binding(FlyByteString const& name, Optional* = nullptr) const override; + virtual ThrowCompletionOr create_mutable_binding(VM&, FlyByteString const& name, bool can_be_deleted) override; + virtual ThrowCompletionOr create_immutable_binding(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr initialize_binding(VM&, FlyByteString const& name, Value, Environment::InitializeBindingHint) override; + virtual ThrowCompletionOr set_mutable_binding(VM&, FlyByteString const& name, Value, bool strict) override; + virtual ThrowCompletionOr get_binding_value(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr delete_binding(VM&, FlyByteString const& name) override; ObjectEnvironment& object_record() { return *m_object_record; } Object& global_this_value() { return *m_global_this_value; } DeclarativeEnvironment& declarative_record() { return *m_declarative_record; } - bool has_var_declaration(DeprecatedFlyString const& name) const; - bool has_lexical_declaration(DeprecatedFlyString const& name) const; - ThrowCompletionOr has_restricted_global_property(DeprecatedFlyString const& name) const; - ThrowCompletionOr can_declare_global_var(DeprecatedFlyString const& name) const; - ThrowCompletionOr can_declare_global_function(DeprecatedFlyString const& name) const; - ThrowCompletionOr create_global_var_binding(DeprecatedFlyString const& name, bool can_be_deleted); - ThrowCompletionOr create_global_function_binding(DeprecatedFlyString const& name, Value, bool can_be_deleted); + bool has_var_declaration(FlyByteString const& name) const; + bool has_lexical_declaration(FlyByteString const& name) const; + ThrowCompletionOr has_restricted_global_property(FlyByteString const& name) const; + ThrowCompletionOr can_declare_global_var(FlyByteString const& name) const; + ThrowCompletionOr can_declare_global_function(FlyByteString const& name) const; + ThrowCompletionOr create_global_var_binding(FlyByteString const& name, bool can_be_deleted); + ThrowCompletionOr create_global_function_binding(FlyByteString const& name, Value, bool can_be_deleted); private: GlobalEnvironment(Object&, Object& this_value); @@ -47,7 +47,7 @@ class GlobalEnvironment final : public Environment { GCPtr m_object_record; // [[ObjectRecord]] GCPtr m_global_this_value; // [[GlobalThisValue]] GCPtr m_declarative_record; // [[DeclarativeRecord]] - Vector m_var_names; // [[VarNames]] + Vector m_var_names; // [[VarNames]] }; template<> diff --git a/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.cpp b/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.cpp index 43d6b13522bd9f..7ab04ec20d4738 100644 --- a/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.cpp +++ b/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.cpp @@ -20,7 +20,7 @@ ModuleEnvironment::ModuleEnvironment(Environment* outer_environment) } // 9.1.1.5.1 GetBindingValue ( N, S ), https://tc39.es/ecma262/#sec-module-environment-records-getbindingvalue-n-s -ThrowCompletionOr ModuleEnvironment::get_binding_value(VM& vm, DeprecatedFlyString const& name, bool strict) +ThrowCompletionOr ModuleEnvironment::get_binding_value(VM& vm, FlyByteString const& name, bool strict) { // 1. Assert: S is true. VERIFY(strict); @@ -51,7 +51,7 @@ ThrowCompletionOr ModuleEnvironment::get_binding_value(VM& vm, Deprecated } // 9.1.1.5.2 DeleteBinding ( N ), https://tc39.es/ecma262/#sec-module-environment-records-deletebinding-n -ThrowCompletionOr ModuleEnvironment::delete_binding(VM&, DeprecatedFlyString const&) +ThrowCompletionOr ModuleEnvironment::delete_binding(VM&, FlyByteString const&) { // The DeleteBinding concrete method of a module Environment Record is never used within this specification. VERIFY_NOT_REACHED(); @@ -65,7 +65,7 @@ ThrowCompletionOr ModuleEnvironment::get_this_binding(VM&) const } // 9.1.1.5.5 CreateImportBinding ( N, M, N2 ), https://tc39.es/ecma262/#sec-createimportbinding -ThrowCompletionOr ModuleEnvironment::create_import_binding(DeprecatedFlyString name, Module* module, DeprecatedFlyString binding_name) +ThrowCompletionOr ModuleEnvironment::create_import_binding(FlyByteString name, Module* module, FlyByteString binding_name) { // 1. Assert: envRec does not already have a binding for N. VERIFY(!get_indirect_binding(name)); @@ -82,7 +82,7 @@ ThrowCompletionOr ModuleEnvironment::create_import_binding(DeprecatedFlySt return {}; } -ModuleEnvironment::IndirectBinding const* ModuleEnvironment::get_indirect_binding(DeprecatedFlyString const& name) const +ModuleEnvironment::IndirectBinding const* ModuleEnvironment::get_indirect_binding(FlyByteString const& name) const { auto binding_or_end = m_indirect_bindings.find_if([&](IndirectBinding const& binding) { return binding.name == name; @@ -93,7 +93,7 @@ ModuleEnvironment::IndirectBinding const* ModuleEnvironment::get_indirect_bindin return &(*binding_or_end); } -Optional ModuleEnvironment::find_binding_and_index(DeprecatedFlyString const& name) const +Optional ModuleEnvironment::find_binding_and_index(FlyByteString const& name) const { auto* indirect_binding = get_indirect_binding(name); if (indirect_binding != nullptr) { diff --git a/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.h b/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.h index 398080798e5263..02855219339ae8 100644 --- a/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.h +++ b/Userland/Libraries/LibJS/Runtime/ModuleEnvironment.h @@ -22,11 +22,11 @@ class ModuleEnvironment final : public DeclarativeEnvironment { // in Table 18 and share the same specifications for all of those methods except for // GetBindingValue, DeleteBinding, HasThisBinding and GetThisBinding. // In addition, module Environment Records support the methods listed in Table 24. - virtual ThrowCompletionOr get_binding_value(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr delete_binding(VM&, DeprecatedFlyString const& name) override; + virtual ThrowCompletionOr get_binding_value(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr delete_binding(VM&, FlyByteString const& name) override; virtual bool has_this_binding() const final { return true; } virtual ThrowCompletionOr get_this_binding(VM&) const final; - ThrowCompletionOr create_import_binding(DeprecatedFlyString name, Module* module, DeprecatedFlyString binding_name); + ThrowCompletionOr create_import_binding(FlyByteString name, Module* module, FlyByteString binding_name); private: explicit ModuleEnvironment(Environment* outer_environment); @@ -34,13 +34,13 @@ class ModuleEnvironment final : public DeclarativeEnvironment { virtual void visit_edges(Visitor&) override; struct IndirectBinding { - DeprecatedFlyString name; + FlyByteString name; GCPtr module; - DeprecatedFlyString binding_name; + FlyByteString binding_name; }; - IndirectBinding const* get_indirect_binding(DeprecatedFlyString const& name) const; + IndirectBinding const* get_indirect_binding(FlyByteString const& name) const; - virtual Optional find_binding_and_index(DeprecatedFlyString const& name) const override; + virtual Optional find_binding_and_index(FlyByteString const& name) const override; // FIXME: Since we always access this via the name this could be a map. Vector m_indirect_bindings; diff --git a/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.cpp b/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.cpp index 69e9cde9c15a48..dcbd95ec711c04 100644 --- a/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.cpp @@ -12,14 +12,14 @@ namespace JS { JS_DEFINE_ALLOCATOR(ModuleNamespaceObject); -ModuleNamespaceObject::ModuleNamespaceObject(Realm& realm, Module* module, Vector exports) +ModuleNamespaceObject::ModuleNamespaceObject(Realm& realm, Module* module, Vector exports) : Object(ConstructWithPrototypeTag::Tag, realm.intrinsics().object_prototype(), MayInterfereWithIndexedPropertyAccess::Yes) , m_module(module) , m_exports(move(exports)) { // Note: We just perform step 6 of 10.4.6.12 ModuleNamespaceCreate ( module, exports ), https://tc39.es/ecma262/#sec-modulenamespacecreate // 6. Let sortedExports be a List whose elements are the elements of exports ordered as if an Array of the same values had been sorted using %Array.prototype.sort% using undefined as comparefn. - quick_sort(m_exports, [&](DeprecatedFlyString const& lhs, DeprecatedFlyString const& rhs) { + quick_sort(m_exports, [&](FlyByteString const& lhs, FlyByteString const& rhs) { return lhs.view() < rhs.view(); }); } diff --git a/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.h b/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.h index be38f934717447..d88fd3cd804b40 100644 --- a/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.h +++ b/Userland/Libraries/LibJS/Runtime/ModuleNamespaceObject.h @@ -33,12 +33,12 @@ class ModuleNamespaceObject final : public Object { virtual void initialize(Realm&) override; private: - ModuleNamespaceObject(Realm&, Module* module, Vector exports); + ModuleNamespaceObject(Realm&, Module* module, Vector exports); virtual void visit_edges(Visitor&) override; - GCPtr m_module; // [[Module]] - Vector m_exports; // [[Exports]] + GCPtr m_module; // [[Module]] + Vector m_exports; // [[Exports]] }; } diff --git a/Userland/Libraries/LibJS/Runtime/ModuleRequest.h b/Userland/Libraries/LibJS/Runtime/ModuleRequest.h index 1f1f1d1834d8f3..b35e4e93e0415d 100644 --- a/Userland/Libraries/LibJS/Runtime/ModuleRequest.h +++ b/Userland/Libraries/LibJS/Runtime/ModuleRequest.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include @@ -28,20 +28,20 @@ struct ImportAttribute { struct ModuleRequest { ModuleRequest() = default; - explicit ModuleRequest(DeprecatedFlyString specifier) + explicit ModuleRequest(FlyByteString specifier) : module_specifier(move(specifier)) { } - ModuleRequest(DeprecatedFlyString specifier, Vector attributes); + ModuleRequest(FlyByteString specifier, Vector attributes); void add_attribute(ByteString key, ByteString value) { attributes.empend(move(key), move(value)); } - DeprecatedFlyString module_specifier; // [[Specifier]] - Vector attributes; // [[Attributes]] + FlyByteString module_specifier; // [[Specifier]] + Vector attributes; // [[Attributes]] }; } diff --git a/Userland/Libraries/LibJS/Runtime/NativeFunction.cpp b/Userland/Libraries/LibJS/Runtime/NativeFunction.cpp index 139d584555564e..cbb9c890e0b2d8 100644 --- a/Userland/Libraries/LibJS/Runtime/NativeFunction.cpp +++ b/Userland/Libraries/LibJS/Runtime/NativeFunction.cpp @@ -68,7 +68,7 @@ NonnullGCPtr NativeFunction::create(Realm& allocating_realm, Fun return function; } -NonnullGCPtr NativeFunction::create(Realm& realm, DeprecatedFlyString const& name, Function(VM&)> function) +NonnullGCPtr NativeFunction::create(Realm& realm, FlyByteString const& name, Function(VM&)> function) { return realm.heap().allocate(realm, name, JS::create_heap_function(realm.heap(), move(function)), realm.intrinsics().function_prototype()); } @@ -90,7 +90,7 @@ NativeFunction::NativeFunction(Object& prototype) { } -NativeFunction::NativeFunction(DeprecatedFlyString name, JS::GCPtr(VM&)>> native_function, Object& prototype) +NativeFunction::NativeFunction(FlyByteString name, JS::GCPtr(VM&)>> native_function, Object& prototype) : FunctionObject(prototype) , m_name(move(name)) , m_native_function(move(native_function)) @@ -98,7 +98,7 @@ NativeFunction::NativeFunction(DeprecatedFlyString name, JS::GCPtr create(Realm&, ESCAPING Function(VM&)> behaviour, i32 length, PropertyKey const& name, Optional = {}, Optional prototype = {}, Optional const& prefix = {}); - static NonnullGCPtr create(Realm&, DeprecatedFlyString const& name, ESCAPING Function(VM&)>); + static NonnullGCPtr create(Realm&, FlyByteString const& name, ESCAPING Function(VM&)>); virtual ~NativeFunction() override = default; @@ -34,18 +34,18 @@ class NativeFunction : public FunctionObject { virtual ThrowCompletionOr call(); virtual ThrowCompletionOr> construct(FunctionObject& new_target); - virtual DeprecatedFlyString const& name() const override { return m_name; } + virtual FlyByteString const& name() const override { return m_name; } virtual bool is_strict_mode() const override; virtual bool has_constructor() const override { return false; } virtual Realm* realm() const override { return m_realm; } - Optional const& initial_name() const { return m_initial_name; } - void set_initial_name(Badge, DeprecatedFlyString initial_name) { m_initial_name = move(initial_name); } + Optional const& initial_name() const { return m_initial_name; } + void set_initial_name(Badge, FlyByteString initial_name) { m_initial_name = move(initial_name); } protected: - NativeFunction(DeprecatedFlyString name, Object& prototype); + NativeFunction(FlyByteString name, Object& prototype); NativeFunction(JS::GCPtr(VM&)>>, Object* prototype, Realm& realm); - NativeFunction(DeprecatedFlyString name, JS::GCPtr(VM&)>>, Object& prototype); + NativeFunction(FlyByteString name, JS::GCPtr(VM&)>>, Object& prototype); explicit NativeFunction(Object& prototype); virtual void initialize(Realm&) override; @@ -54,9 +54,9 @@ class NativeFunction : public FunctionObject { private: virtual bool is_native_function() const final { return true; } - DeprecatedFlyString m_name; + FlyByteString m_name; GCPtr m_name_string; - Optional m_initial_name; // [[InitialName]] + Optional m_initial_name; // [[InitialName]] JS::GCPtr(VM&)>> m_native_function; GCPtr m_realm; }; diff --git a/Userland/Libraries/LibJS/Runtime/Object.cpp b/Userland/Libraries/LibJS/Runtime/Object.cpp index beec1d572b4158..f64719b6546ecb 100644 --- a/Userland/Libraries/LibJS/Runtime/Object.cpp +++ b/Userland/Libraries/LibJS/Runtime/Object.cpp @@ -25,7 +25,7 @@ namespace JS { JS_DEFINE_ALLOCATOR(Object); -static HashMap, HashMap> s_intrinsics; +static HashMap, HashMap> s_intrinsics; // 10.1.12 OrdinaryObjectCreate ( proto [ , additionalInternalSlotsList ] ), https://tc39.es/ecma262/#sec-ordinaryobjectcreate NonnullGCPtr Object::create(Realm& realm, Object* prototype) @@ -1398,7 +1398,7 @@ Optional Object::enumerate_object_properties(Function visited; + HashTable visited; auto const* target = this; while (target) { @@ -1406,7 +1406,7 @@ Optional Object::enumerate_object_properties(Functioninternal_get_own_property(property_key)); diff --git a/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.cpp b/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.cpp index 64a335776d2428..674a25e75501ec 100644 --- a/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.cpp +++ b/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.cpp @@ -27,7 +27,7 @@ void ObjectEnvironment::visit_edges(Cell::Visitor& visitor) } // 9.1.1.2.1 HasBinding ( N ), https://tc39.es/ecma262/#sec-object-environment-records-hasbinding-n -ThrowCompletionOr ObjectEnvironment::has_binding(DeprecatedFlyString const& name, Optional*) const +ThrowCompletionOr ObjectEnvironment::has_binding(FlyByteString const& name, Optional*) const { auto& vm = this->vm(); @@ -62,7 +62,7 @@ ThrowCompletionOr ObjectEnvironment::has_binding(DeprecatedFlyString const } // 9.1.1.2.2 CreateMutableBinding ( N, D ), https://tc39.es/ecma262/#sec-object-environment-records-createmutablebinding-n-d -ThrowCompletionOr ObjectEnvironment::create_mutable_binding(VM&, DeprecatedFlyString const& name, bool can_be_deleted) +ThrowCompletionOr ObjectEnvironment::create_mutable_binding(VM&, FlyByteString const& name, bool can_be_deleted) { // 1. Let bindingObject be envRec.[[BindingObject]]. // 2. Perform ? DefinePropertyOrThrow(bindingObject, N, PropertyDescriptor { [[Value]]: undefined, [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: D }). @@ -73,14 +73,14 @@ ThrowCompletionOr ObjectEnvironment::create_mutable_binding(VM&, Deprecate } // 9.1.1.2.3 CreateImmutableBinding ( N, S ), https://tc39.es/ecma262/#sec-object-environment-records-createimmutablebinding-n-s -ThrowCompletionOr ObjectEnvironment::create_immutable_binding(VM&, DeprecatedFlyString const&, bool) +ThrowCompletionOr ObjectEnvironment::create_immutable_binding(VM&, FlyByteString const&, bool) { // "The CreateImmutableBinding concrete method of an object Environment Record is never used within this specification." VERIFY_NOT_REACHED(); } // 9.1.1.2.4 InitializeBinding ( N, V ), https://tc39.es/ecma262/#sec-object-environment-records-initializebinding-n-v -ThrowCompletionOr ObjectEnvironment::initialize_binding(VM& vm, DeprecatedFlyString const& name, Value value, Environment::InitializeBindingHint hint) +ThrowCompletionOr ObjectEnvironment::initialize_binding(VM& vm, FlyByteString const& name, Value value, Environment::InitializeBindingHint hint) { // 1. Assert: hint is normal. VERIFY(hint == Environment::InitializeBindingHint::Normal); @@ -93,7 +93,7 @@ ThrowCompletionOr ObjectEnvironment::initialize_binding(VM& vm, Deprecated } // 9.1.1.2.5 SetMutableBinding ( N, V, S ), https://tc39.es/ecma262/#sec-object-environment-records-setmutablebinding-n-v-s -ThrowCompletionOr ObjectEnvironment::set_mutable_binding(VM&, DeprecatedFlyString const& name, Value value, bool strict) +ThrowCompletionOr ObjectEnvironment::set_mutable_binding(VM&, FlyByteString const& name, Value value, bool strict) { auto& vm = this->vm(); @@ -135,7 +135,7 @@ ThrowCompletionOr ObjectEnvironment::set_mutable_binding(VM&, DeprecatedFl } // 9.1.1.2.6 GetBindingValue ( N, S ), https://tc39.es/ecma262/#sec-object-environment-records-getbindingvalue-n-s -ThrowCompletionOr ObjectEnvironment::get_binding_value(VM&, DeprecatedFlyString const& name, bool strict) +ThrowCompletionOr ObjectEnvironment::get_binding_value(VM&, FlyByteString const& name, bool strict) { auto& vm = this->vm(); @@ -164,7 +164,7 @@ ThrowCompletionOr ObjectEnvironment::get_binding_value(VM&, DeprecatedFly } // 9.1.1.2.7 DeleteBinding ( N ), https://tc39.es/ecma262/#sec-object-environment-records-deletebinding-n -ThrowCompletionOr ObjectEnvironment::delete_binding(VM&, DeprecatedFlyString const& name) +ThrowCompletionOr ObjectEnvironment::delete_binding(VM&, FlyByteString const& name) { // 1. Let bindingObject be envRec.[[BindingObject]]. // 2. Return ? bindingObject.[[Delete]](N). diff --git a/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.h b/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.h index 2093b3d94cc772..1d0fd07bfee3d4 100644 --- a/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.h +++ b/Userland/Libraries/LibJS/Runtime/ObjectEnvironment.h @@ -20,13 +20,13 @@ class ObjectEnvironment final : public Environment { Yes, }; - virtual ThrowCompletionOr has_binding(DeprecatedFlyString const& name, Optional* = nullptr) const override; - virtual ThrowCompletionOr create_mutable_binding(VM&, DeprecatedFlyString const& name, bool can_be_deleted) override; - virtual ThrowCompletionOr create_immutable_binding(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr initialize_binding(VM&, DeprecatedFlyString const& name, Value, Environment::InitializeBindingHint) override; - virtual ThrowCompletionOr set_mutable_binding(VM&, DeprecatedFlyString const& name, Value, bool strict) override; - virtual ThrowCompletionOr get_binding_value(VM&, DeprecatedFlyString const& name, bool strict) override; - virtual ThrowCompletionOr delete_binding(VM&, DeprecatedFlyString const& name) override; + virtual ThrowCompletionOr has_binding(FlyByteString const& name, Optional* = nullptr) const override; + virtual ThrowCompletionOr create_mutable_binding(VM&, FlyByteString const& name, bool can_be_deleted) override; + virtual ThrowCompletionOr create_immutable_binding(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr initialize_binding(VM&, FlyByteString const& name, Value, Environment::InitializeBindingHint) override; + virtual ThrowCompletionOr set_mutable_binding(VM&, FlyByteString const& name, Value, bool strict) override; + virtual ThrowCompletionOr get_binding_value(VM&, FlyByteString const& name, bool strict) override; + virtual ThrowCompletionOr delete_binding(VM&, FlyByteString const& name) override; // 9.1.1.2.10 WithBaseObject ( ), https://tc39.es/ecma262/#sec-object-environment-records-withbaseobject virtual Object* with_base_object() const override diff --git a/Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp b/Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp index 1d7ba55dfe937e..c0cad0148e5679 100644 --- a/Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp +++ b/Userland/Libraries/LibJS/Runtime/PrimitiveString.cpp @@ -229,7 +229,7 @@ NonnullGCPtr PrimitiveString::create(VM& vm, ByteString string) return *it->value; } -NonnullGCPtr PrimitiveString::create(VM& vm, DeprecatedFlyString const& string) +NonnullGCPtr PrimitiveString::create(VM& vm, FlyByteString const& string) { return create(vm, ByteString { string }); } diff --git a/Userland/Libraries/LibJS/Runtime/PrimitiveString.h b/Userland/Libraries/LibJS/Runtime/PrimitiveString.h index 3519f1b004842c..dc698db7c9c8b8 100644 --- a/Userland/Libraries/LibJS/Runtime/PrimitiveString.h +++ b/Userland/Libraries/LibJS/Runtime/PrimitiveString.h @@ -29,7 +29,7 @@ class PrimitiveString final : public Cell { [[nodiscard]] static NonnullGCPtr create(VM&, String); [[nodiscard]] static NonnullGCPtr create(VM&, FlyString const&); [[nodiscard]] static NonnullGCPtr create(VM&, ByteString); - [[nodiscard]] static NonnullGCPtr create(VM&, DeprecatedFlyString const&); + [[nodiscard]] static NonnullGCPtr create(VM&, FlyByteString const&); [[nodiscard]] static NonnullGCPtr create(VM&, PrimitiveString&, PrimitiveString&); [[nodiscard]] static NonnullGCPtr create(VM&, StringView); diff --git a/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.cpp b/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.cpp index e00a476719ea6e..1ae5967686149c 100644 --- a/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.cpp +++ b/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.cpp @@ -21,7 +21,7 @@ PrivateEnvironment::PrivateEnvironment(PrivateEnvironment* parent) // Note: we start at one such that 0 can be invalid / default initialized. u64 PrivateEnvironment::s_next_id = 1u; -PrivateName PrivateEnvironment::resolve_private_identifier(DeprecatedFlyString const& identifier) const +PrivateName PrivateEnvironment::resolve_private_identifier(FlyByteString const& identifier) const { auto name_or_end = find_private_name(identifier); @@ -34,7 +34,7 @@ PrivateName PrivateEnvironment::resolve_private_identifier(DeprecatedFlyString c return m_outer_environment->resolve_private_identifier(identifier); } -void PrivateEnvironment::add_private_name(DeprecatedFlyString description) +void PrivateEnvironment::add_private_name(FlyByteString description) { if (!find_private_name(description).is_end()) return; diff --git a/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.h b/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.h index 17c93c35a278d8..8aeeccf16abb19 100644 --- a/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.h +++ b/Userland/Libraries/LibJS/Runtime/PrivateEnvironment.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -16,14 +16,14 @@ namespace JS { struct PrivateName { PrivateName() = default; - PrivateName(u64 unique_id, DeprecatedFlyString description) + PrivateName(u64 unique_id, FlyByteString description) : unique_id(unique_id) , description(move(description)) { } u64 unique_id { 0 }; - DeprecatedFlyString description; + FlyByteString description; bool operator==(PrivateName const& rhs) const; }; @@ -33,9 +33,9 @@ class PrivateEnvironment : public Cell { JS_DECLARE_ALLOCATOR(PrivateEnvironment); public: - PrivateName resolve_private_identifier(DeprecatedFlyString const& identifier) const; + PrivateName resolve_private_identifier(FlyByteString const& identifier) const; - void add_private_name(DeprecatedFlyString description); + void add_private_name(FlyByteString description); PrivateEnvironment* outer_environment() { return m_outer_environment; } PrivateEnvironment const* outer_environment() const { return m_outer_environment; } @@ -45,7 +45,7 @@ class PrivateEnvironment : public Cell { virtual void visit_edges(Visitor&) override; - auto find_private_name(DeprecatedFlyString const& description) const + auto find_private_name(FlyByteString const& description) const { return m_private_names.find_if([&](PrivateName const& private_name) { return private_name.description == description; diff --git a/Userland/Libraries/LibJS/Runtime/PropertyKey.h b/Userland/Libraries/LibJS/Runtime/PropertyKey.h index dc439a43347d71..0029307a0e773a 100644 --- a/Userland/Libraries/LibJS/Runtime/PropertyKey.h +++ b/Userland/Libraries/LibJS/Runtime/PropertyKey.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -62,13 +62,13 @@ class PropertyKey { PropertyKey(char const* chars) : m_type(Type::String) - , m_string(DeprecatedFlyString(chars)) + , m_string(FlyByteString(chars)) { } PropertyKey(ByteString const& string) : m_type(Type::String) - , m_string(DeprecatedFlyString(string)) + , m_string(FlyByteString(string)) { } @@ -78,7 +78,7 @@ class PropertyKey { { } - PropertyKey(DeprecatedFlyString string, StringMayBeNumber string_may_be_number = StringMayBeNumber::Yes) + PropertyKey(FlyByteString string, StringMayBeNumber string_may_be_number = StringMayBeNumber::Yes) : m_string_may_be_number(string_may_be_number == StringMayBeNumber::Yes) , m_type(Type::String) , m_string(move(string)) @@ -157,7 +157,7 @@ class PropertyKey { return m_number; } - DeprecatedFlyString const& as_string() const + FlyByteString const& as_string() const { VERIFY(is_string()); return m_string; @@ -191,7 +191,7 @@ class PropertyKey { bool m_string_may_be_number { true }; Type m_type { Type::Invalid }; u32 m_number { 0 }; - DeprecatedFlyString m_string; + FlyByteString m_string; Handle m_symbol; }; diff --git a/Userland/Libraries/LibJS/Runtime/ProxyObject.cpp b/Userland/Libraries/LibJS/Runtime/ProxyObject.cpp index af5c5b629928ee..6dabb9b6b5592f 100644 --- a/Userland/Libraries/LibJS/Runtime/ProxyObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/ProxyObject.cpp @@ -910,7 +910,7 @@ void ProxyObject::visit_edges(Cell::Visitor& visitor) visitor.visit(m_handler); } -DeprecatedFlyString const& ProxyObject::name() const +FlyByteString const& ProxyObject::name() const { VERIFY(is_function()); return static_cast(*m_target).name(); diff --git a/Userland/Libraries/LibJS/Runtime/ProxyObject.h b/Userland/Libraries/LibJS/Runtime/ProxyObject.h index d2f21d910c51d6..2c00bc9d2b7b48 100644 --- a/Userland/Libraries/LibJS/Runtime/ProxyObject.h +++ b/Userland/Libraries/LibJS/Runtime/ProxyObject.h @@ -21,7 +21,7 @@ class ProxyObject final : public FunctionObject { virtual ~ProxyObject() override = default; - virtual DeprecatedFlyString const& name() const override; + virtual FlyByteString const& name() const override; virtual bool has_constructor() const override; Object const& target() const { return m_target; } diff --git a/Userland/Libraries/LibJS/Runtime/Reference.cpp b/Userland/Libraries/LibJS/Runtime/Reference.cpp index 008b069a25adf5..073bf6ef863f38 100644 --- a/Userland/Libraries/LibJS/Runtime/Reference.cpp +++ b/Userland/Libraries/LibJS/Runtime/Reference.cpp @@ -208,7 +208,7 @@ ThrowCompletionOr Reference::initialize_referenced_binding(VM& vm, Value v } // 6.2.4.9 MakePrivateReference ( baseValue, privateIdentifier ), https://tc39.es/ecma262/#sec-makeprivatereference -Reference make_private_reference(VM& vm, Value base_value, DeprecatedFlyString const& private_identifier) +Reference make_private_reference(VM& vm, Value base_value, FlyByteString const& private_identifier) { // 1. Let privEnv be the running execution context's PrivateEnvironment. auto private_environment = vm.running_execution_context().private_environment; diff --git a/Userland/Libraries/LibJS/Runtime/Reference.h b/Userland/Libraries/LibJS/Runtime/Reference.h index 33f1ed8426f5af..47593fa5ace488 100644 --- a/Userland/Libraries/LibJS/Runtime/Reference.h +++ b/Userland/Libraries/LibJS/Runtime/Reference.h @@ -13,7 +13,7 @@ namespace JS { -Reference make_private_reference(VM&, Value base_value, DeprecatedFlyString const& private_identifier); +Reference make_private_reference(VM&, Value base_value, FlyByteString const& private_identifier); class Reference { public: @@ -40,7 +40,7 @@ class Reference { { } - Reference(Environment& base, DeprecatedFlyString referenced_name, bool strict = false, Optional environment_coordinate = {}) + Reference(Environment& base, FlyByteString referenced_name, bool strict = false, Optional environment_coordinate = {}) : m_base_type(BaseType::Environment) , m_base_environment(&base) , m_name(move(referenced_name)) diff --git a/Userland/Libraries/LibJS/Runtime/RegExpPrototype.cpp b/Userland/Libraries/LibJS/Runtime/RegExpPrototype.cpp index af7c83cf1b75d9..d2d6d5b2d10615 100644 --- a/Userland/Libraries/LibJS/Runtime/RegExpPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/RegExpPrototype.cpp @@ -99,7 +99,7 @@ static Value get_match_index_par(VM& vm, Utf16View const& string, Match const& m } // 22.2.7.8 MakeMatchIndicesIndexPairArray ( S, indices, groupNames, hasGroups ), https://tc39.es/ecma262/#sec-makematchindicesindexpairarray -static Value make_match_indices_index_pair_array(VM& vm, Utf16View const& string, Vector> const& indices, HashMap const& group_names, bool has_groups) +static Value make_match_indices_index_pair_array(VM& vm, Utf16View const& string, Vector> const& indices, HashMap const& group_names, bool has_groups) { // Note: This implementation differs from the spec, but has the same behavior. // @@ -273,7 +273,7 @@ static ThrowCompletionOr regexp_builtin_exec(VM& vm, RegExpObject& regexp Vector captured_values; // 26. Let groupNames be a new empty List. - HashMap group_names; + HashMap group_names; // 27. Add match as the last element of indices. indices.append(move(match_indices)); diff --git a/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h b/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h index 473ed3e7f5e9a6..d4f8a53e85cb12 100644 --- a/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h +++ b/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -21,16 +21,16 @@ class StringOrSymbol { } StringOrSymbol(char const* chars) - : StringOrSymbol(DeprecatedFlyString(chars)) + : StringOrSymbol(FlyByteString(chars)) { } StringOrSymbol(ByteString const& string) - : StringOrSymbol(DeprecatedFlyString(string)) + : StringOrSymbol(FlyByteString(string)) { } - StringOrSymbol(DeprecatedFlyString const& string) + StringOrSymbol(FlyByteString const& string) : m_string(string) { } @@ -38,7 +38,7 @@ class StringOrSymbol { ~StringOrSymbol() { if (is_string()) - m_string.~DeprecatedFlyString(); + m_string.~FlyByteString(); } StringOrSymbol(Symbol const* symbol) @@ -50,7 +50,7 @@ class StringOrSymbol { StringOrSymbol(StringOrSymbol const& other) { if (other.is_string()) - new (&m_string) DeprecatedFlyString(other.m_string); + new (&m_string) FlyByteString(other.m_string); else m_bits = other.m_bits; } @@ -58,7 +58,7 @@ class StringOrSymbol { StringOrSymbol(StringOrSymbol&& other) { if (other.is_string()) - new (&m_string) DeprecatedFlyString(move(other.m_string)); + new (&m_string) FlyByteString(move(other.m_string)); else m_bits = exchange(other.m_bits, 0); } @@ -67,7 +67,7 @@ class StringOrSymbol { ALWAYS_INLINE bool is_symbol() const { return is_valid() && (m_bits & 2); } ALWAYS_INLINE bool is_string() const { return is_valid() && !(m_bits & 2); } - ALWAYS_INLINE DeprecatedFlyString as_string() const + ALWAYS_INLINE FlyByteString as_string() const { VERIFY(is_string()); return m_string; @@ -144,7 +144,7 @@ class StringOrSymbol { } union { - DeprecatedFlyString m_string; + FlyByteString m_string; Symbol const* m_symbol_with_tag; uintptr_t m_bits; }; diff --git a/Userland/Libraries/LibJS/Runtime/TypedArray.cpp b/Userland/Libraries/LibJS/Runtime/TypedArray.cpp index af5c6232d20e04..15d5291815d71c 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArray.cpp +++ b/Userland/Libraries/LibJS/Runtime/TypedArray.cpp @@ -481,7 +481,7 @@ void TypedArrayBase::visit_edges(Visitor& visitor) { \ } \ \ - DeprecatedFlyString const& ClassName::element_name() const \ + FlyByteString const& ClassName::element_name() const \ { \ return vm().names.ClassName.as_string(); \ } \ diff --git a/Userland/Libraries/LibJS/Runtime/TypedArray.h b/Userland/Libraries/LibJS/Runtime/TypedArray.h index 338e0512bfe21d..66ff1bdb3cc647 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArray.h +++ b/Userland/Libraries/LibJS/Runtime/TypedArray.h @@ -52,7 +52,7 @@ class TypedArrayBase : public Object { [[nodiscard]] Kind kind() const { return m_kind; } u32 element_size() const { return m_element_size; } - virtual DeprecatedFlyString const& element_name() const = 0; + virtual FlyByteString const& element_name() const = 0; // 25.1.3.11 IsUnclampedIntegerElementType ( type ), https://tc39.es/ecma262/#sec-isunclampedintegerelementtype virtual bool is_unclamped_integer_element_type() const = 0; @@ -520,7 +520,7 @@ ThrowCompletionOr compare_typed_array_elements(VM&, Value x, Value y, Fu static ThrowCompletionOr> create(Realm&, u32 length, FunctionObject& new_target); \ static ThrowCompletionOr> create(Realm&, u32 length); \ static NonnullGCPtr create(Realm&, u32 length, ArrayBuffer& buffer); \ - virtual DeprecatedFlyString const& element_name() const override; \ + virtual FlyByteString const& element_name() const override; \ \ protected: \ ClassName(Object& prototype, u32 length, ArrayBuffer& array_buffer); \ diff --git a/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.cpp b/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.cpp index 8ebe1ed3a522a5..d5a973a1596476 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.cpp @@ -13,7 +13,7 @@ namespace JS { JS_DEFINE_ALLOCATOR(TypedArrayConstructor); -TypedArrayConstructor::TypedArrayConstructor(DeprecatedFlyString const& name, Object& prototype) +TypedArrayConstructor::TypedArrayConstructor(FlyByteString const& name, Object& prototype) : NativeFunction(name, prototype) { } diff --git a/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.h b/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.h index 686ebdef488d5d..d96145fa3ebb27 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.h +++ b/Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.h @@ -23,7 +23,7 @@ class TypedArrayConstructor : public NativeFunction { virtual ThrowCompletionOr> construct(FunctionObject& new_target) override; protected: - TypedArrayConstructor(DeprecatedFlyString const& name, Object& prototype); + TypedArrayConstructor(FlyByteString const& name, Object& prototype); private: virtual bool has_constructor() const override { return true; } diff --git a/Userland/Libraries/LibJS/Runtime/VM.cpp b/Userland/Libraries/LibJS/Runtime/VM.cpp index b195714673a948..148b6dfa26cbb2 100644 --- a/Userland/Libraries/LibJS/Runtime/VM.cpp +++ b/Userland/Libraries/LibJS/Runtime/VM.cpp @@ -258,7 +258,7 @@ void VM::gather_roots(HashMap& roots) } // 9.1.2.1 GetIdentifierReference ( env, name, strict ), https://tc39.es/ecma262/#sec-getidentifierreference -ThrowCompletionOr VM::get_identifier_reference(Environment* environment, DeprecatedFlyString name, bool strict, size_t hops) +ThrowCompletionOr VM::get_identifier_reference(Environment* environment, FlyByteString name, bool strict, size_t hops) { // 1. If env is the value null, then if (!environment) { @@ -292,7 +292,7 @@ ThrowCompletionOr VM::get_identifier_reference(Environment* environme } // 9.4.2 ResolveBinding ( name [ , env ] ), https://tc39.es/ecma262/#sec-resolvebinding -ThrowCompletionOr VM::resolve_binding(DeprecatedFlyString const& name, Environment* environment) +ThrowCompletionOr VM::resolve_binding(FlyByteString const& name, Environment* environment) { // 1. If env is not present or if env is undefined, then if (!environment) { diff --git a/Userland/Libraries/LibJS/Runtime/VM.h b/Userland/Libraries/LibJS/Runtime/VM.h index 77bd5a6e243ba1..7432affa7d7723 100644 --- a/Userland/Libraries/LibJS/Runtime/VM.h +++ b/Userland/Libraries/LibJS/Runtime/VM.h @@ -9,7 +9,7 @@ #pragma once -#include +#include #include #include #include @@ -195,8 +195,8 @@ class VM : public RefCounted { u32 execution_generation() const { return m_execution_generation; } void finish_execution_generation() { ++m_execution_generation; } - ThrowCompletionOr resolve_binding(DeprecatedFlyString const&, Environment* = nullptr); - ThrowCompletionOr get_identifier_reference(Environment*, DeprecatedFlyString, bool strict, size_t hops = 0); + ThrowCompletionOr resolve_binding(FlyByteString const&, Environment* = nullptr); + ThrowCompletionOr get_identifier_reference(Environment*, FlyByteString, bool strict, size_t hops = 0); // 5.2.3.2 Throw an Exception, https://tc39.es/ecma262/#sec-throw-an-exception template diff --git a/Userland/Libraries/LibJS/Runtime/WrappedFunction.h b/Userland/Libraries/LibJS/Runtime/WrappedFunction.h index e884c515cacd58..b659e7bedb405c 100644 --- a/Userland/Libraries/LibJS/Runtime/WrappedFunction.h +++ b/Userland/Libraries/LibJS/Runtime/WrappedFunction.h @@ -23,7 +23,7 @@ class WrappedFunction final : public FunctionObject { virtual ThrowCompletionOr internal_call(Value this_argument, ReadonlySpan arguments_list) override; // FIXME: Remove this (and stop inventing random internal slots that shouldn't exist, jeez) - virtual DeprecatedFlyString const& name() const override { return m_wrapped_target_function->name(); } + virtual FlyByteString const& name() const override { return m_wrapped_target_function->name(); } virtual Realm* realm() const override { return m_realm; } diff --git a/Userland/Libraries/LibJS/SourceTextModule.cpp b/Userland/Libraries/LibJS/SourceTextModule.cpp index d5a19d0b6e46f3..23f72bdb37840f 100644 --- a/Userland/Libraries/LibJS/SourceTextModule.cpp +++ b/Userland/Libraries/LibJS/SourceTextModule.cpp @@ -261,7 +261,7 @@ Result, Vector> SourceTextModule::pa } // 16.2.1.6.2 GetExportedNames ( [ exportStarSet ] ), https://tc39.es/ecma262/#sec-getexportednames -ThrowCompletionOr> SourceTextModule::get_exported_names(VM& vm, Vector export_star_set) +ThrowCompletionOr> SourceTextModule::get_exported_names(VM& vm, Vector export_star_set) { dbgln_if(JS_MODULE_DEBUG, "[JS MODULE] get_export_names of {}", filename()); // 1. Assert: module.[[Status]] is not new. @@ -276,14 +276,14 @@ ThrowCompletionOr> SourceTextModule::get_exported_na // FIXME: How do we check that? // b. Return a new empty List. - return Vector {}; + return Vector {}; } // 4. Append module to exportStarSet. export_star_set.append(this); // 5. Let exportedNames be a new empty List. - Vector exported_names; + Vector exported_names; // 6. For each ExportEntry Record e of module.[[LocalExportEntries]], do for (auto& entry : m_local_export_entries) { @@ -443,7 +443,7 @@ ThrowCompletionOr SourceTextModule::initialize_environment(VM& vm) // Note: We just loop through them in step 21. // 20. Let declaredVarNames be a new empty List. - Vector declared_var_names; + Vector declared_var_names; // 21. For each element d of varDeclarations, do // a. For each element dn of the BoundNames of d, do @@ -497,7 +497,7 @@ ThrowCompletionOr SourceTextModule::initialize_environment(VM& vm) // 1. Let fo be InstantiateFunctionObject of d with arguments env and privateEnv. // NOTE: Special case if the function is a default export of an anonymous function // it has name "*default*" but internally should have name "default". - DeprecatedFlyString function_name = function_declaration.name(); + FlyByteString function_name = function_declaration.name(); if (function_name == ExportStatement::local_name_for_default) function_name = "default"sv; auto function = ECMAScriptFunctionObject::create(realm(), function_name, function_declaration.source_text(), function_declaration.body(), function_declaration.parameters(), function_declaration.function_length(), function_declaration.local_variables_names(), environment, private_environment, function_declaration.kind(), function_declaration.is_strict_mode(), @@ -537,7 +537,7 @@ ThrowCompletionOr SourceTextModule::initialize_environment(VM& vm) } // 16.2.1.6.3 ResolveExport ( exportName [ , resolveSet ] ), https://tc39.es/ecma262/#sec-resolveexport -ThrowCompletionOr SourceTextModule::resolve_export(VM& vm, DeprecatedFlyString const& export_name, Vector resolve_set) +ThrowCompletionOr SourceTextModule::resolve_export(VM& vm, FlyByteString const& export_name, Vector resolve_set) { // 1. Assert: module.[[Status]] is not new. VERIFY(m_status != ModuleStatus::New); diff --git a/Userland/Libraries/LibJS/SourceTextModule.h b/Userland/Libraries/LibJS/SourceTextModule.h index 5ab4717eea16a6..615a1786ee19bf 100644 --- a/Userland/Libraries/LibJS/SourceTextModule.h +++ b/Userland/Libraries/LibJS/SourceTextModule.h @@ -25,8 +25,8 @@ class SourceTextModule final : public CyclicModule { Program const& parse_node() const { return *m_ecmascript_code; } - virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set) override; - virtual ThrowCompletionOr resolve_export(VM& vm, DeprecatedFlyString const& export_name, Vector resolve_set = {}) override; + virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set) override; + virtual ThrowCompletionOr resolve_export(VM& vm, FlyByteString const& export_name, Vector resolve_set = {}) override; Object* import_meta() { return m_import_meta; } void set_import_meta(Badge, Object* import_meta) { m_import_meta = import_meta; } diff --git a/Userland/Libraries/LibJS/SyntheticModule.cpp b/Userland/Libraries/LibJS/SyntheticModule.cpp index 7bcb2e0a49f5b3..0374d0e0cf3038 100644 --- a/Userland/Libraries/LibJS/SyntheticModule.cpp +++ b/Userland/Libraries/LibJS/SyntheticModule.cpp @@ -18,7 +18,7 @@ namespace JS { JS_DEFINE_ALLOCATOR(SyntheticModule); // 1.2.1 CreateSyntheticModule ( exportNames, evaluationSteps, realm, hostDefined ), https://tc39.es/proposal-json-modules/#sec-createsyntheticmodule -SyntheticModule::SyntheticModule(Vector export_names, SyntheticModule::EvaluationFunction evaluation_steps, Realm& realm, StringView filename) +SyntheticModule::SyntheticModule(Vector export_names, SyntheticModule::EvaluationFunction evaluation_steps, Realm& realm, StringView filename) : Module(realm, filename) , m_export_names(move(export_names)) , m_evaluation_steps(move(evaluation_steps)) @@ -27,14 +27,14 @@ SyntheticModule::SyntheticModule(Vector export_names, Synth } // 1.2.3.1 GetExportedNames( exportStarSet ), https://tc39.es/proposal-json-modules/#sec-smr-getexportednames -ThrowCompletionOr> SyntheticModule::get_exported_names(VM&, Vector) +ThrowCompletionOr> SyntheticModule::get_exported_names(VM&, Vector) { // 1. Return module.[[ExportNames]]. return m_export_names; } // 1.2.3.2 ResolveExport( exportName, resolveSet ), https://tc39.es/proposal-json-modules/#sec-smr-resolveexport -ThrowCompletionOr SyntheticModule::resolve_export(VM&, DeprecatedFlyString const& export_name, Vector) +ThrowCompletionOr SyntheticModule::resolve_export(VM&, FlyByteString const& export_name, Vector) { // 1. If module.[[ExportNames]] does not contain exportName, return null. if (!m_export_names.contains_slow(export_name)) @@ -123,7 +123,7 @@ ThrowCompletionOr SyntheticModule::evaluate(VM& vm) } // 1.2.2 SetSyntheticModuleExport ( module, exportName, exportValue ), https://tc39.es/proposal-json-modules/#sec-setsyntheticmoduleexport -ThrowCompletionOr SyntheticModule::set_synthetic_module_export(DeprecatedFlyString const& export_name, Value export_value) +ThrowCompletionOr SyntheticModule::set_synthetic_module_export(FlyByteString const& export_name, Value export_value) { auto& vm = this->realm().vm(); @@ -143,7 +143,7 @@ NonnullGCPtr SyntheticModule::create_default_export_synthetic_m }; // 2. Return CreateSyntheticModule("default", closure, realm) - return realm.heap().allocate_without_realm(Vector { "default" }, move(closure), realm, filename); + return realm.heap().allocate_without_realm(Vector { "default" }, move(closure), realm, filename); } // 1.4 ParseJSONModule ( source ), https://tc39.es/proposal-json-modules/#sec-parse-json-module diff --git a/Userland/Libraries/LibJS/SyntheticModule.h b/Userland/Libraries/LibJS/SyntheticModule.h index c99f0186834a2a..713a7128634a2c 100644 --- a/Userland/Libraries/LibJS/SyntheticModule.h +++ b/Userland/Libraries/LibJS/SyntheticModule.h @@ -20,19 +20,19 @@ class SyntheticModule final : public Module { static NonnullGCPtr create_default_export_synthetic_module(Value default_export, Realm& realm, StringView filename); - ThrowCompletionOr set_synthetic_module_export(DeprecatedFlyString const& export_name, Value export_value); + ThrowCompletionOr set_synthetic_module_export(FlyByteString const& export_name, Value export_value); virtual ThrowCompletionOr link(VM& vm) override; virtual ThrowCompletionOr evaluate(VM& vm) override; - virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set) override; - virtual ThrowCompletionOr resolve_export(VM& vm, DeprecatedFlyString const& export_name, Vector resolve_set) override; + virtual ThrowCompletionOr> get_exported_names(VM& vm, Vector export_star_set) override; + virtual ThrowCompletionOr resolve_export(VM& vm, FlyByteString const& export_name, Vector resolve_set) override; virtual PromiseCapability& load_requested_modules(GCPtr) override; private: - SyntheticModule(Vector export_names, EvaluationFunction evaluation_steps, Realm& realm, StringView filename); + SyntheticModule(Vector export_names, EvaluationFunction evaluation_steps, Realm& realm, StringView filename); - Vector m_export_names; // [[ExportNames]] - EvaluationFunction m_evaluation_steps; // [[EvaluationSteps]] + Vector m_export_names; // [[ExportNames]] + EvaluationFunction m_evaluation_steps; // [[EvaluationSteps]] }; ThrowCompletionOr> parse_json_module(StringView source_text, Realm& realm, StringView filename); diff --git a/Userland/Libraries/LibJS/Token.h b/Userland/Libraries/LibJS/Token.h index add55592a2f5c6..512a72c1e2ca79 100644 --- a/Userland/Libraries/LibJS/Token.h +++ b/Userland/Libraries/LibJS/Token.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -206,16 +206,16 @@ class Token { { return m_value.visit( [](StringView view) { return view; }, - [](DeprecatedFlyString const& identifier) { return identifier.view(); }, + [](FlyByteString const& identifier) { return identifier.view(); }, [](Empty) -> StringView { VERIFY_NOT_REACHED(); }); } - DeprecatedFlyString DeprecatedFlyString_value() const + FlyByteString FlyByteString_value() const { return m_value.visit( - [](StringView view) -> DeprecatedFlyString { return view; }, - [](DeprecatedFlyString const& identifier) -> DeprecatedFlyString { return identifier; }, - [](Empty) -> DeprecatedFlyString { VERIFY_NOT_REACHED(); }); + [](StringView view) -> FlyByteString { return view; }, + [](FlyByteString const& identifier) -> FlyByteString { return identifier; }, + [](Empty) -> FlyByteString { VERIFY_NOT_REACHED(); }); } size_t line_number() const { return m_line_number; } @@ -234,7 +234,7 @@ class Token { ByteString string_value(StringValueStatus& status) const; ByteString raw_template_value() const; - void set_identifier_value(DeprecatedFlyString value) + void set_identifier_value(FlyByteString value) { m_value = move(value); } @@ -247,7 +247,7 @@ class Token { StringView m_message; StringView m_trivia; StringView m_original_value; - Variant m_value {}; + Variant m_value {}; size_t m_line_number { 0 }; size_t m_line_column { 0 }; size_t m_offset { 0 }; diff --git a/Userland/Libraries/LibPDF/ColorSpace.cpp b/Userland/Libraries/LibPDF/ColorSpace.cpp index e6807fcb0d15c4..6022a617bee949 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.cpp +++ b/Userland/Libraries/LibPDF/ColorSpace.cpp @@ -20,7 +20,7 @@ RefPtr ICCBasedColorSpace::s_srgb_profile; ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE); #undef ENUMERATE -PDFErrorOr ColorSpaceFamily::get(DeprecatedFlyString const& family_name) +PDFErrorOr ColorSpaceFamily::get(FlyByteString const& family_name) { #define ENUMERATE(f_name, may_be_specified_directly) \ if (family_name == f_name.name()) { \ @@ -45,7 +45,7 @@ PDFErrorOr> ColorSpace::create(Document* document, Non return Error { Error::Type::MalformedPDF, "Color space must be name or array" }; } -PDFErrorOr> ColorSpace::create(DeprecatedFlyString const& name, Renderer&) +PDFErrorOr> ColorSpace::create(FlyByteString const& name, Renderer&) { // Simple color spaces with no parameters, which can be specified directly if (name == CommonNames::DeviceGray) diff --git a/Userland/Libraries/LibPDF/ColorSpace.h b/Userland/Libraries/LibPDF/ColorSpace.h index 4b549ec6fefdd4..6fec078dcec129 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.h +++ b/Userland/Libraries/LibPDF/ColorSpace.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include @@ -34,15 +34,15 @@ class Renderer; class ColorSpaceFamily { public: - ColorSpaceFamily(DeprecatedFlyString name, bool may_be_specified_directly) + ColorSpaceFamily(FlyByteString name, bool may_be_specified_directly) : m_name(move(name)) , m_may_be_specified_directly(may_be_specified_directly) { } - DeprecatedFlyString name() const { return m_name; } + FlyByteString name() const { return m_name; } bool may_be_specified_directly() const { return m_may_be_specified_directly; } - static PDFErrorOr get(DeprecatedFlyString const&); + static PDFErrorOr get(FlyByteString const&); #define ENUMERATE(name, may_be_specified_directly) static ColorSpaceFamily name; ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE) @@ -54,14 +54,14 @@ class ColorSpaceFamily { } private: - DeprecatedFlyString m_name; + FlyByteString m_name; bool m_may_be_specified_directly; }; class ColorSpace : public RefCounted { public: static PDFErrorOr> create(Document*, NonnullRefPtr, Renderer&); - static PDFErrorOr> create(DeprecatedFlyString const&, Renderer&); + static PDFErrorOr> create(FlyByteString const&, Renderer&); static PDFErrorOr> create(Document*, NonnullRefPtr, Renderer&); virtual ~ColorSpace() = default; diff --git a/Userland/Libraries/LibPDF/CommonNames.cpp b/Userland/Libraries/LibPDF/CommonNames.cpp index f1a0a54996fdf7..ef74f0393dccba 100644 --- a/Userland/Libraries/LibPDF/CommonNames.cpp +++ b/Userland/Libraries/LibPDF/CommonNames.cpp @@ -8,11 +8,11 @@ namespace PDF { -#define ENUMERATE(name) DeprecatedFlyString CommonNames::name = #name; +#define ENUMERATE(name) FlyByteString CommonNames::name = #name; ENUMERATE_COMMON_NAMES(ENUMERATE) #undef ENUMERATE -DeprecatedFlyString CommonNames::IdentityH = "Identity-H"; -DeprecatedFlyString CommonNames::IdentityV = "Identity-V"; +FlyByteString CommonNames::IdentityH = "Identity-H"; +FlyByteString CommonNames::IdentityV = "Identity-V"; } diff --git a/Userland/Libraries/LibPDF/CommonNames.h b/Userland/Libraries/LibPDF/CommonNames.h index 55091ec137d7b2..13626a6b05db64 100644 --- a/Userland/Libraries/LibPDF/CommonNames.h +++ b/Userland/Libraries/LibPDF/CommonNames.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #define ENUMERATE_COMMON_NAMES(X) \ X(A) \ @@ -203,13 +203,13 @@ namespace PDF { class CommonNames { public: -#define ENUMERATE(name) static DeprecatedFlyString name; +#define ENUMERATE(name) static FlyByteString name; ENUMERATE_COMMON_NAMES(ENUMERATE) #undef ENUMERATE // Special cases where the string value isn't identical to the name. - static DeprecatedFlyString IdentityH; - static DeprecatedFlyString IdentityV; + static FlyByteString IdentityH; + static FlyByteString IdentityV; }; } diff --git a/Userland/Libraries/LibPDF/Document.cpp b/Userland/Libraries/LibPDF/Document.cpp index 12be23c57162e4..9bee29bcdf0345 100644 --- a/Userland/Libraries/LibPDF/Document.cpp +++ b/Userland/Libraries/LibPDF/Document.cpp @@ -75,7 +75,7 @@ PDFErrorOr> InfoDict::modification_date() const return get(CommonNames::ModDate); } -PDFErrorOr> InfoDict::get_text(DeprecatedFlyString const& name) const +PDFErrorOr> InfoDict::get_text(FlyByteString const& name) const { return TRY(TRY(get(name)).map(Document::text_string_to_utf8)); } @@ -237,7 +237,7 @@ PDFErrorOr Document::get_page(u32 index) if (maybe_resources_object.has_value()) resources = maybe_resources_object.value()->cast(); else - resources = make_object(HashMap {}); + resources = make_object(HashMap {}); RefPtr contents; if (raw_page_object->contains(CommonNames::Contents)) @@ -320,9 +320,9 @@ PDFErrorOr> Document::info_dict() return InfoDict(this, TRY(trailer()->get_dict(this, CommonNames::Info))); } -PDFErrorOr> Document::read_filters(NonnullRefPtr dict) +PDFErrorOr> Document::read_filters(NonnullRefPtr dict) { - Vector filters; + Vector filters; // We may either get a single filter or an array of cascading filters auto filter_object = TRY(dict->get_object(this, CommonNames::Filter)); @@ -370,7 +370,7 @@ PDFErrorOr Document::add_page_tree_node_to_page_tree(NonnullRefPtr> Document::find_in_name_tree(NonnullRefPtr tree, DeprecatedFlyString name) +PDFErrorOr> Document::find_in_name_tree(NonnullRefPtr tree, FlyByteString name) { if (tree->contains(CommonNames::Kids)) { return find_in_name_tree_nodes(tree->get_array(CommonNames::Kids), name); @@ -381,7 +381,7 @@ PDFErrorOr> Document::find_in_name_tree(NonnullRefPtr> Document::find_in_name_tree_nodes(NonnullRefPtr siblings, DeprecatedFlyString name) +PDFErrorOr> Document::find_in_name_tree_nodes(NonnullRefPtr siblings, FlyByteString name) { for (size_t i = 0; i < siblings->size(); i++) { auto sibling = TRY(resolve_to(siblings->at(i))); @@ -397,7 +397,7 @@ PDFErrorOr> Document::find_in_name_tree_nodes(NonnullRefPt return Error { Error::Type::MalformedPDF, ByteString::formatted("Didn't find node in name tree containing name {}", name) }; } -PDFErrorOr> Document::find_in_key_value_array(NonnullRefPtr key_value_array, DeprecatedFlyString name) +PDFErrorOr> Document::find_in_key_value_array(NonnullRefPtr key_value_array, FlyByteString name) { if (key_value_array->size() % 2 == 1) return Error { Error::Type::MalformedPDF, "key/value array has dangling key" }; @@ -493,7 +493,7 @@ PDFErrorOr Document::create_destination_from_parameters(NonnullRefP return Destination { type, page_number, parameters }; } -PDFErrorOr>> Document::get_inheritable_object(DeprecatedFlyString const& name, NonnullRefPtr object) +PDFErrorOr>> Document::get_inheritable_object(FlyByteString const& name, NonnullRefPtr object) { if (!object->contains(name)) { if (!object->contains(CommonNames::Parent)) @@ -504,7 +504,7 @@ PDFErrorOr>> Document::get_inheritable_object(Dep return TRY(object->get_object(this, name)); } -PDFErrorOr> Document::get_inheritable_value(DeprecatedFlyString const& name, NonnullRefPtr object) +PDFErrorOr> Document::get_inheritable_value(FlyByteString const& name, NonnullRefPtr object) { if (!object->contains(name)) { if (!object->contains(CommonNames::Parent)) @@ -535,7 +535,7 @@ PDFErrorOr Document::create_destination_from_object(NonnullRefPtris() || dest_obj->is()) { - DeprecatedFlyString dest_name; + FlyByteString dest_name; if (dest_obj->is()) dest_name = dest_obj->cast()->name(); else diff --git a/Userland/Libraries/LibPDF/Document.h b/Userland/Libraries/LibPDF/Document.h index 7fe347ed971acf..f13657fb577edb 100644 --- a/Userland/Libraries/LibPDF/Document.h +++ b/Userland/Libraries/LibPDF/Document.h @@ -85,14 +85,14 @@ class InfoDict { PDFErrorOr> modification_date() const; private: - PDFErrorOr> get(DeprecatedFlyString const& name) const + PDFErrorOr> get(FlyByteString const& name) const { if (!m_info_dict->contains(name)) return OptionalNone {}; return TRY(m_info_dict->get_string(m_document, name))->string(); } - PDFErrorOr> get_text(DeprecatedFlyString const& name) const; + PDFErrorOr> get_text(FlyByteString const& name) const; WeakPtr m_document; NonnullRefPtr m_info_dict; @@ -154,7 +154,7 @@ class Document final PDFErrorOr> info_dict(); - PDFErrorOr> read_filters(NonnullRefPtr); + PDFErrorOr> read_filters(NonnullRefPtr); PDFErrorOr unfilter_stream(NonnullRefPtr stream) { return m_parser->unfilter_stream(move(stream)); } @@ -178,12 +178,12 @@ class Document final PDFErrorOr create_destination_from_dictionary_entry(NonnullRefPtr const& entry, HashMap const& page_number_by_index_ref); PDFErrorOr create_destination_from_object(NonnullRefPtr const& dest_obj, HashMap const& page_number_by_index_ref); - PDFErrorOr>> get_inheritable_object(DeprecatedFlyString const& name, NonnullRefPtr); - PDFErrorOr> get_inheritable_value(DeprecatedFlyString const& name, NonnullRefPtr); + PDFErrorOr>> get_inheritable_object(FlyByteString const& name, NonnullRefPtr); + PDFErrorOr> get_inheritable_value(FlyByteString const& name, NonnullRefPtr); - PDFErrorOr> find_in_name_tree(NonnullRefPtr root, DeprecatedFlyString name); - PDFErrorOr> find_in_name_tree_nodes(NonnullRefPtr siblings, DeprecatedFlyString name); - PDFErrorOr> find_in_key_value_array(NonnullRefPtr key_value_array, DeprecatedFlyString name); + PDFErrorOr> find_in_name_tree(NonnullRefPtr root, FlyByteString name); + PDFErrorOr> find_in_name_tree_nodes(NonnullRefPtr siblings, FlyByteString name); + PDFErrorOr> find_in_key_value_array(NonnullRefPtr key_value_array, FlyByteString name); NonnullRefPtr m_parser; Version m_version; diff --git a/Userland/Libraries/LibPDF/Encoding.cpp b/Userland/Libraries/LibPDF/Encoding.cpp index ec0c6803cf4799..101945aad6034b 100644 --- a/Userland/Libraries/LibPDF/Encoding.cpp +++ b/Userland/Libraries/LibPDF/Encoding.cpp @@ -79,7 +79,7 @@ PDFErrorOr> Encoding::from_object(Document* document, No return encoding; } -void Encoding::set(CharCodeType char_code, DeprecatedFlyString const& glyph_name) +void Encoding::set(CharCodeType char_code, FlyByteString const& glyph_name) { m_descriptors.set(char_code, glyph_name); m_name_mapping.set(glyph_name, char_code); @@ -179,7 +179,7 @@ u16 Encoding::get_char_code(ByteString const& name) const return 0; } -DeprecatedFlyString Encoding::get_name(u8 char_code) const +FlyByteString Encoding::get_name(u8 char_code) const { auto name_iterator = m_descriptors.find(char_code); if (name_iterator != m_descriptors.end()) diff --git a/Userland/Libraries/LibPDF/Encoding.h b/Userland/Libraries/LibPDF/Encoding.h index ac071639a4b2d8..e38fee665bdf17 100644 --- a/Userland/Libraries/LibPDF/Encoding.h +++ b/Userland/Libraries/LibPDF/Encoding.h @@ -641,12 +641,12 @@ class Encoding : public RefCounted { HashMap const& name_mapping() const { return m_name_mapping; } u16 get_char_code(ByteString const&) const; - DeprecatedFlyString get_name(u8 char_code) const; + FlyByteString get_name(u8 char_code) const; - void set(CharCodeType char_code, DeprecatedFlyString const& glyph_name); + void set(CharCodeType char_code, FlyByteString const& glyph_name); protected: - HashMap m_descriptors; + HashMap m_descriptors; HashMap m_name_mapping; bool m_windows { false }; diff --git a/Userland/Libraries/LibPDF/Filter.cpp b/Userland/Libraries/LibPDF/Filter.cpp index 9d1d2457dd34c3..24d489127f5967 100644 --- a/Userland/Libraries/LibPDF/Filter.cpp +++ b/Userland/Libraries/LibPDF/Filter.cpp @@ -19,7 +19,7 @@ namespace PDF { -PDFErrorOr Filter::decode(Document* document, ReadonlyBytes bytes, DeprecatedFlyString const& encoding_type, RefPtr decode_parms) +PDFErrorOr Filter::decode(Document* document, ReadonlyBytes bytes, FlyByteString const& encoding_type, RefPtr decode_parms) { if (encoding_type == CommonNames::ASCIIHexDecode) return decode_ascii_hex(bytes); diff --git a/Userland/Libraries/LibPDF/Filter.h b/Userland/Libraries/LibPDF/Filter.h index a9f56072641878..a86f398a64be91 100644 --- a/Userland/Libraries/LibPDF/Filter.h +++ b/Userland/Libraries/LibPDF/Filter.h @@ -7,15 +7,15 @@ #pragma once #include -#include #include +#include #include namespace PDF { class Filter { public: - static PDFErrorOr decode(Document* document, ReadonlyBytes bytes, DeprecatedFlyString const& encoding_type, RefPtr decode_parms); + static PDFErrorOr decode(Document* document, ReadonlyBytes bytes, FlyByteString const& encoding_type, RefPtr decode_parms); private: static PDFErrorOr decode_ascii_hex(ReadonlyBytes bytes); diff --git a/Userland/Libraries/LibPDF/Fonts/CFF.cpp b/Userland/Libraries/LibPDF/Fonts/CFF.cpp index 72c21e7b7e6910..8ac0291f8dd2ac 100644 --- a/Userland/Libraries/LibPDF/Fonts/CFF.cpp +++ b/Userland/Libraries/LibPDF/Fonts/CFF.cpp @@ -180,8 +180,8 @@ ErrorOr> CFF::create(ReadonlyBytes const& cff_bytes, RefPtr charset; // Maps GID to CIDs for CID-keyed, to SIDs otherwise. - Vector charset_names; // Only valid for non-CID-keyed fonts. + Vector charset; // Maps GID to CIDs for CID-keyed, to SIDs otherwise. + Vector charset_names; // Only valid for non-CID-keyed fonts. if (top_dict.is_cid_keyed) { charset = TRY(parse_charset(FixedMemoryStream { cff_bytes.slice(top_dict.charset_offset) }, glyphs.size())); } else { @@ -840,16 +840,16 @@ ErrorOr> CFF::parse_strings(FixedMemoryStream& reader) return strings; } -DeprecatedFlyString CFF::resolve_sid(SID sid, Vector const& strings) +FlyByteString CFF::resolve_sid(SID sid, Vector const& strings) { if (sid < s_cff_builtin_names.size()) - return DeprecatedFlyString(s_cff_builtin_names[sid]); + return FlyByteString(s_cff_builtin_names[sid]); if (sid - s_cff_builtin_names.size() < strings.size()) - return DeprecatedFlyString(strings[sid - s_cff_builtin_names.size()]); + return FlyByteString(strings[sid - s_cff_builtin_names.size()]); dbgln("Couldn't find string for SID {}, going with space", sid); - return DeprecatedFlyString("space"); + return FlyByteString("space"); } ErrorOr> CFF::parse_charset(Stream&& reader, size_t glyph_count) diff --git a/Userland/Libraries/LibPDF/Fonts/CFF.h b/Userland/Libraries/LibPDF/Fonts/CFF.h index 9ca5027d9df333..8ef75b3f335a04 100644 --- a/Userland/Libraries/LibPDF/Fonts/CFF.h +++ b/Userland/Libraries/LibPDF/Fonts/CFF.h @@ -133,7 +133,7 @@ class CFF : public Type1FontProgram { static ErrorOr> parse_charstrings(FixedMemoryStream&&, Vector const& local_subroutines, Vector const& global_subroutines); - static DeprecatedFlyString resolve_sid(SID, Vector const&); + static FlyByteString resolve_sid(SID, Vector const&); static ErrorOr> parse_charset(Stream&&, size_t); static ErrorOr> parse_fdselect(Stream&&, size_t); static ErrorOr> parse_encoding(Stream&&, HashMap& supplemental); diff --git a/Userland/Libraries/LibPDF/Fonts/PDFFont.cpp b/Userland/Libraries/LibPDF/Fonts/PDFFont.cpp index 06a805ca56b614..2777dd8042b039 100644 --- a/Userland/Libraries/LibPDF/Fonts/PDFFont.cpp +++ b/Userland/Libraries/LibPDF/Fonts/PDFFont.cpp @@ -17,7 +17,7 @@ namespace PDF { -[[maybe_unused]] static bool is_standard_latin_font(DeprecatedFlyString const& font) +[[maybe_unused]] static bool is_standard_latin_font(FlyByteString const& font) { return font.is_one_of( "Times-Roman", "TimesNewRoman", diff --git a/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h b/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h index ecd94a2d29a1d1..7381f4bbf1d141 100644 --- a/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h +++ b/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h @@ -37,13 +37,13 @@ class TrueTypeFont : public SimpleFont { void set_font_size(float font_size) override; PDFErrorOr draw_glyph(Gfx::Painter&, Gfx::FloatPoint, float, u8, Renderer const&) override; - DeprecatedFlyString base_font_name() const { return m_base_font_name; } + FlyByteString base_font_name() const { return m_base_font_name; } protected: PDFErrorOr initialize(Document*, NonnullRefPtr const&, float font_size) override; private: - DeprecatedFlyString m_base_font_name; + FlyByteString m_base_font_name; // Always non-null once initialize() has completed. // FIXME: Move this class hierarchy to the usual fallible construction pattern and make this a NonnullOwnPtr. diff --git a/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp b/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp index 796bada0697461..5c352f5b570d84 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp +++ b/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp @@ -47,7 +47,7 @@ PDFErrorOr> CIDFontType0::create(Document* document, if (descriptor->contains(CommonNames::FontFile3)) { auto font_file_stream = TRY(descriptor->get_stream(document, CommonNames::FontFile3)); auto font_file_dict = font_file_stream->dict(); - DeprecatedFlyString subtype; + FlyByteString subtype; if (font_file_dict->contains(CommonNames::Subtype)) subtype = font_file_dict->get_name(CommonNames::Subtype)->name(); if (subtype == CommonNames::CIDFontType0C) { diff --git a/Userland/Libraries/LibPDF/Fonts/Type0Font.h b/Userland/Libraries/LibPDF/Fonts/Type0Font.h index 59a19732ec8bb1..11fdc8d7aef9a2 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type0Font.h +++ b/Userland/Libraries/LibPDF/Fonts/Type0Font.h @@ -55,7 +55,7 @@ class Type0Font : public PDFFont { PDFErrorOr draw_string(Gfx::Painter&, Gfx::FloatPoint, ByteString const&, Renderer const&) override; WritingMode writing_mode() const override { return m_cmap->writing_mode(); } - DeprecatedFlyString base_font_name() const { return m_base_font_name; } + FlyByteString base_font_name() const { return m_base_font_name; } protected: PDFErrorOr initialize(Document*, NonnullRefPtr const&, float) override; @@ -63,7 +63,7 @@ class Type0Font : public PDFFont { private: float get_char_width(u16 char_code) const; - DeprecatedFlyString m_base_font_name; + FlyByteString m_base_font_name; CIDSystemInfo m_system_info; HashMap m_widths; u16 m_missing_width; diff --git a/Userland/Libraries/LibPDF/Fonts/Type1Font.h b/Userland/Libraries/LibPDF/Fonts/Type1Font.h index d327f96a009f1c..f67a4ea75124c9 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type1Font.h +++ b/Userland/Libraries/LibPDF/Fonts/Type1Font.h @@ -27,13 +27,13 @@ class Type1Font : public SimpleFont { void set_font_size(float font_size) override; PDFErrorOr draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const&) override; - DeprecatedFlyString base_font_name() const { return m_base_font_name; } + FlyByteString base_font_name() const { return m_base_font_name; } protected: PDFErrorOr initialize(Document*, NonnullRefPtr const&, float font_size) override; private: - DeprecatedFlyString m_base_font_name; + FlyByteString m_base_font_name; RefPtr m_font_program; OwnPtr m_fallback_font_painter; HashMap> m_glyph_cache; diff --git a/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.cpp b/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.cpp index c2f8da9cd9615a..6b23ec0b54ca2f 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.cpp +++ b/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.cpp @@ -54,7 +54,7 @@ enum ExtendedCommand { Flex1, }; -RefPtr Type1FontProgram::rasterize_glyph(DeprecatedFlyString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset) +RefPtr Type1FontProgram::rasterize_glyph(FlyByteString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset) { constexpr auto base_color = Color::White; auto path = build_char(char_name, width, subpixel_offset); @@ -71,7 +71,7 @@ RefPtr Type1FontProgram::rasterize_glyph(DeprecatedFlyString const& return bitmap; } -Gfx::Path Type1FontProgram::build_char(DeprecatedFlyString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset) +Gfx::Path Type1FontProgram::build_char(FlyByteString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset) { auto maybe_glyph = m_glyph_map.get(char_name); if (!maybe_glyph.has_value()) @@ -89,7 +89,7 @@ Gfx::Path Type1FontProgram::build_char(DeprecatedFlyString const& char_name, flo return glyph.path().copy_transformed(transform); } -Gfx::FloatPoint Type1FontProgram::glyph_translation(DeprecatedFlyString const& char_name, float width) const +Gfx::FloatPoint Type1FontProgram::glyph_translation(FlyByteString const& char_name, float width) const { auto maybe_glyph = m_glyph_map.get(char_name); if (!maybe_glyph.has_value()) diff --git a/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.h b/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.h index d25331058d2333..04d62c5eeca52c 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.h +++ b/Userland/Libraries/LibPDF/Fonts/Type1FontProgram.h @@ -24,8 +24,8 @@ class Type1FontProgram : public RefCounted { CIDKeyed, }; - RefPtr rasterize_glyph(DeprecatedFlyString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset); - Gfx::FloatPoint glyph_translation(DeprecatedFlyString const& char_name, float width) const; + RefPtr rasterize_glyph(FlyByteString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset); + Gfx::FloatPoint glyph_translation(FlyByteString const& char_name, float width) const; RefPtr encoding() const { return m_encoding; } Kind kind() const { return m_kind; } @@ -39,8 +39,8 @@ class Type1FontProgram : public RefCounted { { } - DeprecatedFlyString base_character; - DeprecatedFlyString accent_character; + FlyByteString base_character; + FlyByteString accent_character; Gfx::FloatPoint accent_origin; }; @@ -101,7 +101,7 @@ class Type1FontProgram : public RefCounted { m_font_matrix = move(font_matrix); } - ErrorOr add_glyph(DeprecatedFlyString name, Glyph&& glyph) + ErrorOr add_glyph(FlyByteString name, Glyph&& glyph) { TRY(m_glyph_map.try_set(move(name), move(glyph))); return {}; @@ -112,12 +112,12 @@ class Type1FontProgram : public RefCounted { void set_kind(Kind kind) { m_kind = kind; } private: - HashMap m_glyph_map; + HashMap m_glyph_map; Gfx::AffineTransform m_font_matrix; RefPtr m_encoding; Kind m_kind { NameKeyed }; - Gfx::Path build_char(DeprecatedFlyString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset); + Gfx::Path build_char(FlyByteString const& char_name, float width, Gfx::GlyphSubpixelOffset subpixel_offset); Gfx::AffineTransform glyph_transform_to_device_space(Glyph const& glyph, float width) const; }; diff --git a/Userland/Libraries/LibPDF/Fonts/Type3Font.h b/Userland/Libraries/LibPDF/Fonts/Type3Font.h index efb513a74ee278..fbd06eb1f677f6 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type3Font.h +++ b/Userland/Libraries/LibPDF/Fonts/Type3Font.h @@ -20,7 +20,7 @@ class Type3Font : public SimpleFont { PDFErrorOr initialize(Document*, NonnullRefPtr const&, float font_size) override; private: - HashMap> m_char_procs; + HashMap> m_char_procs; Gfx::AffineTransform m_font_matrix; Optional> m_resources; }; diff --git a/Userland/Libraries/LibPDF/Object.h b/Userland/Libraries/LibPDF/Object.h index 6a2e98039f8bc7..80fa6733b2321d 100644 --- a/Userland/Libraries/LibPDF/Object.h +++ b/Userland/Libraries/LibPDF/Object.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibPDF/ObjectDerivatives.cpp b/Userland/Libraries/LibPDF/ObjectDerivatives.cpp index 933a36802d2efa..7745122f2b3130 100644 --- a/Userland/Libraries/LibPDF/ObjectDerivatives.cpp +++ b/Userland/Libraries/LibPDF/ObjectDerivatives.cpp @@ -16,33 +16,33 @@ PDFErrorOr> ArrayObject::get_object_at(Document* document, return document->resolve_to(at(index)); } -PDFErrorOr> DictObject::get_object(Document* document, DeprecatedFlyString const& key) const +PDFErrorOr> DictObject::get_object(Document* document, FlyByteString const& key) const { return document->resolve_to(get_value(key)); } -#define DEFINE_ACCESSORS(class_name, snake_name) \ - PDFErrorOr> ArrayObject::get_##snake_name##_at(Document* document, size_t index) const \ - { \ - if (index >= m_elements.size()) \ - return Error { Error::Type::Internal, "Out of bounds array access" }; \ - return document->resolve_to(m_elements[index]); \ - } \ - \ - NonnullRefPtr ArrayObject::get_##snake_name##_at(size_t index) const \ - { \ - VERIFY(index < m_elements.size()); \ - return cast_to(m_elements[index]); \ - } \ - \ - PDFErrorOr> DictObject::get_##snake_name(Document* document, DeprecatedFlyString const& key) const \ - { \ - return document->resolve_to(get_value(key)); \ - } \ - \ - NonnullRefPtr DictObject::get_##snake_name(DeprecatedFlyString const& key) const \ - { \ - return cast_to(get_value(key)); \ +#define DEFINE_ACCESSORS(class_name, snake_name) \ + PDFErrorOr> ArrayObject::get_##snake_name##_at(Document* document, size_t index) const \ + { \ + if (index >= m_elements.size()) \ + return Error { Error::Type::Internal, "Out of bounds array access" }; \ + return document->resolve_to(m_elements[index]); \ + } \ + \ + NonnullRefPtr ArrayObject::get_##snake_name##_at(size_t index) const \ + { \ + VERIFY(index < m_elements.size()); \ + return cast_to(m_elements[index]); \ + } \ + \ + PDFErrorOr> DictObject::get_##snake_name(Document* document, FlyByteString const& key) const \ + { \ + return document->resolve_to(get_value(key)); \ + } \ + \ + NonnullRefPtr DictObject::get_##snake_name(FlyByteString const& key) const \ + { \ + return cast_to(get_value(key)); \ } ENUMERATE_OBJECT_TYPES(DEFINE_ACCESSORS) diff --git a/Userland/Libraries/LibPDF/ObjectDerivatives.h b/Userland/Libraries/LibPDF/ObjectDerivatives.h index d3ab09e6360253..f16008af09e6cf 100644 --- a/Userland/Libraries/LibPDF/ObjectDerivatives.h +++ b/Userland/Libraries/LibPDF/ObjectDerivatives.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include @@ -44,14 +44,14 @@ class StringObject final : public Object { class NameObject final : public Object { public: - explicit NameObject(DeprecatedFlyString name) + explicit NameObject(FlyByteString name) : m_name(move(name)) { } ~NameObject() override = default; - [[nodiscard]] ALWAYS_INLINE DeprecatedFlyString const& name() const { return m_name; } + [[nodiscard]] ALWAYS_INLINE FlyByteString const& name() const { return m_name; } char const* type_name() const override { return "name"; } ByteString to_byte_string(int indent) const override; @@ -60,7 +60,7 @@ class NameObject final : public Object { bool is_name() const override { return true; } private: - DeprecatedFlyString m_name; + FlyByteString m_name; }; class ArrayObject final : public Object { @@ -106,14 +106,14 @@ class ArrayObject final : public Object { class DictObject final : public Object { public: - explicit DictObject(HashMap map) + explicit DictObject(HashMap map) : m_map(move(map)) { } ~DictObject() override = default; - [[nodiscard]] ALWAYS_INLINE HashMap const& map() const { return m_map; } + [[nodiscard]] ALWAYS_INLINE HashMap const& map() const { return m_map; } template bool contains(Args&&... keys) const { return (m_map.contains(keys) && ...); } @@ -121,20 +121,20 @@ class DictObject final : public Object { template bool contains_any_of(Args&&... keys) const { return (m_map.contains(keys) || ...); } - ALWAYS_INLINE Optional get(DeprecatedFlyString const& key) const { return m_map.get(key).copy(); } + ALWAYS_INLINE Optional get(FlyByteString const& key) const { return m_map.get(key).copy(); } - Value get_value(DeprecatedFlyString const& key) const + Value get_value(FlyByteString const& key) const { auto value = get(key); VERIFY(value.has_value()); return value.value(); } - PDFErrorOr> get_object(Document*, DeprecatedFlyString const& key) const; + PDFErrorOr> get_object(Document*, FlyByteString const& key) const; -#define DEFINE_GETTER(class_name, snake_name) \ - PDFErrorOr> get_##snake_name(Document*, DeprecatedFlyString const& key) const; \ - NonnullRefPtr get_##snake_name(DeprecatedFlyString const& key) const; +#define DEFINE_GETTER(class_name, snake_name) \ + PDFErrorOr> get_##snake_name(Document*, FlyByteString const& key) const; \ + NonnullRefPtr get_##snake_name(FlyByteString const& key) const; ENUMERATE_OBJECT_TYPES(DEFINE_GETTER) #undef DEFINE_GETTER @@ -148,7 +148,7 @@ class DictObject final : public Object { bool is_dict() const override { return true; } private: - HashMap m_map; + HashMap m_map; }; class StreamObject : public Object { diff --git a/Userland/Libraries/LibPDF/Parser.cpp b/Userland/Libraries/LibPDF/Parser.cpp index 474c00d30bea47..ecfbe62de491dd 100644 --- a/Userland/Libraries/LibPDF/Parser.cpp +++ b/Userland/Libraries/LibPDF/Parser.cpp @@ -403,10 +403,10 @@ PDFErrorOr> Parser::parse_array() return make_object(values); } -PDFErrorOr> Parser::parse_dict_contents_until(char const* end) +PDFErrorOr> Parser::parse_dict_contents_until(char const* end) { m_reader.consume_whitespace(); - HashMap map; + HashMap map; while (!m_reader.done()) { parse_comment(); @@ -425,7 +425,7 @@ PDFErrorOr> Parser::parse_dict() if (!m_reader.consume('<') || !m_reader.consume('<')) return error("Expected dict to start with \"<<\""); - HashMap map = TRY(parse_dict_contents_until(">>")); + HashMap map = TRY(parse_dict_contents_until(">>")); if (!m_reader.consume('>') || !m_reader.consume('>')) return error("Expected dict to end with \">>\""); @@ -440,7 +440,7 @@ PDFErrorOr Parser::unfilter_stream(NonnullRefPtr stream_obje if (!dict->contains(CommonNames::Filter)) return {}; - Vector filters = TRY(m_document->read_filters(dict)); + Vector filters = TRY(m_document->read_filters(dict)); // Every filter may get its own parameter dictionary Vector> decode_parms_vector; @@ -523,7 +523,7 @@ PDFErrorOr> Parser::parse_inline_image() // and then arbitrary binary data between ID and EI. // This means they need a special code path in the parser, so that image data in there doesn't confuse the operator parser. - HashMap map = TRY(parse_dict_contents_until("ID")); + HashMap map = TRY(parse_dict_contents_until("ID")); m_reader.consume(2); // "ID" // "Unless the image uses ASCIIHexDecode or ASCII85Decode as one of its filters, diff --git a/Userland/Libraries/LibPDF/Parser.h b/Userland/Libraries/LibPDF/Parser.h index 52469910b106d7..15e9815e746ffd 100644 --- a/Userland/Libraries/LibPDF/Parser.h +++ b/Userland/Libraries/LibPDF/Parser.h @@ -53,7 +53,7 @@ class Parser { PDFErrorOr parse_literal_string(); PDFErrorOr parse_hex_string(); PDFErrorOr> parse_array(); - PDFErrorOr> parse_dict_contents_until(char const*); + PDFErrorOr> parse_dict_contents_until(char const*); PDFErrorOr> parse_dict(); PDFErrorOr unfilter_stream(NonnullRefPtr); PDFErrorOr> parse_stream(NonnullRefPtr dict); diff --git a/Userland/Libraries/LibPDF/Renderer.cpp b/Userland/Libraries/LibPDF/Renderer.cpp index 8d35501e0c4584..12e5d173bb7e98 100644 --- a/Userland/Libraries/LibPDF/Renderer.cpp +++ b/Userland/Libraries/LibPDF/Renderer.cpp @@ -749,7 +749,7 @@ RENDERER_HANDLER(inline_image_begin_data) VERIFY_NOT_REACHED(); } -static PDFErrorOr expand_inline_image_value(Value const& value, HashMap const& value_expansions) +static PDFErrorOr expand_inline_image_value(Value const& value, HashMap const& value_expansions) { if (!value.has>()) return value; @@ -777,7 +777,7 @@ static PDFErrorOr expand_inline_image_value(Value const& value, HashMapis()) { auto const& dict = object->cast()->map(); - HashMap expanded_dict; + HashMap expanded_dict; for (auto const& [key, value] : dict) { auto expanded_value = TRY(expand_inline_image_value(value, value_expansions)); expanded_dict.set(key, expanded_value); @@ -821,7 +821,7 @@ static PDFErrorOr expand_inline_image_colorspace(Value color_space_value, static PDFErrorOr> expand_inline_image_abbreviations(NonnullRefPtr inline_stream, NonnullRefPtr resources, RefPtr document) { // TABLE 4.43 Entries in an inline image object - static HashMap key_expansions { + static HashMap key_expansions { { "BPC", "BitsPerComponent" }, { "CS", "ColorSpace" }, { "D", "Decode" }, @@ -838,7 +838,7 @@ static PDFErrorOr> expand_inline_image_abbreviations // TABLE 4.44 Additional abbreviations in an inline image object // "Also note that JBIG2Decode and JPXDecode are not listed in Table 4.44 // because those filters can be applied only to image XObjects." - static HashMap value_expansions { + static HashMap value_expansions { { "G", "DeviceGray" }, { "RGB", "DeviceRGB" }, { "CMYK", "DeviceCMYK" }, @@ -853,13 +853,13 @@ static PDFErrorOr> expand_inline_image_abbreviations }; // The values in key_expansions, that is the final expansions, are the valid keys in an inline image dict. - HashTable valid_keys; + HashTable valid_keys; for (auto const& [key, value] : key_expansions) valid_keys.set(value); - HashMap expanded_dict; + HashMap expanded_dict; for (auto const& [key, value] : inline_stream->dict()->map()) { - DeprecatedFlyString expanded_key = key_expansions.get(key).value_or(key); + FlyByteString expanded_key = key_expansions.get(key).value_or(key); // "Entries other than those listed are ignored" if (!valid_keys.contains(expanded_key)) { @@ -1153,7 +1153,7 @@ PDFErrorOr Renderer::load_image(NonnullRefPtrresolve_to(image_dict->get_value(CommonNames::Width))); auto height = TRY(m_document->resolve_to(image_dict->get_value(CommonNames::Height))); - auto is_filter = [&](DeprecatedFlyString const& name) -> PDFErrorOr { + auto is_filter = [&](FlyByteString const& name) -> PDFErrorOr { if (!image_dict->contains(CommonNames::Filter)) return false; auto filter_object = TRY(image_dict->get_object(m_document, CommonNames::Filter)); diff --git a/Userland/Libraries/LibRegex/RegexMatch.h b/Userland/Libraries/LibRegex/RegexMatch.h index bdeb3baaaef38d..9172351e9f552c 100644 --- a/Userland/Libraries/LibRegex/RegexMatch.h +++ b/Userland/Libraries/LibRegex/RegexMatch.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -477,7 +477,7 @@ class RegexStringView { class Match final { private: - Optional string; + Optional string; public: Match() = default; @@ -522,7 +522,7 @@ class Match final { } RegexStringView view {}; - Optional capture_group_name {}; + Optional capture_group_name {}; size_t line { 0 }; size_t column { 0 }; size_t global_offset { 0 }; diff --git a/Userland/Libraries/LibRegex/RegexParser.cpp b/Userland/Libraries/LibRegex/RegexParser.cpp index 09c49394d602ed..1414a9b7667bc5 100644 --- a/Userland/Libraries/LibRegex/RegexParser.cpp +++ b/Userland/Libraries/LibRegex/RegexParser.cpp @@ -2479,7 +2479,7 @@ bool ECMA262Parser::parse_unicode_property_escape(PropertyEscape& property, bool [](Empty&) -> bool { VERIFY_NOT_REACHED(); }); } -DeprecatedFlyString ECMA262Parser::read_capture_group_specifier(bool take_starting_angle_bracket) +FlyByteString ECMA262Parser::read_capture_group_specifier(bool take_starting_angle_bracket) { static auto id_start_category = Unicode::property_from_string("ID_Start"sv); static auto id_continue_category = Unicode::property_from_string("ID_Continue"sv); @@ -2582,7 +2582,7 @@ DeprecatedFlyString ECMA262Parser::read_capture_group_specifier(bool take_starti builder.append_code_point(code_point); } - DeprecatedFlyString name = builder.to_byte_string(); + FlyByteString name = builder.to_byte_string(); if (!hit_end || name.is_empty()) set_error(Error::InvalidNameForCaptureGroup); diff --git a/Userland/Libraries/LibRegex/RegexParser.h b/Userland/Libraries/LibRegex/RegexParser.h index 4a42bea945e845..16e02697f9477d 100644 --- a/Userland/Libraries/LibRegex/RegexParser.h +++ b/Userland/Libraries/LibRegex/RegexParser.h @@ -53,7 +53,7 @@ class Parser { size_t match_length_minimum; Error error; Token error_token; - Vector capture_groups; + Vector capture_groups; AllOptions options; struct { @@ -110,7 +110,7 @@ class Parser { size_t repetition_mark_count { 0 }; AllOptions regex_options; HashMap capture_group_minimum_lengths; - HashMap named_capture_groups; + HashMap named_capture_groups; explicit ParserState(Lexer& lexer) : lexer(lexer) @@ -233,7 +233,7 @@ class ECMA262Parser final : public Parser { }; StringView read_digits_as_string(ReadDigitsInitialZeroState initial_zero = ReadDigitsInitialZeroState::Allow, bool hex = false, int max_count = -1, int min_count = -1); Optional read_digits(ReadDigitsInitialZeroState initial_zero = ReadDigitsInitialZeroState::Allow, bool hex = false, int max_count = -1, int min_count = -1); - DeprecatedFlyString read_capture_group_specifier(bool take_starting_angle_bracket = false); + FlyByteString read_capture_group_specifier(bool take_starting_angle_bracket = false); struct Script { Unicode::Script script {}; diff --git a/Userland/Libraries/LibWeb/Animations/KeyframeEffect.cpp b/Userland/Libraries/LibWeb/Animations/KeyframeEffect.cpp index afcd4de35f7dde..29d7e144b3b210 100644 --- a/Userland/Libraries/LibWeb/Animations/KeyframeEffect.cpp +++ b/Userland/Libraries/LibWeb/Animations/KeyframeEffect.cpp @@ -858,7 +858,7 @@ WebIDL::ExceptionOr> KeyframeEffect::get_keyframes for (auto const& [id, value] : keyframe.parsed_properties()) { auto value_string = JS::PrimitiveString::create(vm, value->to_string()); - TRY(object->set(JS::PropertyKey(DeprecatedFlyString(CSS::camel_case_string_from_property_id(id))), value_string, ShouldThrowExceptions::Yes)); + TRY(object->set(JS::PropertyKey(FlyByteString(CSS::camel_case_string_from_property_id(id))), value_string, ShouldThrowExceptions::Yes)); } m_keyframe_objects.append(object); diff --git a/Userland/Libraries/LibWeb/HTML/CrossOrigin/AbstractOperations.cpp b/Userland/Libraries/LibWeb/HTML/CrossOrigin/AbstractOperations.cpp index e53ba2e649d779..118ec8d02dc909 100644 --- a/Userland/Libraries/LibWeb/HTML/CrossOrigin/AbstractOperations.cpp +++ b/Userland/Libraries/LibWeb/HTML/CrossOrigin/AbstractOperations.cpp @@ -59,7 +59,7 @@ Vector cross_origin_properties(Variant property_names { + static Array property_names { "window"sv, "self"sv, "location"sv, "close"sv, "closed"sv, "focus"sv, "blur"sv, "frames"sv, "length"sv, "top"sv, "opener"sv, "parent"sv, "postMessage"sv }; return (property_key.is_string() && any_of(property_names, [&](auto const& name) { return property_key.as_string() == name; })) || property_key.is_number(); diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.cpp index 52caff18b513a2..cedcde8089e1d2 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.cpp @@ -76,7 +76,7 @@ WebIDL::ExceptionOr parse_import_map_string(JS::Realm& realm, ByteStr } // https://html.spec.whatwg.org/multipage/webappapis.html#normalizing-a-specifier-key -WebIDL::ExceptionOr> normalise_specifier_key(JS::Realm& realm, DeprecatedFlyString specifier_key, URL::URL base_url) +WebIDL::ExceptionOr> normalise_specifier_key(JS::Realm& realm, FlyByteString specifier_key, URL::URL base_url) { // 1. If specifierKey is the empty string, then: if (specifier_key.is_empty()) { @@ -86,7 +86,7 @@ WebIDL::ExceptionOr> normalise_specifier_key(JS::R TRY_OR_THROW_OOM(realm.vm(), String::formatted("Specifier keys may not be empty"))); // 2. Return null. - return Optional {}; + return Optional {}; } // 2. Let url be the result of resolving a URL-like module specifier, given specifierKey and baseURL. diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.h b/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.h index d0326bf8efc536..d1181b84863179 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ImportMap.h @@ -34,7 +34,7 @@ class ImportMap { }; WebIDL::ExceptionOr parse_import_map_string(JS::Realm& realm, ByteString const& input, URL::URL base_url); -WebIDL::ExceptionOr> normalise_specifier_key(JS::Realm& realm, DeprecatedFlyString specifier_key, URL::URL base_url); +WebIDL::ExceptionOr> normalise_specifier_key(JS::Realm& realm, FlyByteString specifier_key, URL::URL base_url); WebIDL::ExceptionOr sort_and_normalise_module_specifier_map(JS::Realm& realm, JS::Object& original_map, URL::URL base_url); WebIDL::ExceptionOr> sort_and_normalise_scopes(JS::Realm& realm, JS::Object& original_map, URL::URL base_url); diff --git a/Userland/Libraries/LibWeb/HTML/StructuredSerialize.cpp b/Userland/Libraries/LibWeb/HTML/StructuredSerialize.cpp index 010d0a0e822127..f6e9bf1e3562c8 100644 --- a/Userland/Libraries/LibWeb/HTML/StructuredSerialize.cpp +++ b/Userland/Libraries/LibWeb/HTML/StructuredSerialize.cpp @@ -542,7 +542,7 @@ WebIDL::ExceptionOr serialize_bytes(JS::VM& vm, Vector& vector, Reado return {}; } -WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, DeprecatedFlyString const& string) +WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, FlyByteString const& string) { return serialize_bytes(vm, vector, string.view().bytes()); } diff --git a/Userland/Libraries/LibWeb/HTML/StructuredSerialize.h b/Userland/Libraries/LibWeb/HTML/StructuredSerialize.h index c68476a6f423d6..c48586ca049fda 100644 --- a/Userland/Libraries/LibWeb/HTML/StructuredSerialize.h +++ b/Userland/Libraries/LibWeb/HTML/StructuredSerialize.h @@ -88,7 +88,7 @@ void serialize_enum(SerializationRecord& serialized, T value) } WebIDL::ExceptionOr serialize_bytes(JS::VM& vm, Vector& vector, ReadonlyBytes bytes); -WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, DeprecatedFlyString const& string); +WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, FlyByteString const& string); WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, String const& string); WebIDL::ExceptionOr serialize_string(JS::VM& vm, Vector& vector, JS::PrimitiveString const& primitive_string); WebIDL::ExceptionOr serialize_array_buffer(JS::VM& vm, Vector& vector, JS::ArrayBuffer const& array_buffer, bool for_storage);