RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 11:28:11 +00:00
Code Issues Activity Actions

LibJS: Change all [[RelevantExtensionKeys]] to return constexpr arrays

Browse source 
There's no need to allocate a vector for this internal slot. Similar to
commit: bb11437792
This commit is contained in:
Timothy Flynn 2021-11-29 19:11:49 -05:00 • committed by Linus Groh
parent e27b077c2a
commit d2588d852b
9 changed files with 31 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp
View file

@ -373,7 +373,7 @@ static auto& find_key_in_value(T& value, StringView key)
}
// 9.2.7 ResolveLocale ( availableLocales, requestedLocales, options, relevantExtensionKeys, localeData ), https://tc39.es/ecma402/#sec-resolvelocale
LocaleResult resolve_locale(Vector<String> const& requested_locales, LocaleOptions const& options, Vector<StringView> const& relevant_extension_keys)
LocaleResult resolve_locale(Vector<String> const& requested_locales, LocaleOptions const& options, Span<StringView const> relevant_extension_keys)
{
// 1. Let matcher be options.[[localeMatcher]].
auto const& matcher = options.locale_matcher;

2
Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h
View file

@ -46,7 +46,7 @@ bool is_well_formed_unit_identifier(StringView unit_identifier);
ThrowCompletionOr<Vector<String>> canonicalize_locale_list(GlobalObject&, Value locales);
Optional<String> best_available_locale(StringView locale);
String insert_unicode_extension_and_canonicalize(Unicode::LocaleID locale_id, Unicode::LocaleExtension extension);
LocaleResult resolve_locale(Vector<String> const& requested_locales, LocaleOptions const& options, Vector<StringView> const& relevant_extension_keys);
LocaleResult resolve_locale(Vector<String> const& requested_locales, LocaleOptions const& options, Span<StringView const> relevant_extension_keys);
Vector<String> lookup_supported_locales(Vector<String> const& requested_locales);
Vector<String> best_fit_supported_locales(Vector<String> const& requested_locales);
ThrowCompletionOr<Array*> supported_locales(GlobalObject&, Vector<String> const& requested_locales, Value options);

8
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View file

@ -12,14 +12,6 @@
namespace JS::Intl {
Vector<StringView> const& DateTimeFormat::relevant_extension_keys()
{
// 11.3.3 Internal slots, https://tc39.es/ecma402/#sec-intl.datetimeformat-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "ca", "hc", "nu" ».
static Vector<StringView> relevant_extension_keys { "ca"sv, "hc"sv, "nu"sv };
return relevant_extension_keys;
}
// 11 DateTimeFormat Objects, https://tc39.es/ecma402/#datetimeformat-objects
DateTimeFormat::DateTimeFormat(Object& prototype)
: Object(prototype)

8
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/Array.h>
#include <AK/String.h>
#include <AK/StringView.h>
#include <AK/Types.h>
@ -32,7 +33,12 @@ public:
Short,
};
static Vector<StringView> const& relevant_extension_keys(); // [[RelevantExtensionKeys]]
static constexpr auto relevant_extension_keys()
{
// 11.3.3 Internal slots, https://tc39.es/ecma402/#sec-intl.datetimeformat-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "ca", "hc", "nu" ».
return AK::Array { "ca"sv, "hc"sv, "nu"sv };
}
DateTimeFormat(Object& prototype);
virtual ~DateTimeFormat() override = default;

12
Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp
View file

@ -15,18 +15,6 @@ Locale* Locale::create(GlobalObject& global_object, Unicode::LocaleID const& loc
return global_object.heap().allocate<Locale>(global_object, locale_id, *global_object.intl_locale_prototype());
}
Vector<StringView> const& Locale::relevant_extension_keys()
{
// 14.2.2 Internal slots, https://tc39.es/ecma402/#sec-intl.locale-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "ca", "co", "hc", "kf", "kn", "nu" ».
// If %Collator%.[[RelevantExtensionKeys]] does not contain "kf", then remove "kf" from %Locale%.[[RelevantExtensionKeys]].
// If %Collator%.[[RelevantExtensionKeys]] does not contain "kn", then remove "kn" from %Locale%.[[RelevantExtensionKeys]].
// FIXME: We do not yet have an Intl.Collator object. For now, we behave as if "kf" and "kn" exist, as test262 depends on it.
static Vector<StringView> relevant_extension_keys { "ca"sv, "co"sv, "hc"sv, "kf"sv, "kn"sv, "nu"sv };
return relevant_extension_keys;
}
// 14 Locale Objects, https://tc39.es/ecma402/#locale-objects
Locale::Locale(Object& prototype)
: Object(prototype)

12
Userland/Libraries/LibJS/Runtime/Intl/Locale.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/Array.h>
#include <AK/Optional.h>
#include <AK/String.h>
#include <AK/Vector.h>
@ -21,7 +22,16 @@ class Locale final : public Object {
public:
static Locale* create(GlobalObject&, Unicode::LocaleID const&);
static Vector<StringView> const& relevant_extension_keys(); // [[RelevantExtensionKeys]]
static constexpr auto relevant_extension_keys()
{
// 14.2.2 Internal slots, https://tc39.es/ecma402/#sec-intl.locale-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "ca", "co", "hc", "kf", "kn", "nu" ».
// If %Collator%.[[RelevantExtensionKeys]] does not contain "kf", then remove "kf" from %Locale%.[[RelevantExtensionKeys]].
// If %Collator%.[[RelevantExtensionKeys]] does not contain "kn", then remove "kn" from %Locale%.[[RelevantExtensionKeys]].
// FIXME: We do not yet have an Intl.Collator object. For now, we behave as if "kf" and "kn" exist, as test262 depends on it.
return AK::Array { "ca"sv, "co"sv, "hc"sv, "kf"sv, "kn"sv, "nu"sv };
}
Locale(Object& prototype);
Locale(Unicode::LocaleID const&, Object& prototype);

8
Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp
View file

@ -108,7 +108,7 @@ static ThrowCompletionOr<String> apply_options_to_tag(GlobalObject& global_objec
}
// 14.1.2 ApplyUnicodeExtensionToTag ( tag, options, relevantExtensionKeys ), https://tc39.es/ecma402/#sec-apply-unicode-extension-to-tag
static LocaleAndKeys apply_unicode_extension_to_tag(StringView tag, LocaleAndKeys options, Vector<StringView> const& relevant_extension_keys)
static LocaleAndKeys apply_unicode_extension_to_tag(StringView tag, LocaleAndKeys options, Span<StringView const> relevant_extension_keys)
{
// 1. Assert: Type(tag) is String.
// 2. Assert: tag matches the unicode_locale_id production.
@ -253,7 +253,7 @@ ThrowCompletionOr<Object*> LocaleConstructor::construct(FunctionObject& new_targ
auto options_value = vm.argument(1);
// 2. Let relevantExtensionKeys be %Locale%.[[RelevantExtensionKeys]].
auto const& relevant_extension_keys = Locale::relevant_extension_keys();
auto relevant_extension_keys = Locale::relevant_extension_keys();
// 3. Let internalSlotsList be « [[InitializedLocale]], [[Locale]], [[Calendar]], [[Collation]], [[HourCycle]], [[NumberingSystem]] ».
// 4. If relevantExtensionKeys contains "kf", then
@ -341,14 +341,14 @@ ThrowCompletionOr<Object*> LocaleConstructor::construct(FunctionObject& new_targ
locale->set_hour_cycle(result.hc.release_value());
// 34. If relevantExtensionKeys contains "kf", then
if (relevant_extension_keys.contains_slow("kf"sv)) {
if (relevant_extension_keys.span().contains_slow("kf"sv)) {
// a. Set locale.[[CaseFirst]] to r.[[kf]].
if (result.kf.has_value())
locale->set_case_first(result.kf.release_value());
}
// 35. If relevantExtensionKeys contains "kn", then
if (relevant_extension_keys.contains_slow("kn"sv)) {
if (relevant_extension_keys.span().contains_slow("kn"sv)) {
// a. If ! SameValue(r.[[kn]], "true") is true or r.[[kn]] is the empty String, then
if (result.kn.has_value() && (same_value(js_string(vm, *result.kn), js_string(vm, "true")) || result.kn->is_empty())) {
// i. Set locale.[[Numeric]] to true.

9
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp
View file

@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/Array.h>
#include <AK/Utf8View.h>
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h>
@ -17,14 +16,6 @@
namespace JS::Intl {
Vector<StringView> const& NumberFormat::relevant_extension_keys()
{
// 15.3.3 Internal slots, https://tc39.es/ecma402/#sec-intl.numberformat-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "nu" ».
static Vector<StringView> relevant_extension_keys { "nu"sv };
return relevant_extension_keys;
}
// 15 NumberFormat Objects, https://tc39.es/ecma402/#numberformat-objects
NumberFormat::NumberFormat(Object& prototype)
: Object(prototype)

8
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/Array.h>
#include <AK/Optional.h>
#include <AK/String.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
@ -72,7 +73,12 @@ public:
ExceptZero,
};
static Vector<StringView> const& relevant_extension_keys(); // [[RelevantExtensionKeys]]
static constexpr auto relevant_extension_keys()
{
// 15.3.3 Internal slots, https://tc39.es/ecma402/#sec-intl.numberformat-internal-slots
// The value of the [[RelevantExtensionKeys]] internal slot is « "nu" ».
return AK::Array { "nu"sv };
}
NumberFormat(Object& prototype);
virtual ~NumberFormat() override = default;