Changeset 266323 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Aug 29, 2020, 1:32:45 AM (5 years ago)

Author:

[email protected]

Message:

[JSC] Implement Intl.DateTimeFormat dayPeriod
​https://bugs.webkit.org/show_bug.cgi?id=215839

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-datetimeformat-day-period.js: Added.

(shouldBe):
(throw.new.Error):

• test262/config.yaml:

Source/JavaScriptCore:

This patch implements Intl.DateTimeFormat dayPeriod option[1]. We can use "narrow", "short", or "long" for dayPeriod,
and it determines how "AM" etc. is represented.

[1]: ​https://github.com/tc39/ecma402/pull/346

• builtins/DatePrototype.js:

(toLocaleString.toDateTimeOptionsAnyAll):
(toLocaleString):
(toLocaleTimeString.toDateTimeOptionsTimeTime):
(toLocaleTimeString):

• bytecode/BytecodeIntrinsicRegistry.cpp:

(JSC::BytecodeIntrinsicRegistry::BytecodeIntrinsicRegistry):

• bytecode/BytecodeIntrinsicRegistry.h:
• runtime/CommonIdentifiers.h:
• runtime/IntlDateTimeFormat.cpp:

(JSC::toDateTimeOptionsAnyDate):
(JSC::IntlDateTimeFormat::setFormatsFromPattern):
(JSC::IntlDateTimeFormat::initializeDateTimeFormat):
(JSC::IntlDateTimeFormat::dayPeriodString):
(JSC::IntlDateTimeFormat::resolvedOptions const):

• runtime/IntlDateTimeFormat.h:
• runtime/OptionsList.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• builtins/DatePrototype.js (modified) (2 diffs)
• bytecode/BytecodeIntrinsicRegistry.cpp (modified) (1 diff)
• bytecode/BytecodeIntrinsicRegistry.h (modified) (1 diff)
• runtime/CommonIdentifiers.h (modified) (1 diff)
• runtime/IntlDateTimeFormat.cpp (modified) (7 diffs)
• runtime/IntlDateTimeFormat.h (modified) (3 diffs)
• runtime/OptionsList.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-08-28  Yusuke Suzuki  <[email protected]>
+
+        [JSC] Implement Intl.DateTimeFormat dayPeriod
+        https://bugs.webkit.org/show_bug.cgi?id=215839
+
+        Reviewed by Ross Kirsling.
+
+        This patch implements Intl.DateTimeFormat dayPeriod option[1]. We can use "narrow", "short", or "long" for dayPeriod,
+        and it determines how "AM" etc. is represented.
+
+        [1]: https://github.com/tc39/ecma402/pull/346
+
+        * builtins/DatePrototype.js:
+        (toLocaleString.toDateTimeOptionsAnyAll):
+        (toLocaleString):
+        (toLocaleTimeString.toDateTimeOptionsTimeTime):
+        (toLocaleTimeString):
+        * bytecode/BytecodeIntrinsicRegistry.cpp:
+        (JSC::BytecodeIntrinsicRegistry::BytecodeIntrinsicRegistry):
+        * bytecode/BytecodeIntrinsicRegistry.h:
+        * runtime/CommonIdentifiers.h:
+        * runtime/IntlDateTimeFormat.cpp:
+        (JSC::toDateTimeOptionsAnyDate):
+        (JSC::IntlDateTimeFormat::setFormatsFromPattern):
+        (JSC::IntlDateTimeFormat::initializeDateTimeFormat):
+        (JSC::IntlDateTimeFormat::dayPeriodString):
+        (JSC::IntlDateTimeFormat::resolvedOptions const):
+        * runtime/IntlDateTimeFormat.h:
+        * runtime/OptionsList.h:
+
 2020-08-28  Yusuke Suzuki  <[email protected]>
 

trunk/Source/JavaScriptCore/builtins/DatePrototype.js

@@ -47 +47 @@
             options.month === @undefined &&
             options.day === @undefined &&
+            (!@useIntlDateTimeFormatDayPeriod || options.dayPeriod === @undefined) &&
             options.hour === @undefined &&
             options.minute === @undefined &&
