Changeset 281371 in webkit

Timestamp:

Aug 21, 2021 6:02:32 AM (11 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Extend Intl TimeZoneName Option
​https://bugs.webkit.org/show_bug.cgi?id=227831

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-extended-timezone-names.js: Added.

(shouldBe):
(timeZoneTest):

• test262/config.yaml:

Source/JavaScriptCore:

​https://github.com/tc39/proposal-intl-extend-timezonename

This patch implements Extend Intl TimeZoneName proposal, which adds "shortOffset", "longOffset", "shortGeneric", "longGeneric"
timeZoneName variants.

• runtime/IntlDateTimeFormat.cpp:

(JSC::IntlDateTimeFormat::setFormatsFromPattern):
(JSC::IntlDateTimeFormat::initializeDateTimeFormat):
(JSC::IntlDateTimeFormat::timeZoneNameString):

• runtime/IntlDateTimeFormat.h:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-extended-timezone-names.js (added)
• JSTests/test262/config.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp (modified) (4 diffs)
• Source/JavaScriptCore/runtime/IntlDateTimeFormat.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Extend Intl TimeZoneName Option
+        https://bugs.webkit.org/show_bug.cgi?id=227831
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-extended-timezone-names.js: Added.
+        (shouldBe):
+        (timeZoneTest):
+        * test262/config.yaml:
+
 2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/test262/config.yaml

@@ -33 +33 @@
     - class-static-block
     - Intl.DisplayNames-v2
-    - Intl.DateTimeFormat-extend-timezonename
     - callable-boundary-realms
   paths:

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Extend Intl TimeZoneName Option
+        https://bugs.webkit.org/show_bug.cgi?id=227831
+
+        Reviewed by Ross Kirsling.
+
+        https://github.com/tc39/proposal-intl-extend-timezonename
+
+        This patch implements Extend Intl TimeZoneName proposal, which adds "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+        timeZoneName variants.
+
+        * runtime/IntlDateTimeFormat.cpp:
+        (JSC::IntlDateTimeFormat::setFormatsFromPattern):
+        (JSC::IntlDateTimeFormat::initializeDateTimeFormat):
+        (JSC::IntlDateTimeFormat::timeZoneNameString):
+        * runtime/IntlDateTimeFormat.h:
+
 2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp

@@ -412 +412 @@
             break;
         case 'z':
-        case 'v':
-        case 'V':
             if (count == 1)
                 m_timeZoneName = TimeZoneName::Short;
             else if (count == 4)
                 m_timeZoneName = TimeZoneName::Long;
+            break;
+        case 'O':
+            if (count == 1)
+                m_timeZoneName = TimeZoneName::ShortOffset;
+            else if (count == 4)
+                m_timeZoneName = TimeZoneName::LongOffset;
+            break;
+        case 'v':
+        case 'V':
+            if (count == 1)
+                m_timeZoneName = TimeZoneName::ShortGeneric;
+            else if (count == 4)
+                m_timeZoneName = TimeZoneName::LongGeneric;
             break;
         case 'S':
@@ -790 +801 @@
         skeletonBuilder.append('S');
 
-    TimeZoneName timeZoneName = intlOption<TimeZoneName>(globalObject, options, vm.propertyNames->timeZoneName, { { "short"_s, TimeZoneName::Short }, { "long"_s, TimeZoneName::Long } }, "timeZoneName must be \"short\" or \"long\""_s, TimeZoneName::None);
+    TimeZoneName timeZoneName = intlOption<TimeZoneName>(globalObject, options, vm.propertyNames->timeZoneName, { { "short"_s, TimeZoneName::Short }, { "long"_s, TimeZoneName::Long }, { "shortOffset"_s, TimeZoneName::ShortOffset }, { "longOffset"_s, TimeZoneName::LongOffset }, { "shortGeneric"_s, TimeZoneName::ShortGeneric}, { "longGeneric"_s, TimeZoneName::LongGeneric } }, "timeZoneName must be \"short\", \"long\", \"shortOffset\", \"longOffset\", \"shortGenric\", or \"longGeneric\""_s, TimeZoneName::None);
     RETURN_IF_EXCEPTION(scope, void());
     switch (timeZoneName) {
@@ -798 +809 @@
     case TimeZoneName::Long:
         skeletonBuilder.append("zzzz");
+        break;
+    case TimeZoneName::ShortOffset:
+        skeletonBuilder.append('O');
+        break;
+    case TimeZoneName::LongOffset:
+        skeletonBuilder.append("OOOO");
+        break;
+    case TimeZoneName::ShortGeneric:
+        skeletonBuilder.append('v');
+        break;
+    case TimeZoneName::LongGeneric:
+        skeletonBuilder.append("vvvv");
         break;
     case TimeZoneName::None:
@@ -1101 +1124 @@
     case TimeZoneName::Long:
         return "long"_s;
+    case TimeZoneName::ShortOffset:
+        return "shortOffset"_s;
+    case TimeZoneName::LongOffset:
+        return "longOffset"_s;
+    case TimeZoneName::ShortGeneric:
+        return "shortGeneric"_s;
+    case TimeZoneName::LongGeneric:
+        return "longGeneric"_s;
     case TimeZoneName::None:
         ASSERT_NOT_REACHED();

trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h

@@ -103 +103 @@
     enum class Minute : uint8_t { None, TwoDigit, Numeric };
     enum class Second : uint8_t { None, TwoDigit, Numeric };
-    enum class TimeZoneName : uint8_t { None, Short, Long };
+    enum class TimeZoneName : uint8_t { None, Short, Long, ShortOffset, LongOffset, ShortGeneric, LongGeneric };
     enum class DateTimeStyle : uint8_t { None, Full, Long, Medium, Short };