Changeset 263837 in webkit

Timestamp:

Jul 2, 2020, 1:47:57 AM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Configure option-offered numberingSystem in Intl.NumberFormat through locale
​https://bugs.webkit.org/show_bug.cgi?id=213872

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-numberformat-nu.js: Added.

(shouldBe):

• test262/expectations.yaml:

Source/JavaScriptCore:

We need to pass numberingSystem option to ICU through locale when constructing UNumberFormat.
We are passing it when we get "en-US-u-nu-hanidec" locale, but we are not passing it when
we are getting new Intl.NumberFormat("en-US", { numberingSystem: "hanidec" }).

• runtime/IntlNumberFormat.cpp:

(JSC::IntlNumberFormat::initializeNumberFormat):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-numberformat-nu.js (added)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlNumberFormat.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-07-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Configure option-offered numberingSystem in Intl.NumberFormat through locale
+        https://bugs.webkit.org/show_bug.cgi?id=213872
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-numberformat-nu.js: Added.
+        (shouldBe):
+        * test262/expectations.yaml:
+
 2020-07-01  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1702 +1702 @@
   default: 'Test262Error: "und".minimize() should be "en" Expected SameValue(«en-u-va-posix», «en») to be true'
   strict mode: 'Test262Error: "und".minimize() should be "en" Expected SameValue(«en-u-va-posix», «en») to be true'
-test/intl402/NumberFormat/prototype/format/numbering-systems.js:
-  default: 'Test262Error: numberingSystem: adlm, digit: 0 Expected SameValue(«0», «𞥐») to be true'
-  strict mode: 'Test262Error: numberingSystem: adlm, digit: 0 Expected SameValue(«0», «𞥐») to be true'
 test/intl402/RelativeTimeFormat/constructor/constructor/locales-valid.js:
   default: 'Test262Error: Grandfathered Expected a RangeError to be thrown but no exception was thrown at all'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-07-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Configure option-offered numberingSystem in Intl.NumberFormat through locale
+        https://bugs.webkit.org/show_bug.cgi?id=213872
+
+        Reviewed by Ross Kirsling.
+
+        We need to pass numberingSystem option to ICU through locale when constructing UNumberFormat.
+        We are passing it when we get "en-US-u-nu-hanidec" locale, but we are not passing it when
+        we are getting `new Intl.NumberFormat("en-US", { numberingSystem: "hanidec" })`.
+
+        * runtime/IntlNumberFormat.cpp:
+        (JSC::IntlNumberFormat::initializeNumberFormat):
+
 2020-07-01  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp

@@ -43 +43 @@
 namespace IntlNumberFormatInternal {
 constexpr const char* relevantExtensionKeys[1] = { "nu" };
+constexpr bool verbose = false;
 }
 
@@ -311 +312 @@
     }
 
+    CString dataLocaleWithExtensions = makeString(result.get("dataLocale"_s), "-u-nu-", m_numberingSystem).utf8();
+    dataLogLnIf(IntlNumberFormatInternal::verbose, "dataLocaleWithExtensions:(", dataLocaleWithExtensions , ")");
+
     UErrorCode status = U_ZERO_ERROR;
-    m_numberFormat = std::unique_ptr<UNumberFormat, UNumberFormatDeleter>(unum_open(style, nullptr, 0, m_locale.utf8().data(), nullptr, &status));
+    m_numberFormat = std::unique_ptr<UNumberFormat, UNumberFormatDeleter>(unum_open(style, nullptr, 0, dataLocaleWithExtensions.data(), nullptr, &status));
     if (U_FAILURE(status)) {
         throwTypeError(globalObject, scope, "failed to initialize NumberFormat"_s);