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

LibJS: Move locale_relevant_extension_keys to Intl.Locale

Browse source
This commit is contained in:
Timothy Flynn 2021-09-11 11:15:42 -04:00 • committed by Linus Groh
parent 7769cd2cab
commit 673fc02ac5
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,18 @@ 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()); 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 // 14 Locale Objects, https://tc39.es/ecma402/#locale-objects
Locale::Locale(Object& prototype) Locale::Locale(Object& prototype)
: Object(prototype) : Object(prototype)

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

@ -8,6 +8,7 @@
#include <AK/Optional.h> #include <AK/Optional.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Vector.h>
#include <LibJS/Runtime/Object.h> #include <LibJS/Runtime/Object.h>
#include <LibJS/Runtime/Value.h> #include <LibJS/Runtime/Value.h>
#include <LibUnicode/Forward.h> #include <LibUnicode/Forward.h>
@ -20,6 +21,8 @@ class Locale final : public Object {
public: public:
static Locale* create(GlobalObject&, Unicode::LocaleID const&); static Locale* create(GlobalObject&, Unicode::LocaleID const&);
static Vector<StringView> const& relevant_extension_keys(); // [[RelevantExtensionKeys]]
Locale(Object& prototype); Locale(Object& prototype);
Locale(Unicode::LocaleID const&, Object& prototype); Locale(Unicode::LocaleID const&, Object& prototype);
virtual ~Locale() override = default; virtual ~Locale() override = default;

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

@ -25,18 +25,6 @@ struct LocaleAndKeys {
Optional<String> nu; Optional<String> nu;
}; };
static 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;
}
// Note: This is not an AO in the spec. This just serves to abstract very similar steps in ApplyOptionsToTag and the Intl.Locale constructor. // Note: This is not an AO in the spec. This just serves to abstract very similar steps in ApplyOptionsToTag and the Intl.Locale constructor.
static Optional<String> get_string_option(GlobalObject& global_object, Object const& options, PropertyName const& property, Function<bool(StringView)> validator, Vector<StringView> const& values = {}) static Optional<String> get_string_option(GlobalObject& global_object, Object const& options, PropertyName const& property, Function<bool(StringView)> validator, Vector<StringView> const& values = {})
{ {
@ -278,7 +266,7 @@ Value LocaleConstructor::construct(FunctionObject& new_target)
auto options_value = vm.argument(1); auto options_value = vm.argument(1);
// 2. Let relevantExtensionKeys be %Locale%.[[RelevantExtensionKeys]]. // 2. Let relevantExtensionKeys be %Locale%.[[RelevantExtensionKeys]].
auto const& relevant_extension_keys = locale_relevant_extension_keys(); auto const& relevant_extension_keys = Locale::relevant_extension_keys();
// 3. Let internalSlotsList be « [[InitializedLocale]], [[Locale]], [[Calendar]], [[Collation]], [[HourCycle]], [[NumberingSystem]] ». // 3. Let internalSlotsList be « [[InitializedLocale]], [[Locale]], [[Calendar]], [[Collation]], [[HourCycle]], [[NumberingSystem]] ».
// 4. If relevantExtensionKeys contains "kf", then // 4. If relevantExtensionKeys contains "kf", then