RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:38:11 +00:00
Code Issues Activity Actions

LibJS: Convert DisplayNames AOs to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-09-18 19:41:25 +03:00
parent 768009e005
commit e65aeee67d
3 changed files with 17 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp
View file

@ -99,69 +99,59 @@ StringView DisplayNames::fallback_string() const
}
// 12.1.1 CanonicalCodeForDisplayNames ( type, code ), https://tc39.es/ecma402/#sec-canonicalcodefordisplaynames
Value canonical_code_for_display_names(GlobalObject& global_object, DisplayNames::Type type, StringView code)
ThrowCompletionOr<Value> canonical_code_for_display_names(GlobalObject& global_object, DisplayNames::Type type, StringView code)
{
auto& vm = global_object.vm();
// 1. If type is "language", then
if (type == DisplayNames::Type::Language) {
// a. If code does not match the unicode_language_id production, throw a RangeError exception.
if (!Unicode::parse_unicode_language_id(code).has_value()) {
vm.throw_exception<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "language"sv);
return {};
}
if (!Unicode::parse_unicode_language_id(code).has_value())
return vm.throw_completion<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "language"sv);
// b. If IsStructurallyValidLanguageTag(code) is false, throw a RangeError exception.
auto locale_id = is_structurally_valid_language_tag(code);
if (!locale_id.has_value()) {
vm.throw_exception<RangeError>(global_object, ErrorType::IntlInvalidLanguageTag, code);
return {};
}
if (!locale_id.has_value())
return vm.throw_completion<RangeError>(global_object, ErrorType::IntlInvalidLanguageTag, code);
// c. Set code to CanonicalizeUnicodeLocaleId(code).
// d. Return code.
auto canonicalized_tag = JS::Intl::canonicalize_unicode_locale_id(*locale_id);
return js_string(vm, move(canonicalized_tag));
return { js_string(vm, move(canonicalized_tag)) };
}
// 2. If type is "region", then
if (type == DisplayNames::Type::Region) {
// a. If code does not match the unicode_region_subtag production, throw a RangeError exception.
if (!Unicode::is_unicode_region_subtag(code)) {
vm.throw_exception<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "region"sv);
return {};
}
if (!Unicode::is_unicode_region_subtag(code))
return vm.throw_completion<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "region"sv);
// b. Let code be the result of mapping code to upper case as described in 6.1.
// c. Return code.
return js_string(vm, code.to_uppercase_string());
return { js_string(vm, code.to_uppercase_string()) };
}
// 3. If type is "script", then
if (type == DisplayNames::Type::Script) {
// a. If code does not match the unicode_script_subtag production, throw a RangeError exception.
if (!Unicode::is_unicode_script_subtag(code)) {
vm.throw_exception<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "script"sv);
return {};
}
if (!Unicode::is_unicode_script_subtag(code))
return vm.throw_completion<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "script"sv);
// b. Let code be the result of mapping the first character in code to upper case, and mapping the second, third, and fourth character in code to lower case, as described in 6.1.
// c. Return code.
return js_string(vm, code.to_titlecase_string());
return { js_string(vm, code.to_titlecase_string()) };
}
// 4. Assert: type is "currency".
VERIFY(type == DisplayNames::Type::Currency);
// 5. If ! IsWellFormedCurrencyCode(code) is false, throw a RangeError exception.
if (!is_well_formed_currency_code(code)) {
vm.throw_exception<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "currency"sv);
return {};
}
if (!is_well_formed_currency_code(code))
return vm.throw_completion<RangeError>(global_object, ErrorType::OptionIsNotValidValue, code, "currency"sv);
// 6. Let code be the result of mapping code to upper case as described in 6.1.
// 7. Return code.
return js_string(vm, code.to_uppercase_string());
return { js_string(vm, code.to_uppercase_string()) };
}
}

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

@ -62,6 +62,6 @@ private:
Fallback m_fallback { Fallback::Invalid }; // [[Fallback]]
};
Value canonical_code_for_display_names(GlobalObject& global_object, DisplayNames::Type type, StringView code);
ThrowCompletionOr<Value> canonical_code_for_display_names(GlobalObject& global_object, DisplayNames::Type type, StringView code);
}

4
Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp
View file

@ -50,9 +50,7 @@ JS_DEFINE_NATIVE_FUNCTION(DisplayNamesPrototype::of)
code = js_string(vm, move(code_string));
// 4. Let code be ? CanonicalCodeForDisplayNames(displayNames.[[Type]], code).
code = canonical_code_for_display_names(global_object, display_names->type(), code.as_string().string());
if (vm.exception())
return {};
code = TRY_OR_DISCARD(canonical_code_for_display_names(global_object, display_names->type(), code.as_string().string()));
// 5. Let fields be displayNames.[[Fields]].
// 6. If fields has a field [[<code>]], return fields.[[<code>]].