AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[Intl] Throw errow while passing roundingIncrement

Browse Source 
Implement the changes in
https://github.com/tc39/proposal-intl-numberformat-v3/pull/102

Bug: v8:13538
Change-Id: I76d6c90c2b09a274a7b12cbb2e9ddbddc14dc3ce
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4063666
Commit-Queue: Frank Tang <ftang@chromium.org>
Reviewed-by: Shu-yu Guo <syg@chromium.org>
Cr-Commit-Position: refs/heads/main@{#84696}
This commit is contained in:
Frank Tang 2022-12-06 11:21:48 -08:00 committed by V8 LUCI CQ
parent 0bdb82d3dd
commit 959b243e53
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/objects/js-number-format.cc
View File

@ -1442,8 +1442,32 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
}
}
int rounding_increment = 1;
if (v8_flags.harmony_intl_number_format_v3) {
// 18. Let roundingIncrement be ? GetNumberOption(options,
// "roundingIncrement,", 1, 5000, 1).
Maybe<int> maybe_rounding_increment = GetNumberOption(
isolate, options, factory->roundingIncrement_string(), 1, 5000, 1);
if (!maybe_rounding_increment.To(&rounding_increment)) {
return MaybeHandle<JSNumberFormat>();
}
// 19. If roundingIncrement is not in « 1, 2, 5, 10, 20, 25, 50, 100, 200,
// 250, 500, 1000, 2000, 2500, 5000 », throw a RangeError exception.
if (!IsValidRoundingIncrement(rounding_increment)) {
THROW_NEW_ERROR(isolate,
NewRangeError(MessageTemplate::kPropertyValueOutOfRange,
factory->roundingIncrement_string()),
JSNumberFormat);
}
// 20. If roundingIncrement is not 1, set mxfdDefault to mnfdDefault.
if (rounding_increment != 1) {
mxfd_default = mnfd_default;
}
}
Notation notation = Notation::STANDARD;
// 18. Let notation be ? GetOption(options, "notation", "string", «
// 21. Let notation be ? GetOption(options, "notation", "string", «
// "standard", "scientific", "engineering", "compact" », "standard").
MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
isolate, notation,
@ -1454,9 +1478,9 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
Notation::COMPACT},
Notation::STANDARD),
Handle<JSNumberFormat>());
// 19. Set numberFormat.[[Notation]] to notation.
// 22. Set numberFormat.[[Notation]] to notation.
// 20. Perform ? SetNumberFormatDigitOptions(numberFormat, options,
// 23. Perform ? SetNumberFormatDigitOptions(numberFormat, options,
// mnfdDefault, mxfdDefault).
Maybe<Intl::NumberFormatDigitOptions> maybe_digit_options =
Intl::SetNumberFormatDigitOptions(isolate, options, mnfd_default,
@ -1466,32 +1490,16 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
Intl::NumberFormatDigitOptions digit_options = maybe_digit_options.FromJust();
if (v8_flags.harmony_intl_number_format_v3) {
// 21. Let roundingIncrement be ? GetNumberOption(options,
// "roundingIncrement,", 1, 5000, 1).
int rounding_increment = 1;
Maybe<int> maybe_rounding_increment = GetNumberOption(
isolate, options, factory->roundingIncrement_string(), 1, 5000, 1);
MAYBE_RETURN(maybe_rounding_increment, MaybeHandle<JSNumberFormat>());
CHECK(maybe_rounding_increment.To(&rounding_increment));
// 22. If roundingIncrement is not in « 1, 2, 5, 10, 20, 25, 50, 100, 200,
// 250, 500, 1000, 2000, 2500, 5000 », throw a RangeError exception.
if (!IsValidRoundingIncrement(rounding_increment)) {
THROW_NEW_ERROR(isolate,
NewRangeError(MessageTemplate::kPropertyValueOutOfRange,
factory->roundingIncrement_string()),
JSNumberFormat);
}
// 24. If roundingIncrement is not 1, then
if (rounding_increment != 1) {
// 23. If roundingIncrement is not 1 and numberFormat.[[RoundingType]] is
// not fractionDigits, throw a TypeError exception.
// a. If numberFormat.[[RoundingType]] is not fractionDigits, throw a
// TypeError exception.
if (digit_options.rounding_type != Intl::RoundingType::kFractionDigits) {
THROW_NEW_ERROR(isolate,
NewTypeError(MessageTemplate::kBadRoundingType),
JSNumberFormat);
}
// 24. If roundingIncrement is not 1 and
// numberFormat.[[MaximumFractionDigits]] is not equal to
// b. If numberFormat.[[MaximumFractionDigits]] is not equal to
// numberFormat.[[MinimumFractionDigits]], throw a RangeError exception.
if (digit_options.maximum_fraction_digits !=
digit_options.minimum_fraction_digits) {
@ -1504,7 +1512,7 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
}
}
// 25. Set _numberFormat.[[RoundingIncrement]] to roundingIncrement.
// 25. Set numberFormat.[[RoundingIncrement]] to roundingIncrement.
// 26. Let trailingZeroDisplay be ? GetOption(options,
// "trailingZeroDisplay", "string", « "auto", "stripIfInteger" », "auto").

3
test/test262/test262.status
View File

@ -216,6 +216,9 @@
# https://bugs.chromium.org/p/v8/issues/detail?id=12209
'intl402/Intl/supportedValuesOf/collations-accepted-by-Collator': [FAIL],
# https://github.com/tc39/test262/pull/3732
'intl402/NumberFormat/constructor-roundingIncrement': [FAIL],
# https://github.com/tc39/test262/issues/3711
'intl402/DateTimeFormat/prototype/formatRange/en-US': [FAIL],
'intl402/DateTimeFormat/prototype/formatRange/fractionalSecondDigits': [FAIL],