@@ -163 +164 @@
         // Check original instead of descendant to reduce lookups up the prototype chain.
         var needsDefaults = !options || (
+            (!@useIntlDateTimeFormatDayPeriod || options.dayPeriod === @undefined) &&
             options.hour === @undefined &&
             options.minute === @undefined &&

trunk/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp

@@ -112 +112 @@
     m_AsyncGeneratorSuspendReasonAwait.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGenerator::AsyncGeneratorSuspendReason::Await)));
     m_AsyncGeneratorSuspendReasonNone.set(m_vm, jsNumber(static_cast<int32_t>(JSAsyncGenerator::AsyncGeneratorSuspendReason::None)));
+    m_useIntlDateTimeFormatDayPeriod.set(m_vm, jsBoolean(Options::useIntlDateTimeFormatDayPeriod()));
 }
 

trunk/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.h

@@ -152 +152 @@
     macro(AsyncGeneratorSuspendReasonAwait) \
     macro(AsyncGeneratorSuspendReasonNone) \
+    macro(useIntlDateTimeFormatDayPeriod) \
 
 #define JSC_COMMON_BYTECODE_INTRINSIC_CONSTANTS_CUSTOM_EACH_NAME(macro) \

trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -96 +96 @@
     macro(dateStyle) \
     macro(day) \
+    macro(dayPeriod) \
     macro(defineProperty) \
     macro(deref) \

trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp

@@ -249 +249 @@
     // Always "any".
 
-    // a. For each of the property names "hour", "minute", "second", "fractionalSecondDigits":
+    // a. For each of the property names ""dayPeriod", hour", "minute", "second", "fractionalSecondDigits":
     // i. Let prop be the property name.
     // ii. Let value be Get(options, prop).
     // iii. ReturnIfAbrupt(value).
     // iv. If value is not undefined, then let needDefaults be false.
+    if (Options::useIntlDateTimeFormatDayPeriod()) {
+        JSValue dayPeriod = options->get(globalObject, vm.propertyNames->dayPeriod);
+        RETURN_IF_EXCEPTION(scope, nullptr);
+        if (!dayPeriod.isUndefined())
+            needDefaults = false;
+    }
+
     JSValue hour = options->get(globalObject, vm.propertyNames->hour);
     RETURN_IF_EXCEPTION(scope, nullptr);
@@ -379 +386 @@
                 m_day = Day::TwoDigit;
             break;
+        case 'a':
+        case 'b':
+        case 'B':
+            if (count <= 3)
+                m_dayPeriod = DayPeriod::Short;
+            else if (count == 4)
+                m_dayPeriod = DayPeriod::Long;
+            else if (count == 5)
+                m_dayPeriod = DayPeriod::Narrow;
+            break;
         case 'h':
         case 'H':
@@ -585 +602 @@
     }
 
+    DayPeriod dayPeriod = DayPeriod::None;
+    if (Options::useIntlDateTimeFormatDayPeriod()) {
+        dayPeriod = intlOption<DayPeriod>(globalObject, options, vm.propertyNames->dayPeriod, { { "narrow"_s, DayPeriod::Narrow }, { "short"_s, DayPeriod::Short }, { "long"_s, DayPeriod::Long } }, "dayPeriod must be \"narrow\", \"short\", or \"long\""_s, DayPeriod::None);
+        RETURN_IF_EXCEPTION(scope, void());
+    }
+
     Hour hour = intlOption<Hour>(globalObject, options, vm.propertyNames->hour, { { "2-digit"_s, Hour::TwoDigit }, { "numeric"_s, Hour::Numeric } }, "hour must be \"2-digit\" or \"numeric\""_s, Hour::None);
     RETURN_IF_EXCEPTION(scope, void());
@@ -608 +631 @@
     }
 
+    if (Options::useIntlDateTimeFormatDayPeriod()) {
+        // dayPeriod must be set after setting hour.
+        // https://unicode-org.atlassian.net/browse/ICU-20731
+        switch (dayPeriod) {
+        case DayPeriod::Narrow:
+            skeletonBuilder.appendLiteral("BBBBB");
+            break;
+        case DayPeriod::Short:
+            skeletonBuilder.append('B');
+            break;
+        case DayPeriod::Long:
+            skeletonBuilder.appendLiteral("BBBB");
+            break;
+        case DayPeriod::None:
+            break;
+        }
+    }
+
     Minute minute = intlOption<Minute>(globalObject, options, vm.propertyNames->minute, { { "2-digit"_s, Minute::TwoDigit }, { "numeric"_s, Minute::Numeric } }, "minute must be \"2-digit\" or \"numeric\""_s, Minute::None);
     RETURN_IF_EXCEPTION(scope, void());
@@ -669 +710 @@
         //     iii. If p is not undefined, then
         //         1. Throw a TypeError exception.
-        if (weekday != Weekday::None || era != Era::None || year != Year::None || month != Month::None || day != Day::None || hour != Hour::None || minute != Minute::None || second != Second::None || fractionalSecondDigits != 0 || timeZoneName != TimeZoneName::None) {
+        if (weekday != Weekday::None || era != Era::None || year != Year::None || month != Month::None || day != Day::None || dayPeriod != DayPeriod::None || hour != Hour::None || minute != Minute::None || second != Second::None || fractionalSecondDigits != 0 || timeZoneName != TimeZoneName::None) {
             throwTypeError(globalObject, scope, "dateStyle and timeStyle may not be used with other DateTimeFormat options"_s);
             return;
@@ -893 +934 @@
 }
 
+ASCIILiteral IntlDateTimeFormat::dayPeriodString(DayPeriod dayPeriod)
+{
+    switch (dayPeriod) {
+    case DayPeriod::Narrow:
+        return "narrow"_s;
+    case DayPeriod::Short:
+        return "short"_s;
+    case DayPeriod::Long:
+        return "long"_s;
+    case DayPeriod::None:
+        ASSERT_NOT_REACHED();
+        return ASCIILiteral::null();
+    }
+    ASSERT_NOT_REACHED();
+    return ASCIILiteral::null();
+}
+
 ASCIILiteral IntlDateTimeFormat::hourString(Hour hour)
 {
@@ -1002 +1060 @@
     if (m_day != Day::None)
         options->putDirect(vm, vm.propertyNames->day, jsNontrivialString(vm, dayString(m_day)));
+
+    if (Options::useIntlDateTimeFormatDayPeriod()) {
+        if (m_dayPeriod != DayPeriod::None)
+            options->putDirect(vm, vm.propertyNames->dayPeriod, jsNontrivialString(vm, dayPeriodString(m_dayPeriod)));
+    }
 
     if (m_hour != Hour::None)

trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h

@@ -82 +82 @@
     enum class Month : uint8_t { None, TwoDigit, Numeric, Narrow, Short, Long };
     enum class Day : uint8_t { None, TwoDigit, Numeric };
+    enum class DayPeriod : uint8_t { None, Narrow, Short, Long };
     enum class Hour : uint8_t { None, TwoDigit, Numeric };
     enum class Minute : uint8_t { None, TwoDigit, Numeric };
@@ -94 +95 @@
     static ASCIILiteral monthString(Month);
     static ASCIILiteral dayString(Day);
+    static ASCIILiteral dayPeriodString(DayPeriod);
     static ASCIILiteral hourString(Hour);
     static ASCIILiteral minuteString(Minute);
@@ -118 +120 @@
     Month m_month { Month::None };
     Day m_day { Day::None };
+    DayPeriod m_dayPeriod { DayPeriod::None };
     Hour m_hour { Hour::None };
     Minute m_minute { Minute::None };

trunk/Source/JavaScriptCore/runtime/OptionsList.h

@@ -491 +491 @@
     v(Bool, useWeakRefs, false, Normal, "Expose the WeakRef constructor.") \
     v(Bool, useBigInt, true, Normal, "If true, we will enable BigInt support.") \
+    v(Bool, useIntlDateTimeFormatDayPeriod, false, Normal, "Expose the Intl.DateTimeFormat dayPeriod feature.") \
     v(Bool, useArrayAllocationProfiling, true, Normal, "If true, we will use our normal array allocation profiling. If false, the allocation profile will always claim to be undecided.") \
     v(Bool, forcePolyProto, false, Normal, "If true, create_this will always create an object with a poly proto structure.") \