diff --git a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp index d00cc29223..f01d6c8365 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp @@ -239,7 +239,7 @@ StringView NumberFormat::sign_display_string() const } // 15.1.1 SetNumberFormatDigitOptions ( intlObj, options, mnfdDefault, mxfdDefault, notation ), https://tc39.es/ecma402/#sec-setnfdigitoptions -void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options, int default_min_fraction_digits, int default_max_fraction_digits, NumberFormat::Notation notation) +ThrowCompletionOr set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options, int default_min_fraction_digits, int default_max_fraction_digits, NumberFormat::Notation notation) { auto& vm = global_object.vm(); @@ -249,30 +249,27 @@ void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& // 4. Assert: Type(mxfdDefault) is Number. // 5. Let mnid be ? GetNumberOption(options, "minimumIntegerDigits,", 1, 21, 1). - auto min_integer_digits_or_error = get_number_option(global_object, options, vm.names.minimumIntegerDigits, 1, 21, 1); - if (min_integer_digits_or_error.is_error()) - return; - auto min_integer_digits = min_integer_digits_or_error.release_value(); + auto min_integer_digits = TRY(get_number_option(global_object, options, vm.names.minimumIntegerDigits, 1, 21, 1)); // 6. Let mnfd be ? Get(options, "minimumFractionDigits"). auto min_fraction_digits = options.get(vm.names.minimumFractionDigits); - if (vm.exception()) - return; + if (auto* exception = vm.exception()) + return throw_completion(exception->value()); // 7. Let mxfd be ? Get(options, "maximumFractionDigits"). auto max_fraction_digits = options.get(vm.names.maximumFractionDigits); - if (vm.exception()) - return; + if (auto* exception = vm.exception()) + return throw_completion(exception->value()); // 8. Let mnsd be ? Get(options, "minimumSignificantDigits"). auto min_significant_digits = options.get(vm.names.minimumSignificantDigits); - if (vm.exception()) - return; + if (auto* exception = vm.exception()) + return throw_completion(exception->value()); // 9. Let mxsd be ? Get(options, "maximumSignificantDigits"). auto max_significant_digits = options.get(vm.names.maximumSignificantDigits); - if (vm.exception()) - return; + if (auto* exception = vm.exception()) + return throw_completion(exception->value()); // 10. Set intlObj.[[MinimumIntegerDigits]] to mnid. intl_object.set_min_integer_digits(*min_integer_digits); @@ -283,16 +280,10 @@ void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object.set_rounding_type(NumberFormat::RoundingType::SignificantDigits); // b. Let mnsd be ? DefaultNumberOption(mnsd, 1, 21, 1). - auto min_digits_or_error = default_number_option(global_object, min_significant_digits, 1, 21, 1); - if (min_digits_or_error.is_error()) - return; - auto min_digits = min_digits_or_error.release_value(); + auto min_digits = TRY(default_number_option(global_object, min_significant_digits, 1, 21, 1)); // c. Let mxsd be ? DefaultNumberOption(mxsd, mnsd, 21, 21). - auto max_digits_or_error = default_number_option(global_object, max_significant_digits, *min_digits, 21, 21); - if (max_digits_or_error.is_error()) - return; - auto max_digits = max_digits_or_error.release_value(); + auto max_digits = TRY(default_number_option(global_object, max_significant_digits, *min_digits, 21, 21)); // d. Set intlObj.[[MinimumSignificantDigits]] to mnsd. intl_object.set_min_significant_digits(*min_digits); @@ -306,30 +297,20 @@ void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object.set_rounding_type(NumberFormat::RoundingType::FractionDigits); // b. Let mnfd be ? DefaultNumberOption(mnfd, 0, 20, undefined). - auto min_digits_or_error = default_number_option(global_object, min_fraction_digits, 0, 20, {}); - if (min_digits_or_error.is_error()) - return; - auto min_digits = min_digits_or_error.release_value(); + auto min_digits = TRY(default_number_option(global_object, min_fraction_digits, 0, 20, {})); // c. Let mxfd be ? DefaultNumberOption(mxfd, 0, 20, undefined). - auto max_digits_or_error = default_number_option(global_object, max_fraction_digits, 0, 20, {}); - if (max_digits_or_error.is_error()) - return; - auto max_digits = max_digits_or_error.release_value(); + auto max_digits = TRY(default_number_option(global_object, max_fraction_digits, 0, 20, {})); // d. If mnfd is undefined, set mnfd to min(mnfdDefault, mxfd). - if (!min_digits.has_value()) { + if (!min_digits.has_value()) min_digits = min(default_min_fraction_digits, *max_digits); - } // e. Else if mxfd is undefined, set mxfd to max(mxfdDefault, mnfd). - else if (!max_digits.has_value()) { + else if (!max_digits.has_value()) max_digits = max(default_max_fraction_digits, *min_digits); - } // f. Else if mnfd is greater than mxfd, throw a RangeError exception. - else if (*min_digits > *max_digits) { - vm.throw_exception(global_object, ErrorType::IntlMinimumExceedsMaximum, *min_digits, *max_digits); - return; - } + else if (*min_digits > *max_digits) + return vm.throw_completion(global_object, ErrorType::IntlMinimumExceedsMaximum, *min_digits, *max_digits); // g. Set intlObj.[[MinimumFractionDigits]] to mnfd. intl_object.set_min_fraction_digits(*min_digits); @@ -354,38 +335,37 @@ void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& // c. Set intlObj.[[MaximumFractionDigits]] to mxfdDefault. intl_object.set_max_fraction_digits(default_max_fraction_digits); } + return {}; } // 15.1.2 InitializeNumberFormat ( numberFormat, locales, options ), https://tc39.es/ecma402/#sec-initializenumberformat -NumberFormat* initialize_number_format(GlobalObject& global_object, NumberFormat& number_format, Value locales_value, Value options_value) +ThrowCompletionOr initialize_number_format(GlobalObject& global_object, NumberFormat& number_format, Value locales_value, Value options_value) { auto& vm = global_object.vm(); // 1. Let requestedLocales be ? CanonicalizeLocaleList(locales). - auto requested_locales = TRY_OR_DISCARD(canonicalize_locale_list(global_object, locales_value)); + auto requested_locales = TRY(canonicalize_locale_list(global_object, locales_value)); // 2. Set options to ? CoerceOptionsToObject(options). - auto* options = TRY_OR_DISCARD(coerce_options_to_object(global_object, options_value)); + auto* options = TRY(coerce_options_to_object(global_object, options_value)); // 3. Let opt be a new Record. LocaleOptions opt {}; // 4. Let matcher be ? GetOption(options, "localeMatcher", "string", « "lookup", "best fit" », "best fit"). - auto matcher = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.localeMatcher, Value::Type::String, { "lookup"sv, "best fit"sv }, "best fit"sv)); + auto matcher = TRY(get_option(global_object, *options, vm.names.localeMatcher, Value::Type::String, { "lookup"sv, "best fit"sv }, "best fit"sv)); // 5. Set opt.[[localeMatcher]] to matcher. opt.locale_matcher = matcher; // 6. Let numberingSystem be ? GetOption(options, "numberingSystem", "string", undefined, undefined). - auto numbering_system = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.numberingSystem, Value::Type::String, {}, Empty {})); + auto numbering_system = TRY(get_option(global_object, *options, vm.names.numberingSystem, Value::Type::String, {}, Empty {})); // 7. If numberingSystem is not undefined, then if (!numbering_system.is_undefined()) { // a. If numberingSystem does not match the Unicode Locale Identifier type nonterminal, throw a RangeError exception. - if (!Unicode::is_type_identifier(numbering_system.as_string().string())) { - vm.throw_exception(global_object, ErrorType::OptionIsNotValidValue, numbering_system, "numberingSystem"sv); - return {}; - } + if (!Unicode::is_type_identifier(numbering_system.as_string().string())) + return vm.throw_completion(global_object, ErrorType::OptionIsNotValidValue, numbering_system, "numberingSystem"sv); // 8. Set opt.[[nu]] to numberingSystem. opt.nu = numbering_system.as_string().string(); @@ -405,9 +385,7 @@ NumberFormat* initialize_number_format(GlobalObject& global_object, NumberFormat number_format.set_numbering_system(result.nu.release_value()); // 14. Perform ? SetNumberFormatUnitOptions(numberFormat, options). - set_number_format_unit_options(global_object, number_format, *options); - if (vm.exception()) - return {}; + TRY(set_number_format_unit_options(global_object, number_format, *options)); // 15. Let style be numberFormat.[[Style]]. auto style = number_format.style(); @@ -442,18 +420,16 @@ NumberFormat* initialize_number_format(GlobalObject& global_object, NumberFormat } // 18. Let notation be ? GetOption(options, "notation", "string", « "standard", "scientific", "engineering", "compact" », "standard"). - auto notation = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.notation, Value::Type::String, { "standard"sv, "scientific"sv, "engineering"sv, "compact"sv }, "standard"sv)); + auto notation = TRY(get_option(global_object, *options, vm.names.notation, Value::Type::String, { "standard"sv, "scientific"sv, "engineering"sv, "compact"sv }, "standard"sv)); // 19. Set numberFormat.[[Notation]] to notation. number_format.set_notation(notation.as_string().string()); // 20. Perform ? SetNumberFormatDigitOptions(numberFormat, options, mnfdDefault, mxfdDefault, notation). - set_number_format_digit_options(global_object, number_format, *options, default_min_fraction_digits, default_max_fraction_digits, number_format.notation()); - if (vm.exception()) - return {}; + TRY(set_number_format_digit_options(global_object, number_format, *options, default_min_fraction_digits, default_max_fraction_digits, number_format.notation())); // 21. Let compactDisplay be ? GetOption(options, "compactDisplay", "string", « "short", "long" », "short"). - auto compact_display = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.compactDisplay, Value::Type::String, { "short"sv, "long"sv }, "short"sv)); + auto compact_display = TRY(get_option(global_object, *options, vm.names.compactDisplay, Value::Type::String, { "short"sv, "long"sv }, "short"sv)); // 22. If notation is "compact", then if (number_format.notation() == NumberFormat::Notation::Compact) { @@ -462,13 +438,13 @@ NumberFormat* initialize_number_format(GlobalObject& global_object, NumberFormat } // 23. Let useGrouping be ? GetOption(options, "useGrouping", "boolean", undefined, true). - auto use_grouping = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.useGrouping, Value::Type::Boolean, {}, true)); + auto use_grouping = TRY(get_option(global_object, *options, vm.names.useGrouping, Value::Type::Boolean, {}, true)); // 24. Set numberFormat.[[UseGrouping]] to useGrouping. number_format.set_use_grouping(use_grouping.as_bool()); // 25. Let signDisplay be ? GetOption(options, "signDisplay", "string", « "auto", "never", "always", "exceptZero" », "auto"). - auto sign_display = TRY_OR_DISCARD(get_option(global_object, *options, vm.names.signDisplay, Value::Type::String, { "auto"sv, "never"sv, "always"sv, "exceptZero"sv }, "auto"sv)); + auto sign_display = TRY(get_option(global_object, *options, vm.names.signDisplay, Value::Type::String, { "auto"sv, "never"sv, "always"sv, "exceptZero"sv }, "auto"sv)); // 26. Set numberFormat.[[SignDisplay]] to signDisplay. number_format.set_sign_display(sign_display.as_string().string()); @@ -488,7 +464,7 @@ int currency_digits(StringView currency) } // 15.1.13 SetNumberFormatUnitOptions ( intlObj, options ), https://tc39.es/ecma402/#sec-setnumberformatunitoptions -void set_number_format_unit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options) +ThrowCompletionOr set_number_format_unit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options) { auto& vm = global_object.vm(); @@ -496,73 +472,47 @@ void set_number_format_unit_options(GlobalObject& global_object, NumberFormat& i // 2. Assert: Type(options) is Object. // 3. Let style be ? GetOption(options, "style", "string", « "decimal", "percent", "currency", "unit" », "decimal"). - auto style_or_error = get_option(global_object, options, vm.names.style, Value::Type::String, { "decimal"sv, "percent"sv, "currency"sv, "unit"sv }, "decimal"sv); - if (style_or_error.is_error()) - return; - auto style = style_or_error.release_value(); + auto style = TRY(get_option(global_object, options, vm.names.style, Value::Type::String, { "decimal"sv, "percent"sv, "currency"sv, "unit"sv }, "decimal"sv)); // 4. Set intlObj.[[Style]] to style. intl_object.set_style(style.as_string().string()); // 5. Let currency be ? GetOption(options, "currency", "string", undefined, undefined). - auto currency_or_error = get_option(global_object, options, vm.names.currency, Value::Type::String, {}, Empty {}); - if (currency_or_error.is_error()) - return; - auto currency = currency_or_error.release_value(); + auto currency = TRY(get_option(global_object, options, vm.names.currency, Value::Type::String, {}, Empty {})); // 6. If currency is undefined, then if (currency.is_undefined()) { // a. If style is "currency", throw a TypeError exception. - if (intl_object.style() == NumberFormat::Style::Currency) { - vm.throw_exception(global_object, ErrorType::IntlOptionUndefined, "currency"sv, "style"sv, style); - return; - } + if (intl_object.style() == NumberFormat::Style::Currency) + return vm.throw_completion(global_object, ErrorType::IntlOptionUndefined, "currency"sv, "style"sv, style); } // 7. Else, // a. If the result of IsWellFormedCurrencyCode(currency) is false, throw a RangeError exception. - else if (!is_well_formed_currency_code(currency.as_string().string())) { - vm.throw_exception(global_object, ErrorType::OptionIsNotValidValue, currency, "currency"sv); - return; - } + else if (!is_well_formed_currency_code(currency.as_string().string())) + return vm.throw_completion(global_object, ErrorType::OptionIsNotValidValue, currency, "currency"sv); // 8. Let currencyDisplay be ? GetOption(options, "currencyDisplay", "string", « "code", "symbol", "narrowSymbol", "name" », "symbol"). - auto currency_display_or_error = get_option(global_object, options, vm.names.currencyDisplay, Value::Type::String, { "code"sv, "symbol"sv, "narrowSymbol"sv, "name"sv }, "symbol"sv); - if (currency_display_or_error.is_error()) - return; - auto currency_display = currency_display_or_error.release_value(); + auto currency_display = TRY(get_option(global_object, options, vm.names.currencyDisplay, Value::Type::String, { "code"sv, "symbol"sv, "narrowSymbol"sv, "name"sv }, "symbol"sv)); // 9. Let currencySign be ? GetOption(options, "currencySign", "string", « "standard", "accounting" », "standard"). - auto currency_sign_or_error = get_option(global_object, options, vm.names.currencySign, Value::Type::String, { "standard"sv, "accounting"sv }, "standard"sv); - if (currency_sign_or_error.is_error()) - return; - auto currency_sign = currency_sign_or_error.release_value(); + auto currency_sign = TRY(get_option(global_object, options, vm.names.currencySign, Value::Type::String, { "standard"sv, "accounting"sv }, "standard"sv)); // 10. Let unit be ? GetOption(options, "unit", "string", undefined, undefined). - auto unit_or_error = get_option(global_object, options, vm.names.unit, Value::Type::String, {}, Empty {}); - if (unit_or_error.is_error()) - return; - auto unit = unit_or_error.release_value(); + auto unit = TRY(get_option(global_object, options, vm.names.unit, Value::Type::String, {}, Empty {})); // 11. If unit is undefined, then if (unit.is_undefined()) { // a. If style is "unit", throw a TypeError exception. - if (intl_object.style() == NumberFormat::Style::Unit) { - vm.throw_exception(global_object, ErrorType::IntlOptionUndefined, "unit"sv, "style"sv, style); - return; - } + if (intl_object.style() == NumberFormat::Style::Unit) + return vm.throw_completion(global_object, ErrorType::IntlOptionUndefined, "unit"sv, "style"sv, style); } // 12. Else, // a. If the result of IsWellFormedUnitIdentifier(unit) is false, throw a RangeError exception. - else if (!is_well_formed_unit_identifier(unit.as_string().string())) { - vm.throw_exception(global_object, ErrorType::OptionIsNotValidValue, unit, "unit"sv); - return; - } + else if (!is_well_formed_unit_identifier(unit.as_string().string())) + return vm.throw_completion(global_object, ErrorType::OptionIsNotValidValue, unit, "unit"sv); // 13. Let unitDisplay be ? GetOption(options, "unitDisplay", "string", « "short", "narrow", "long" », "short"). - auto unit_display_or_error = get_option(global_object, options, vm.names.unitDisplay, Value::Type::String, { "short"sv, "narrow"sv, "long"sv }, "short"sv); - if (unit_display_or_error.is_error()) - return; - auto unit_display = unit_display_or_error.release_value(); + auto unit_display = TRY(get_option(global_object, options, vm.names.unitDisplay, Value::Type::String, { "short"sv, "narrow"sv, "long"sv }, "short"sv)); // 14. If style is "currency", then if (intl_object.style() == NumberFormat::Style::Currency) { @@ -585,6 +535,7 @@ void set_number_format_unit_options(GlobalObject& global_object, NumberFormat& i // b. Set intlObj.[[UnitDisplay]] to unitDisplay. intl_object.set_unit_display(unit_display.as_string().string()); } + return {}; } } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h index 61bfc6a30a..1661620534 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h @@ -172,9 +172,9 @@ private: SignDisplay m_sign_display { SignDisplay::Invalid }; // [[SignDisplay]] }; -void set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options, int default_min_fraction_digits, int default_max_fraction_digits, NumberFormat::Notation notation); -NumberFormat* initialize_number_format(GlobalObject& global_object, NumberFormat& number_format, Value locales_value, Value options_value); +ThrowCompletionOr set_number_format_digit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options, int default_min_fraction_digits, int default_max_fraction_digits, NumberFormat::Notation notation); +ThrowCompletionOr initialize_number_format(GlobalObject& global_object, NumberFormat& number_format, Value locales_value, Value options_value); int currency_digits(StringView currency); -void set_number_format_unit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options); +ThrowCompletionOr set_number_format_unit_options(GlobalObject& global_object, NumberFormat& intl_object, Object const& options); } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp index a425d01183..5ac947a21f 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp @@ -54,9 +54,7 @@ Value NumberFormatConstructor::construct(FunctionObject& new_target) auto* number_format = TRY_OR_DISCARD(ordinary_create_from_constructor(global_object, new_target, &GlobalObject::intl_number_format_prototype)); // 3. Perform ? InitializeNumberFormat(numberFormat, locales, options). - initialize_number_format(global_object, *number_format, locales, options); - if (vm.exception()) - return {}; + TRY_OR_DISCARD(initialize_number_format(global_object, *number_format, locales, options)); // 4. If the implementation supports the normative optional constructor mode of 4.3 Note 1, then // a. Let this be the this value.