RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-19 20:07:34 +00:00
Code Issues Activity Actions

LibJS: Fix assignment of "isNegative" in FormatNumericToString

Browse source 
These are normative changes in the Intl.NumberFormat v3 spec. See:
5a2b1d1
cd48a3d
This commit is contained in:
Timothy Flynn 2023-01-12 09:08:45 -05:00 • committed by Linus Groh
parent d30e96a209
commit 2cca5d6676
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp
View file

@ -386,24 +386,25 @@ FormatResult format_numeric_to_string(NumberFormatBase const& intl_object, Mathe
// a. Let isNegative be true. // a. Let isNegative be true.
is_negative = true; is_negative = true;
// b. Let x be the mathematical value 0. // b. Set x to 0.
number = MathematicalValue(0.0); number = MathematicalValue(0.0);
} }
// 2. Else,
else {
// a. Assert: x is a mathematical value.
VERIFY(number.is_mathematical_value());
// 2. Assert: x is a mathematical value. // b. If x < 0, let isNegative be true; else let isNegative be false.
VERIFY(number.is_mathematical_value()); is_negative = number.is_negative();
// 3. If x < 0, let isNegative be true; else let isNegative be false. // c. If isNegative, then
// FIXME: Spec issue: this step would override step 1a, see https://github.com/tc39/proposal-intl-numberformat-v3/issues/67 if (is_negative) {
if (number.is_negative()) { // i. Set x to -x.
is_negative = true; number.negate();
}
// 4. If isNegative, then
// a. Let x be -x.
number.negate();
} }
// 5. Let unsignedRoundingMode be GetUnsignedRoundingMode(intlObject.[[RoundingMode]], isNegative). // 3. Let unsignedRoundingMode be GetUnsignedRoundingMode(intlObject.[[RoundingMode]], isNegative).
// FIXME: Spec issue: Intl.PluralRules does not have [[RoundingMode]], see https://github.com/tc39/proposal-intl-numberformat-v3/issues/103 // FIXME: Spec issue: Intl.PluralRules does not have [[RoundingMode]], see https://github.com/tc39/proposal-intl-numberformat-v3/issues/103
Optional<NumberFormat::UnsignedRoundingMode> unsigned_rounding_mode; Optional<NumberFormat::UnsignedRoundingMode> unsigned_rounding_mode;
if (intl_object.rounding_mode() != NumberFormat::RoundingMode::Invalid) if (intl_object.rounding_mode() != NumberFormat::RoundingMode::Invalid)
@ -412,19 +413,19 @@ FormatResult format_numeric_to_string(NumberFormatBase const& intl_object, Mathe
RawFormatResult result {}; RawFormatResult result {};
switch (intl_object.rounding_type()) { switch (intl_object.rounding_type()) {
// 6. If intlObject.[[RoundingType]] is significantDigits, then // 4. If intlObject.[[RoundingType]] is significantDigits, then
case NumberFormatBase::RoundingType::SignificantDigits: case NumberFormatBase::RoundingType::SignificantDigits:
// a. Let result be ToRawPrecision(x, intlObject.[[MinimumSignificantDigits]], intlObject.[[MaximumSignificantDigits]], unsignedRoundingMode). // a. Let result be ToRawPrecision(x, intlObject.[[MinimumSignificantDigits]], intlObject.[[MaximumSignificantDigits]], unsignedRoundingMode).
result = to_raw_precision(number, intl_object.min_significant_digits(), intl_object.max_significant_digits(), unsigned_rounding_mode); result = to_raw_precision(number, intl_object.min_significant_digits(), intl_object.max_significant_digits(), unsigned_rounding_mode);
break; break;
// 7. Else if intlObject.[[RoundingType]] is fractionDigits, then // 5. Else if intlObject.[[RoundingType]] is fractionDigits, then
case NumberFormatBase::RoundingType::FractionDigits: case NumberFormatBase::RoundingType::FractionDigits:
// a. Let result be ToRawFixed(x, intlObject.[[MinimumFractionDigits]], intlObject.[[MaximumFractionDigits]], intlObject.[[RoundingIncrement]], unsignedRoundingMode). // a. Let result be ToRawFixed(x, intlObject.[[MinimumFractionDigits]], intlObject.[[MaximumFractionDigits]], intlObject.[[RoundingIncrement]], unsignedRoundingMode).
result = to_raw_fixed(number, intl_object.min_fraction_digits(), intl_object.max_fraction_digits(), intl_object.rounding_increment(), unsigned_rounding_mode); result = to_raw_fixed(number, intl_object.min_fraction_digits(), intl_object.max_fraction_digits(), intl_object.rounding_increment(), unsigned_rounding_mode);
break; break;
// 8. Else, // 6. Else,
case NumberFormatBase::RoundingType::MorePrecision: case NumberFormatBase::RoundingType::MorePrecision:
case NumberFormatBase::RoundingType::LessPrecision: { case NumberFormatBase::RoundingType::LessPrecision: {
// a. Let sResult be ToRawPrecision(x, intlObject.[[MinimumSignificantDigits]], intlObject.[[MaximumSignificantDigits]], unsignedRoundingMode). // a. Let sResult be ToRawPrecision(x, intlObject.[[MinimumSignificantDigits]], intlObject.[[MaximumSignificantDigits]], unsignedRoundingMode).
@ -470,13 +471,13 @@ FormatResult format_numeric_to_string(NumberFormatBase const& intl_object, Mathe
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
// 9. Let x be result.[[RoundedNumber]]. // 7. Let x be result.[[RoundedNumber]].
number = move(result.rounded_number); number = move(result.rounded_number);
// 10. Let string be result.[[FormattedString]]. // 8. Let string be result.[[FormattedString]].
auto string = move(result.formatted_string); auto string = move(result.formatted_string);
// 11. If intlObject.[[TrailingZeroDisplay]] is "stripIfInteger" and x modulo 1 = 0, then // 9. If intlObject.[[TrailingZeroDisplay]] is "stripIfInteger" and x modulo 1 = 0, then
if ((intl_object.trailing_zero_display() == NumberFormat::TrailingZeroDisplay::StripIfInteger) && number.modulo_is_zero(1)) { if ((intl_object.trailing_zero_display() == NumberFormat::TrailingZeroDisplay::StripIfInteger) && number.modulo_is_zero(1)) {
// a. If string contains ".", then // a. If string contains ".", then
if (auto index = string.find('.'); index.has_value()) { if (auto index = string.find('.'); index.has_value()) {
@ -485,13 +486,13 @@ FormatResult format_numeric_to_string(NumberFormatBase const& intl_object, Mathe
} }
} }
// 12. Let int be result.[[IntegerDigitsCount]]. // 10. Let int be result.[[IntegerDigitsCount]].
int digits = result.digits; int digits = result.digits;
// 13. Let minInteger be intlObject.[[MinimumIntegerDigits]]. // 11. Let minInteger be intlObject.[[MinimumIntegerDigits]].
int min_integer = intl_object.min_integer_digits(); int min_integer = intl_object.min_integer_digits();
// 14. If int < minInteger, then // 12. If int < minInteger, then
if (digits < min_integer) { if (digits < min_integer) {
// a. Let forwardZeros be the String consisting of minInteger–int occurrences of the character "0". // a. Let forwardZeros be the String consisting of minInteger–int occurrences of the character "0".
auto forward_zeros = DeprecatedString::repeated('0', min_integer - digits); auto forward_zeros = DeprecatedString::repeated('0', min_integer - digits);
@ -500,18 +501,18 @@ FormatResult format_numeric_to_string(NumberFormatBase const& intl_object, Mathe
string = DeprecatedString::formatted("{}{}", forward_zeros, string); string = DeprecatedString::formatted("{}{}", forward_zeros, string);
} }
// 15. If isNegative and x is 0, then // 13. If isNegative and x is 0, then
if (is_negative && number.is_zero()) { if (is_negative && number.is_zero()) {
// a. Let x be -0. // a. Let x be -0.
number = MathematicalValue { MathematicalValue::Symbol::NegativeZero }; number = MathematicalValue { MathematicalValue::Symbol::NegativeZero };
} }
// 16. Else if isNegative, then // 14. Else if isNegative, then
else if (is_negative) { else if (is_negative) {
// b. Let x be -x. // b. Let x be -x.
number.negate(); number.negate();
} }
// 17. Return the Record { [[RoundedNumber]]: x, [[FormattedString]]: string }. // 15. Return the Record { [[RoundedNumber]]: x, [[FormattedString]]: string }.
return { move(string), move(number) }; return { move(string), move(number) };
} }