Skip to content

V
V8
Commit 830fb817 authored by Frank Tang's avatar Frank Tang Committed by V8 LUCI CQ
Browse files
Options

[intl] Sync to PR100 of intl-numberformat-v3 

Remove the range check of formatRange, formatRangeToParts on
NumberFormat and selectRange on PluralRules

Bug: v8:10776
Change-Id: Ifede7d61db6414d5b338b22bd188406e5f7d98b7
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3779041Reviewed-by: 's avatarShu-yu Guo <syg@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#81984}
parent a06680e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 490 deletions
src/builtins/builtins-intl.cc
View file @ 830fb817
...@@ -983,8 +983,6 @@ BUILTIN(PluralRulesPrototypeSelectRange) { ...@@ -983,8 +983,6 @@ BUILTIN(PluralRulesPrototypeSelectRange) {
Object::ToNumber(isolate, end)); Object::ToNumber(isolate, end));
// 6. Return ! ResolvePluralRange(pr, x, y). // 6. Return ! ResolvePluralRange(pr, x, y).
// Inside ResolvePluralRange
// 5. If x is NaN or y is NaN, throw a RangeError exception.
if (x->IsNaN()) { if (x->IsNaN()) {
THROW_NEW_ERROR_RETURN_FAILURE( THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewRangeError(MessageTemplate::kInvalid, isolate, NewRangeError(MessageTemplate::kInvalid,
...@@ -996,16 +994,9 @@ BUILTIN(PluralRulesPrototypeSelectRange) { ...@@ -996,16 +994,9 @@ BUILTIN(PluralRulesPrototypeSelectRange) {
isolate->factory()->endRange_string(), y)); isolate->factory()->endRange_string(), y));
} }
// 6. If x > y, throw a RangeError exception.
double x_double = x->Number();
double y_double = y->Number();
if (x_double > y_double) {
THROW_NEW_ERROR_RETURN_FAILURE(
isolate, NewRangeError(MessageTemplate::kInvalid, x, y));
}
RETURN_RESULT_OR_FAILURE( RETURN_RESULT_OR_FAILURE(
isolate, JSPluralRules::ResolvePluralRange(isolate, plural_rules, isolate, JSPluralRules::ResolvePluralRange(isolate, plural_rules,
x_double, y_double)); x->Number(), y->Number()));
} }
BUILTIN(PluralRulesSupportedLocalesOf) { BUILTIN(PluralRulesSupportedLocalesOf) {
......
src/objects/js-number-format.cc
View file @ 830fb817
This diff is collapsed.
src/objects/js-number-format.h
View file @ 830fb817
...@@ -117,19 +117,6 @@ class V8_NODISCARD IntlMathematicalValue { ...@@ -117,19 +117,6 @@ class V8_NODISCARD IntlMathematicalValue {
public: public:
IntlMathematicalValue() : approx_(0) {} IntlMathematicalValue() : approx_(0) {}
V8_EXPORT_PRIVATE bool IsNaN() const; V8_EXPORT_PRIVATE bool IsNaN() const;
V8_EXPORT_PRIVATE bool IsMinusZero() const;
V8_EXPORT_PRIVATE bool IsNegative() const;
V8_EXPORT_PRIVATE bool IsNegativeInfinity() const {
return IsNegative() && IsInfinity();
}
V8_EXPORT_PRIVATE bool IsPositiveInfinity() const {
return !IsNegative() && IsInfinity();
}
V8_EXPORT_PRIVATE bool IsMathematicalValue() const {
return !(IsNaN() || IsMinusZero() || IsInfinity());
}
V8_EXPORT_PRIVATE bool IsLessThan(Isolate* isolate,
const IntlMathematicalValue& y) const;
V8_EXPORT_PRIVATE static Maybe<IntlMathematicalValue> From( V8_EXPORT_PRIVATE static Maybe<IntlMathematicalValue> From(
Isolate* isolate, Handle<Object> value); Isolate* isolate, Handle<Object> value);
...@@ -149,7 +136,6 @@ class V8_NODISCARD IntlMathematicalValue { ...@@ -149,7 +136,6 @@ class V8_NODISCARD IntlMathematicalValue {
Handle<Object> value_; // Number, BigInt or String Handle<Object> value_; // Number, BigInt or String
Maybe<icu::Formattable> ToFormattable(Isolate* isolate) const; Maybe<icu::Formattable> ToFormattable(Isolate* isolate) const;
MaybeHandle<String> ToString(Isolate* isolate) const; MaybeHandle<String> ToString(Isolate* isolate) const;
V8_EXPORT_PRIVATE bool IsInfinity() const;
}; };
} // namespace internal } // namespace internal
......
test/intl/number-format/format-range-string.js
View file @ 830fb817
...@@ -16,45 +16,41 @@ assertThrows(() => { df.formatRange("1", "-0b1111") }, RangeError); ...@@ -16,45 +16,41 @@ assertThrows(() => { df.formatRange("1", "-0b1111") }, RangeError);
assertThrows(() => { df.formatRange("1", "-0o7654") }, RangeError); assertThrows(() => { df.formatRange("1", "-0o7654") }, RangeError);
assertThrows(() => { df.formatRange("1", "-0xabcde") }, RangeError); assertThrows(() => { df.formatRange("1", "-0xabcde") }, RangeError);
// 2. If x is a mathematical value, then assertDoesNotThrow(() => { df.formatRange(
// 2a. If y is a mathematical value and y < x, throw a RangeError exception.
assertThrows(() => { df.formatRange(
" +1234567890123456789012345678901234567890123456789012345678901 ", " +1234567890123456789012345678901234567890123456789012345678901 ",
" +123456789012345678901234567890123456789012345678901234567890 ") }, RangeError); " +123456789012345678901234567890123456789012345678901234567890 ") });
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +123456789012345678901234567890.123456789012345678901234567890e25 ", " +123456789012345678901234567890.123456789012345678901234567890e25 ",
" +12345678901234567890.1234567890123456789012345678901234567890e25 ") }, RangeError); " +12345678901234567890.1234567890123456789012345678901234567890e25 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +12345678901234567890.1234567890123456789012345678901234567890e35 ", " +12345678901234567890.1234567890123456789012345678901234567890e35 ",
" +123456789012345678901234567890.123456789012345678901234567890e24 ") }, RangeError); " +123456789012345678901234567890.123456789012345678901234567890e24 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" -123456789012345678901234567890123456789012345678901234567890 ", " -123456789012345678901234567890123456789012345678901234567890 ",
" -1234567890123456789012345678901234567890123456789012345678901 ") }, RangeError); " -1234567890123456789012345678901234567890123456789012345678901 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" -12345678901234567890.1234567890123456789012345678901234567890e25 ", " -12345678901234567890.1234567890123456789012345678901234567890e25 ",
" -123456789012345678901234567890.123456789012345678901234567890e25 ") }, RangeError); " -123456789012345678901234567890.123456789012345678901234567890e25 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" -123456789012345678901234567890.123456789012345678901234567890e24 ", " -123456789012345678901234567890.123456789012345678901234567890e24 ",
" -12345678901234567890.1234567890123456789012345678901234567890e35 ") }, RangeError); " -12345678901234567890.1234567890123456789012345678901234567890e35 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +.1234567890123456789012345678901234567890123456789012345678901 ", " +.1234567890123456789012345678901234567890123456789012345678901 ",
" +.123456789012345678901234567890123456789012345678901234567890 ") }, RangeError); " +.123456789012345678901234567890123456789012345678901234567890 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +.123456789012345678901234567890123456789012345678901234567890 ", " +.123456789012345678901234567890123456789012345678901234567890 ",
" -.1234567890123456789012345678901234567890123456789012345678901 ") }, RangeError); " -.1234567890123456789012345678901234567890123456789012345678901 ")});
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +.12e3 ", " +.12e2 ") }, RangeError); " +.12e3 ", " +.12e2 ") });
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +123 ", " +.12e2 ") }, RangeError); " +123 ", " +.12e2 ") });
assertThrows(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" -123 ", " -.12e4 ") }, RangeError); " -123 ", " -.12e4 ") });
// 2b. Else if y is negative-infinity, throw a RangeError exception. assertDoesNotThrow(() => { df.formatRange( " 123 ", " -Infinity ")});
assertThrows(() => { df.formatRange( " 123 ", " -Infinity ") }, RangeError); assertDoesNotThrow(() => { df.formatRange( " 123 ", " -0 ")});
// 2c. Else if y is negative-zero and x ≥ 0, throw a RangeError exception.
assertThrows(() => { df.formatRange( " 123 ", " -0 ") }, RangeError);
// other case which won't throw under 2 // other case which won't throw
assertDoesNotThrow(() => { df.formatRange( " 123 ", " Infinity ") }) assertDoesNotThrow(() => { df.formatRange( " 123 ", " Infinity ") })
assertEquals("123–∞", df.formatRange( " 123 ", " Infinity ")); assertEquals("123–∞", df.formatRange( " 123 ", " Infinity "));
assertDoesNotThrow(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
...@@ -71,28 +67,21 @@ assertDoesNotThrow(() => { df.formatRange( ...@@ -71,28 +67,21 @@ assertDoesNotThrow(() => { df.formatRange(
assertDoesNotThrow(() => { df.formatRange( assertDoesNotThrow(() => { df.formatRange(
" +12345678901234567890.123456789012345678901234567890123456789000000001e20 ", " +12345678901234567890.123456789012345678901234567890123456789000000001e20 ",
" +1234567890.12345678901234567890123456789012345678901234567890e31 ")}) " +1234567890.12345678901234567890123456789012345678901234567890e31 ")})
// 3. Else if x is positive-infinity, then assertDoesNotThrow(() => { df.formatRange( " Infinity ", " 123 ")});
// 3a. If y is a mathematical value, throw a RangeError exception. assertDoesNotThrow(() => { df.formatRange( " +Infinity ", " 123 ")});
assertThrows(() => { df.formatRange( " Infinity ", " 123 ") }, RangeError); assertDoesNotThrow(() => { df.formatRange( " Infinity ", " -Infinity ")});
assertThrows(() => { df.formatRange( " +Infinity ", " 123 ") }, RangeError); assertDoesNotThrow(() => { df.formatRange( " +Infinity ", " -Infinity ")});
// 3b. Else if y is negative-infinity, throw a RangeError exception. assertDoesNotThrow(() => { df.formatRange( " Infinity ", " -0 ")});
assertThrows(() => { df.formatRange( " Infinity ", " -Infinity ") }, RangeError); assertDoesNotThrow(() => { df.formatRange( " +Infinity ", " -0 ")});
assertThrows(() => { df.formatRange( " +Infinity ", " -Infinity ") }, RangeError);
// 3c. Else if y is negative-zero, throw a RangeError exception.
assertThrows(() => { df.formatRange( " Infinity ", " -0 ") }, RangeError);
assertThrows(() => { df.formatRange( " +Infinity ", " -0 ") }, RangeError);
// other case which won't throw under 3 // other case which won't throw under 3
assertDoesNotThrow(() => { df.formatRange( " Infinity ", " Infinity ") }) assertDoesNotThrow(() => { df.formatRange( " Infinity ", " Infinity ") })
assertEquals("~∞", df.formatRange(" Infinity ", " Infinity ")); assertEquals("~∞", df.formatRange(" Infinity ", " Infinity "));
// 4. Else if x is negative-zero, then assertDoesNotThrow(() => { df.formatRange( " -0 ", " -1e-30 ")});
// 4a. If y is a mathematical value and y < 0, throw a RangeError exception. assertDoesNotThrow(() => { df.formatRange( " -0.000e200 ", " -1e-30 ")});
assertThrows(() => { df.formatRange( " -0 ", " -1e-30 ") }, RangeError); assertDoesNotThrow(() => { df.formatRange( " -0 ", " -Infinity ")});
assertThrows(() => { df.formatRange( " -0.000e200 ", " -1e-30 ") }, RangeError); // other case which won't throw
// 4b. Else if y is negative-infinity, throw a RangeError exception.
assertThrows(() => { df.formatRange( " -0 ", " -Infinity ") }, RangeError);
// other case which won't throw under 4
assertDoesNotThrow(() => { df.formatRange( " -0 ", " Infinity ") }) assertDoesNotThrow(() => { df.formatRange( " -0 ", " Infinity ") })
assertEquals("-0 – ∞", df.formatRange(" -0 ", " Infinity ")); assertEquals("-0 – ∞", df.formatRange(" -0 ", " Infinity "));
assertDoesNotThrow(() => { df.formatRange( " -0 ", " -0 ") }) assertDoesNotThrow(() => { df.formatRange( " -0 ", " -0 ") })
......
test/intl/number-format/format-range-v3.js
View file @ 830fb817
...@@ -50,18 +50,16 @@ const nf = new Intl.NumberFormat("en", {signDisplay: "exceptZero"}); ...@@ -50,18 +50,16 @@ const nf = new Intl.NumberFormat("en", {signDisplay: "exceptZero"});
// 6. If ... y is NaN, throw a RangeError exception. // 6. If ... y is NaN, throw a RangeError exception.
assertThrows(() => { nf[method](12, NaN) }, RangeError); assertThrows(() => { nf[method](12, NaN) }, RangeError);
// 8. If x is greater than y, throw a RangeError exception. assertDoesNotThrow(() => { nf[method](23, 12)});
// neither x nor y are bigint.
assertThrows(() => { nf[method](23, 12) }, RangeError);
assertDoesNotThrow(() => nf[method](12, 23)); assertDoesNotThrow(() => nf[method](12, 23));
// x is not bigint but y is. // x is not bigint but y is.
assertThrows(() => { nf[method](23, 12n) }, RangeError); assertDoesNotThrow(() => { nf[method](23, 12n)});
assertDoesNotThrow(() => nf[method](12, 23n)); assertDoesNotThrow(() => nf[method](12, 23n));
// x is bigint but y is not. // x is bigint but y is not.
assertThrows(() => { nf[method](23n, 12) }, RangeError); assertDoesNotThrow(() => { nf[method](23n, 12)});
assertDoesNotThrow(() => nf[method](12n, 23)); assertDoesNotThrow(() => nf[method](12n, 23));
// both x and y are bigint. // both x and y are bigint.
assertThrows(() => { nf[method](23n, 12n) }, RangeError); assertDoesNotThrow(() => { nf[method](23n, 12n)});
assertDoesNotThrow(() => nf[method](12n, 23n)); assertDoesNotThrow(() => nf[method](12n, 23n));
validRanges.forEach( validRanges.forEach(
......
test/test262/test262.status
View file @ 830fb817
...@@ -1020,6 +1020,11 @@ ...@@ -1020,6 +1020,11 @@
# https://github.com/tc39/test262/pull/3603 # https://github.com/tc39/test262/pull/3603
'intl402/NumberFormat/test-option-useGrouping': [FAIL], 'intl402/NumberFormat/test-option-useGrouping': [FAIL],
# https://github.com/tc39/test262/pull/3608
'intl402/NumberFormat/prototype/formatRangeToParts/x-greater-than-y-throws': [FAIL],
'intl402/NumberFormat/prototype/formatRange/x-greater-than-y-throws': [FAIL],
'intl402/PluralRules/prototype/selectRange/x-greater-than-y-throws': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=12763 # https://bugs.chromium.org/p/v8/issues/detail?id=12763
'language/expressions/class/decorator/syntax/class-valid/decorator-member-expr-private-identifier': [FAIL], 'language/expressions/class/decorator/syntax/class-valid/decorator-member-expr-private-identifier': [FAIL],
'language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference': [FAIL], 'language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference': [FAIL],
......
test/unittests/objects/intl-unittest.cc
View file @ 830fb817
...@@ -418,11 +418,6 @@ TEST_F(IntlTest, IntlMathematicalValueFromString) { ...@@ -418,11 +418,6 @@ TEST_F(IntlTest, IntlMathematicalValueFromString) {
i_isolate()->factory()->NewStringFromAsciiChecked(cas.string)) i_isolate()->factory()->NewStringFromAsciiChecked(cas.string))
.ToChecked(); .ToChecked();
CHECK_EQ(x.IsNaN(), cas.is_nan); CHECK_EQ(x.IsNaN(), cas.is_nan);
CHECK_EQ(x.IsMinusZero(), cas.is_minus_zero);
CHECK_EQ(x.IsNegative(), cas.is_negative);
CHECK_EQ(x.IsNegativeInfinity(), cas.is_negative_infinity);
CHECK_EQ(x.IsPositiveInfinity(), cas.is_positive_infinity);
CHECK_EQ(x.IsMathematicalValue(), cas.is_mathematical_value);
} }
} }
...@@ -446,66 +441,6 @@ TEST_F(IntlTest, IntlMathematicalValueFromBigInt) { ...@@ -446,66 +441,6 @@ TEST_F(IntlTest, IntlMathematicalValueFromBigInt) {
i_isolate(), BigInt::FromObject(i_isolate(), str).ToHandleChecked()) i_isolate(), BigInt::FromObject(i_isolate(), str).ToHandleChecked())
.ToChecked(); .ToChecked();
CHECK_EQ(x.IsNaN(), false); CHECK_EQ(x.IsNaN(), false);
CHECK_EQ(x.IsMinusZero(), false);
CHECK_EQ(x.IsNegative(), cas.is_negative);
CHECK_EQ(x.IsNegativeInfinity(), false);
CHECK_EQ(x.IsPositiveInfinity(), false);
CHECK_EQ(x.IsMathematicalValue(), true);
}
}
TEST_F(IntlTest, IntlMathematicalValueLessThanString) {
struct TestCase {
const char* x;
const char* y;
bool is_x_less_than_y;
} cases[] = {
{" 1 ", " 2", true},
{" 1 ", " 2 ", true},
{" 1e-1 ", " 2 ", true},
{" 1e1 ", " 2 ", false},
{" 1 ", " 20e-3", false},
{" -1e10 ", " -1e9 ", true},
{" -1e-10 ", " -1e-9 ", false},
{" 123456789012345678901234567890 ", " 123456789012345678901234567890 ",
false},
{" .123456789012345678901234567890 ", " .123456789012345678901234567890 ",
false},
{" .123456789012345678901234567890000 ",
" .12345678901234567890123456789 ", false},
{" .12345678901234567890123456789 ",
" .123456789012345678901234567890000 ", false},
{" 123456789012345678901234567890 ", " 1234567890123456789012345678901 ",
true},
{" 1234567890123456789012345678902 ", " 1234567890123456789012345678901 ",
false},
{" 123456789012345.678901234567890e33 ",
" 12345678901234.5678901234567890e34 ", false},
{" 123456789012345.678901234567890e33 ",
" 12345678901234.5678901234567890e35 ", true},
{" 12345678901234.5678901234567890e34 ",
" 123456789012345.678901234567890e33 ", false},
{" 123456789012345678.901234567890e30 ",
" 12345678901234.5678901234567890e35 ", true},
{" .12345678901234567890123456789 ",
" .1234567890123456789012345678900000001 ", true},
{" -.1234567890123456789012345678900000001 ",
" -.123456789012345678901234567890000 ", true},
{" -.1234567890123456789012345678900000001 ",
" -0.00000123456789012345678901234567890000e5 ", true},
};
for (auto& cas : cases) {
IntlMathematicalValue x =
IntlMathematicalValue::From(
i_isolate(),
i_isolate()->factory()->NewStringFromAsciiChecked(cas.x))
.ToChecked();
IntlMathematicalValue y =
IntlMathematicalValue::From(
i_isolate(),
i_isolate()->factory()->NewStringFromAsciiChecked(cas.y))
.ToChecked();
CHECK_EQ(x.IsLessThan(i_isolate(), y), cas.is_x_less_than_y);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment