<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283009] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283009">283009</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-09-23 14:50:51 -0700 (Thu, 23 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Various tweaks in preparation for Temporal.Instant
https://bugs.webkit.org/show_bug.cgi?id=230331

Patch by Philip Chimento <pchimento@igalia.com> on 2021-09-23
Reviewed by Yusuke Suzuki.

* runtime/TemporalDuration.cpp:
(JSC::TemporalDuration::fromDurationLike): Use
  temporalUnitPropertyName().
(JSC::TemporalDuration::toISO8601Duration): Improve error message to
  include the invalid string.
(JSC::TemporalDuration::with const): Use temporalUnitPropertyName().
(JSC::TemporalDuration::toString): Use formatSecondsStringFraction().
* runtime/TemporalObject.cpp:
(JSC::ellipsizeAt): Add helper to ellipsize string at certain length.
(JSC::temporalUnitPropertyName): Move code from TemporalDuration into
  a function which will be reused in other Temporal types.
(JSC::temporalFractionalSecondDigits): Handle NaN as per
  specification, and improve error message to include the invalid
  value.
(JSC::formatSecondsStringFraction): Move code from TemporalDuration
  into a function which will be reused in other Temporal types.
* runtime/TemporalObject.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemporalDurationcpp">trunk/Source/JavaScriptCore/runtime/TemporalDuration.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemporalObjectcpp">trunk/Source/JavaScriptCore/runtime/TemporalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemporalObjecth">trunk/Source/JavaScriptCore/runtime/TemporalObject.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (283008 => 283009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-09-23 21:35:39 UTC (rev 283008)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-09-23 21:50:51 UTC (rev 283009)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-09-23  Philip Chimento  <pchimento@igalia.com>
+
+        Various tweaks in preparation for Temporal.Instant
+        https://bugs.webkit.org/show_bug.cgi?id=230331
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/TemporalDuration.cpp:
+        (JSC::TemporalDuration::fromDurationLike): Use
+          temporalUnitPropertyName().
+        (JSC::TemporalDuration::toISO8601Duration): Improve error message to
+          include the invalid string.
+        (JSC::TemporalDuration::with const): Use temporalUnitPropertyName().
+        (JSC::TemporalDuration::toString): Use formatSecondsStringFraction().
+        * runtime/TemporalObject.cpp:
+        (JSC::ellipsizeAt): Add helper to ellipsize string at certain length.
+        (JSC::temporalUnitPropertyName): Move code from TemporalDuration into
+          a function which will be reused in other Temporal types.
+        (JSC::temporalFractionalSecondDigits): Handle NaN as per
+          specification, and improve error message to include the invalid
+          value.
+        (JSC::formatSecondsStringFraction): Move code from TemporalDuration
+          into a function which will be reused in other Temporal types.
+        * runtime/TemporalObject.h:
+
</ins><span class="cx"> 2021-09-23  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Graphics: add instrumentation for new `CanvasRenderingContext2DSettings`
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemporalDurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemporalDuration.cpp (283008 => 283009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemporalDuration.cpp 2021-09-23 21:35:39 UTC (rev 283008)
+++ trunk/Source/JavaScriptCore/runtime/TemporalDuration.cpp    2021-09-23 21:50:51 UTC (rev 283009)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "IntlObjectInlines.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "TemporalObject.h"
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -34,18 +35,6 @@
</span><span class="cx"> 
</span><span class="cx"> static constexpr double nanosecondsPerDay = 24.0 * 60 * 60 * 1000 * 1000 * 1000;
</span><span class="cx"> 
</span><del>-static PropertyName propertyName(VM& vm, unsigned index)
-{
-    ASSERT(index < numberOfTemporalUnits);
-    switch (static_cast<TemporalUnit>(index)) {
-#define JSC_TEMPORAL_DURATION_PROPERTY_NAME(name, capitalizedName) case TemporalUnit::capitalizedName: return vm.propertyNames->name##s; 
-        JSC_TEMPORAL_UNITS(JSC_TEMPORAL_DURATION_PROPERTY_NAME)
-#undef JSC_TEMPORAL_DURATION_PROPERTY_NAME
-    }
-
-    RELEASE_ASSERT_NOT_REACHED();
-}
-
</del><span class="cx"> const ClassInfo TemporalDuration::s_info = { "Object", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(TemporalDuration) };
</span><span class="cx"> 
</span><span class="cx"> TemporalDuration* TemporalDuration::create(VM& vm, Structure* structure, ISO8601::Duration&& duration)
</span><span class="lines">@@ -100,7 +89,7 @@
</span><span class="cx">     ISO8601::Duration result;
</span><span class="cx">     auto hasRelevantProperty = false;
</span><span class="cx">     for (size_t i = 0; i < numberOfTemporalUnits; i++) {
</span><del>-        JSValue value = durationLike->get(globalObject, propertyName(vm, i));
</del><ins>+        JSValue value = durationLike->get(globalObject, temporalUnitPropertyName(vm, static_cast<TemporalUnit>(i)));
</ins><span class="cx">         RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> 
</span><span class="cx">         if (value.isUndefined()) {
</span><span class="lines">@@ -143,7 +132,8 @@
</span><span class="cx"> 
</span><span class="cx">         auto parsedDuration = ISO8601::parseDuration(string);
</span><span class="cx">         if (!parsedDuration) {
</span><del>-            throwRangeError(globalObject, scope, "Could not parse Duration string"_s);
</del><ins>+            // 3090: 308 digits * 10 fields + 10 designators
+            throwRangeError(globalObject, scope, makeString("'"_s, ellipsizeAt(3090, string), "' is not a valid Duration string"_s));
</ins><span class="cx">             return { };
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -241,7 +231,7 @@
</span><span class="cx">     ISO8601::Duration result;
</span><span class="cx">     auto hasRelevantProperty = false;
</span><span class="cx">     for (size_t i = 0; i < numberOfTemporalUnits; i++) {
</span><del>-        JSValue value = durationLike->get(globalObject, propertyName(vm, i));
</del><ins>+        JSValue value = durationLike->get(globalObject, temporalUnitPropertyName(vm, static_cast<TemporalUnit>(i)));
</ins><span class="cx">         RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> 
</span><span class="cx">         if (value.isUndefined()) {
</span><span class="lines">@@ -550,8 +540,7 @@
</span><span class="cx"> // https://tc39.es/proposal-temporal/#sec-temporal-temporaldurationtostring
</span><span class="cx"> String TemporalDuration::toString(const ISO8601::Duration& duration, std::tuple<Precision, unsigned> precision)
</span><span class="cx"> {
</span><del>-    auto [precisionType, precisionValue] = precision;
-    ASSERT(precisionType == Precision::Auto || precisionValue < 10);
</del><ins>+    ASSERT(std::get<0>(precision) == Precision::Auto || std::get<1>(precision) < 10);
</ins><span class="cx"> 
</span><span class="cx">     auto balancedMicroseconds = duration.microseconds() + std::trunc(duration.nanoseconds() / 1000);
</span><span class="cx">     auto balancedNanoseconds = std::fmod(duration.nanoseconds(), 1000);
</span><span class="lines">@@ -598,17 +587,7 @@
</span><span class="cx">         builder.append(formatInteger(balancedSeconds));
</span><span class="cx"> 
</span><span class="cx">         auto fraction = std::abs(balancedMilliseconds) * 1e6 + std::abs(balancedMicroseconds) * 1e3 + std::abs(balancedNanoseconds);
</span><del>-        if ((precisionType == Precision::Auto && fraction) || (precisionType == Precision::Fixed && precisionValue)) {
-            auto padded = makeString('.', pad('0', 9, fraction));
-            if (precisionType == Precision::Fixed)
-                builder.append(StringView(padded).left(padded.length() - (9 - precisionValue)));
-            else {
-                auto lengthWithoutTrailingZeroes = padded.length();
-                while (padded[lengthWithoutTrailingZeroes - 1] == '0')
-                    lengthWithoutTrailingZeroes--;
-                builder.append(StringView(padded).left(lengthWithoutTrailingZeroes));
-            }
-        }
</del><ins>+        formatSecondsStringFraction(builder, fraction, precision);
</ins><span class="cx"> 
</span><span class="cx">         builder.append('S');
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemporalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemporalObject.cpp (283008 => 283009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemporalObject.cpp   2021-09-23 21:35:39 UTC (rev 283008)
+++ trunk/Source/JavaScriptCore/runtime/TemporalObject.cpp      2021-09-23 21:50:51 UTC (rev 283009)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> #include "TemporalPlainTimePrototype.h"
</span><span class="cx"> #include "TemporalTimeZoneConstructor.h"
</span><span class="cx"> #include "TemporalTimeZonePrototype.h"
</span><ins>+#include <wtf/text/StringConcatenate.h>
+#include <wtf/unicode/CharacterNames.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="lines">@@ -125,6 +127,28 @@
</span><span class="cx">     return unit.endsWith("s") ? unit.left(unit.length() - 1) : unit;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// For use in error messages where a string value is potentially unbounded
+WTF::String ellipsizeAt(unsigned maxLength, const WTF::String& string)
+{
+    WTF::String copy { string };
+    if (string.length() > maxLength) {
+        copy.truncate(maxLength - 1);
+        copy.append(horizontalEllipsis);
+    }
+    return copy;
+}
+
+PropertyName temporalUnitPropertyName(VM& vm, TemporalUnit unit)
+{
+    switch (unit) {
+#define JSC_TEMPORAL_DURATION_PROPERTY_NAME(name, capitalizedName) case TemporalUnit::capitalizedName: return vm.propertyNames->name##s; 
+        JSC_TEMPORAL_UNITS(JSC_TEMPORAL_DURATION_PROPERTY_NAME)
+#undef JSC_TEMPORAL_DURATION_PROPERTY_NAME
+    }
+
+    RELEASE_ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> std::optional<TemporalUnit> temporalUnitType(StringView unit)
</span><span class="cx"> {
</span><span class="cx">     StringView singular = singularUnit(unit);
</span><span class="lines">@@ -228,8 +252,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (value.isNumber()) {
</span><span class="cx">         double doubleValue = value.asNumber();
</span><del>-        if (doubleValue < 0 || doubleValue > 9) {
-            throwRangeError(globalObject, scope, "fractionalSecondDigits is out of range"_s);
</del><ins>+        if (!(doubleValue >= 0 && doubleValue <= 9)) {
+            throwRangeError(globalObject, scope, makeString("fractionalSecondDigits must be 'auto' or 0 through 9, not "_s, doubleValue));
</ins><span class="cx">             return std::nullopt;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -240,7 +264,7 @@
</span><span class="cx">     RETURN_IF_EXCEPTION(scope, std::nullopt);
</span><span class="cx"> 
</span><span class="cx">     if (stringValue != "auto")
</span><del>-        throwRangeError(globalObject, scope, "fractionalSecondDigits is out of range"_s);
</del><ins>+        throwRangeError(globalObject, scope, makeString("fractionalSecondDigits must be 'auto' or 0 through 9, not "_s, ellipsizeAt(100, stringValue)));
</ins><span class="cx"> 
</span><span class="cx">     return std::nullopt;
</span><span class="cx"> }
</span><span class="lines">@@ -309,6 +333,22 @@
</span><span class="cx">         "roundingMode must be either \"ceil\", \"floor\", \"trunc\", or \"halfExpand\""_s, fallback);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void formatSecondsStringFraction(StringBuilder& builder, unsigned fraction, std::tuple<Precision, unsigned> precision)
+{
+    auto [precisionType, precisionValue] = precision;
+    if ((precisionType == Precision::Auto && fraction) || (precisionType == Precision::Fixed && precisionValue)) {
+        auto padded = makeString('.', pad('0', 9, fraction));
+        if (precisionType == Precision::Fixed)
+            builder.append(StringView(padded).left(padded.length() - (9 - precisionValue)));
+        else {
+            auto lengthWithoutTrailingZeroes = padded.length();
+            while (padded[lengthWithoutTrailingZeroes - 1] == '0')
+                lengthWithoutTrailingZeroes--;
+            builder.append(StringView(padded).left(lengthWithoutTrailingZeroes));
+        }
+    }
+}
+
</ins><span class="cx"> // MaximumTemporalDurationRoundingIncrement ( unit )
</span><span class="cx"> // https://tc39.es/proposal-temporal/#sec-temporal-maximumtemporaldurationroundingincrement
</span><span class="cx"> std::optional<double> maximumRoundingIncrement(TemporalUnit unit)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemporalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemporalObject.h (283008 => 283009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemporalObject.h     2021-09-23 21:35:39 UTC (rev 283008)
+++ trunk/Source/JavaScriptCore/runtime/TemporalObject.h        2021-09-23 21:50:51 UTC (rev 283009)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx">     unsigned increment;
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+WTF::String ellipsizeAt(unsigned maxLength, const WTF::String&);
+PropertyName temporalUnitPropertyName(VM&, TemporalUnit);
</ins><span class="cx"> std::optional<TemporalUnit> temporalUnitType(StringView);
</span><span class="cx"> std::optional<TemporalUnit> temporalLargestUnit(JSGlobalObject*, JSObject* options, std::initializer_list<TemporalUnit> disallowedUnits, TemporalUnit autoValue);
</span><span class="cx"> std::optional<TemporalUnit> temporalSmallestUnit(JSGlobalObject*, JSObject* options, std::initializer_list<TemporalUnit> disallowedUnits);
</span><span class="lines">@@ -99,6 +101,7 @@
</span><span class="cx"> std::optional<unsigned> temporalFractionalSecondDigits(JSGlobalObject*, JSObject* options);
</span><span class="cx"> PrecisionData secondsStringPrecision(JSGlobalObject*, JSObject* options);
</span><span class="cx"> RoundingMode temporalRoundingMode(JSGlobalObject*, JSObject*, RoundingMode);
</span><ins>+void formatSecondsStringFraction(StringBuilder&, unsigned fraction, std::tuple<Precision, unsigned>);
</ins><span class="cx"> std::optional<double> maximumRoundingIncrement(TemporalUnit);
</span><span class="cx"> double temporalRoundingIncrement(JSGlobalObject*, JSObject* options, std::optional<double> dividend, bool inclusive);
</span><span class="cx"> double roundNumberToIncrement(double, double increment, RoundingMode);
</span></span></pre>
</div>
</div>

</body>
</html>