Commit 74aa5e7d authored by Frank Tang's avatar Frank Tang Committed by V8 LUCI CQ

[Temporal] Add Temporal.Duration.prototype.toJSON

Also add AO: TemporalDurationToString

Spec Text:
https://tc39.es/proposal-temporal/#sec-temporal.duration.prototype.tojson
https://tc39.es/proposal-temporal/#sec-temporal-temporaldurationtostring

Bug: v8:11544
Change-Id: I7dfdb5458b88646a4ac7b7713e7c8e63352f7539
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3438375
Commit-Queue: Frank Tang <ftang@chromium.org>
Reviewed-by: 's avatarAdam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#80677}
parent caccea8d
...@@ -208,8 +208,6 @@ TO_BE_IMPLEMENTED(TemporalDurationPrototypeTotal) ...@@ -208,8 +208,6 @@ TO_BE_IMPLEMENTED(TemporalDurationPrototypeTotal)
TO_BE_IMPLEMENTED(TemporalDurationPrototypeToLocaleString) TO_BE_IMPLEMENTED(TemporalDurationPrototypeToLocaleString)
/* Temporal #sec-temporal.duration.prototype.tostring */ /* Temporal #sec-temporal.duration.prototype.tostring */
TO_BE_IMPLEMENTED(TemporalDurationPrototypeToString) TO_BE_IMPLEMENTED(TemporalDurationPrototypeToString)
/* Temporal #sec-temporal.duration.tojson */
TO_BE_IMPLEMENTED(TemporalDurationPrototypeToJSON)
/* Temporal.Instant */ /* Temporal.Instant */
/* Temporal #sec-temporal.instant.compare */ /* Temporal #sec-temporal.instant.compare */
...@@ -697,6 +695,7 @@ TEMPORAL_PROTOTYPE_METHOD0(Duration, Blank, blank) ...@@ -697,6 +695,7 @@ TEMPORAL_PROTOTYPE_METHOD0(Duration, Blank, blank)
TEMPORAL_PROTOTYPE_METHOD0(Duration, Negated, negated) TEMPORAL_PROTOTYPE_METHOD0(Duration, Negated, negated)
TEMPORAL_PROTOTYPE_METHOD0(Duration, Abs, abs) TEMPORAL_PROTOTYPE_METHOD0(Duration, Abs, abs)
TEMPORAL_VALUE_OF(Duration) TEMPORAL_VALUE_OF(Duration)
TEMPORAL_PROTOTYPE_METHOD0(Duration, ToJSON, toJSON)
// Instant // Instant
TEMPORAL_CONSTRUCTOR1(Instant) TEMPORAL_CONSTRUCTOR1(Instant)
......
...@@ -166,6 +166,8 @@ enum class ShowOverflow { kConstrain, kReject }; ...@@ -166,6 +166,8 @@ enum class ShowOverflow { kConstrain, kReject };
// #sec-temporal-toshowcalendaroption // #sec-temporal-toshowcalendaroption
enum class ShowCalendar { kAuto, kAlways, kNever }; enum class ShowCalendar { kAuto, kAlways, kNever };
enum class Precision { k0, k1, k2, k3, k4, k5, k6, k7, k8, k9, kAuto, kMinute };
// ISO8601 String Parsing // ISO8601 String Parsing
// #sec-temporal-parsetemporalcalendarstring // #sec-temporal-parsetemporalcalendarstring
...@@ -1190,6 +1192,172 @@ DateTimeRecordCommon BalanceISODateTime(Isolate* isolate, ...@@ -1190,6 +1192,172 @@ DateTimeRecordCommon BalanceISODateTime(Isolate* isolate,
return {balanced_date, balanced_time.time}; return {balanced_date, balanced_time.time};
} }
// #sec-temporal-temporaldurationtostring
Handle<String> TemporalDurationToString(Isolate* isolate,
Handle<JSTemporalDuration> duration,
Precision precision) {
IncrementalStringBuilder builder(isolate);
DurationRecord dur = {
duration->years().Number(),
duration->months().Number(),
duration->weeks().Number(),
{duration->days().Number(), duration->hours().Number(),
duration->minutes().Number(), duration->seconds().Number(),
duration->milliseconds().Number(), duration->microseconds().Number(),
duration->nanoseconds().Number()}};
// 1. Assert: precision is not "minute".
DCHECK(precision != Precision::kMinute);
// 2. Set seconds to the mathematical value of seconds.
// 3. Set milliseconds to the mathematical value of milliseconds.
// 4. Set microseconds to the mathematical value of microseconds.
// 5. Set nanoseconds to the mathematical value of nanoseconds.
// 6. Let sign be ! DurationSign(years, months, weeks, days, hours, minutes,
// seconds, milliseconds, microseconds, nanoseconds).
int32_t sign = DurationSign(isolate, dur);
// 7. Set microseconds to microseconds + the integral part of nanoseconds /
// 1000.
dur.time_duration.microseconds +=
static_cast<int>(dur.time_duration.nanoseconds / 1000);
// 8. Set nanoseconds to remainder(nanoseconds, 1000).
dur.time_duration.nanoseconds =
std::remainder(dur.time_duration.nanoseconds, 1000);
// 9. Set milliseconds to milliseconds + the integral part of microseconds /
// 1000.
dur.time_duration.milliseconds +=
static_cast<int>(dur.time_duration.microseconds / 1000);
// 10. Set microseconds to microseconds modulo 1000.
dur.time_duration.microseconds =
std::remainder(dur.time_duration.microseconds, 1000);
// 11. Set seconds to seconds + the integral part of milliseconds / 1000.
dur.time_duration.seconds +=
static_cast<int>(dur.time_duration.milliseconds / 1000);
// 12. Set milliseconds to milliseconds modulo 1000.
dur.time_duration.milliseconds =
std::remainder(dur.time_duration.milliseconds, 1000);
if (sign < 0) {
builder.AppendCharacter('-');
}
builder.AppendCharacter('P');
// 13. Let datePart be "".
// 14. If years is not 0, then
// a. Set datePart to the string concatenation of abs(years) formatted as a
// decimal number and the code unit 0x0059 (LATIN CAPITAL LETTER Y).
if (dur.years != 0) {
builder.AppendInt(static_cast<int32_t>(std::abs(dur.years)));
builder.AppendCharacter('Y');
}
// 15. If months is not 0, then
// a. Set datePart to the string concatenation of datePart,
// abs(months) formatted as a decimal number, and the code unit
// 0x004D (LATIN CAPITAL LETTER M).
if (dur.months != 0) {
builder.AppendInt(static_cast<int32_t>(std::abs(dur.months)));
builder.AppendCharacter('M');
}
// 16. If weeks is not 0, then
// a. Set datePart to the string concatenation of datePart,
// abs(weeks) formatted as a decimal number, and the code unit
// 0x0057 (LATIN CAPITAL LETTER W).
if (dur.weeks != 0) {
builder.AppendInt(static_cast<int32_t>(std::abs(dur.weeks)));
builder.AppendCharacter('W');
}
// 17. If days is not 0, then
// a. Set datePart to the string concatenation of datePart,
// abs(days) formatted as a decimal number, and the code unit 0x0044
// (LATIN CAPITAL LETTER D).
if (dur.time_duration.days != 0) {
builder.AppendInt(static_cast<int32_t>(std::abs(dur.time_duration.days)));
builder.AppendCharacter('D');
}
// 18. Let timePart be "".
IncrementalStringBuilder time_part(isolate);
// 19. If hours is not 0, then
// a. Set timePart to the string concatenation of abs(hours) formatted as a
// decimal number and the code unit 0x0048 (LATIN CAPITAL LETTER H).
if (dur.time_duration.hours != 0) {
time_part.AppendInt(
static_cast<int32_t>(std::abs(dur.time_duration.hours)));
time_part.AppendCharacter('H');
}
// 20. If minutes is not 0, then
// a. Set timePart to the string concatenation of timePart,
// abs(minutes) formatted as a decimal number, and the code unit
// 0x004D (LATIN CAPITAL LETTER M).
if (dur.time_duration.minutes != 0) {
time_part.AppendInt(
static_cast<int32_t>(std::abs(dur.time_duration.minutes)));
time_part.AppendCharacter('M');
}
// 21. If any of seconds, milliseconds, microseconds, and nanoseconds are not
// 0; or years, months, weeks, days, hours, and minutes are all 0, then
if ((dur.time_duration.seconds != 0 || dur.time_duration.milliseconds != 0 ||
dur.time_duration.microseconds != 0 ||
dur.time_duration.nanoseconds != 0) ||
(dur.years == 0 && dur.months == 0 && dur.weeks == 0 &&
dur.time_duration.days == 0 && dur.time_duration.hours == 0 &&
dur.time_duration.minutes == 0)) {
// a. Let fraction be abs(milliseconds) × 10^6 + abs(microseconds) × 10^3 +
// abs(nanoseconds).
int64_t fraction = std::abs(dur.time_duration.milliseconds) * 1000000 +
std::abs(dur.time_duration.microseconds) * 1000 +
std::abs(dur.time_duration.nanoseconds);
// b. Let decimalPart be fraction formatted as a nine-digit decimal number,
// padded to the left with zeroes if necessary.
// e. Let secondsPart be abs(seconds) formatted as a decimal number.
{
int32_t seconds = std::abs(dur.time_duration.seconds);
time_part.AppendInt(seconds);
}
// 7. If precision is "auto", then
int64_t divisor = 100000000;
bool output_period = true;
if (precision == Precision::kAuto) {
// a. Set fraction to the
// longest possible substring of fraction starting at position 0 and not
// ending with the code unit 0x0030 (DIGIT ZERO).
while (fraction > 0) {
if (output_period) {
time_part.AppendCharacter('.');
output_period = false;
}
time_part.AppendInt(static_cast<int32_t>(fraction / divisor));
fraction %= divisor;
divisor /= 10;
}
} else {
// c. Set fraction to the substring of fraction from 0 to precision.
int32_t precision_len = static_cast<int32_t>(precision);
DCHECK_LE(0, precision_len);
DCHECK_GE(9, precision_len);
for (int32_t len = 0; len < precision_len;
len++, divisor /= 10, fraction %= divisor) {
if (output_period) {
time_part.AppendCharacter('.');
output_period = false;
}
time_part.AppendInt(static_cast<int32_t>(fraction / divisor));
}
}
// g. Set timePart to the string concatenation of timePart, secondsPart, and
// the code unit 0x0053 (LATIN CAPITAL LETTER S).
time_part.AppendCharacter('S');
}
// 22. Let signPart be the code unit 0x002D (HYPHEN-MINUS) if sign < 0, and
// otherwise the empty String.
// 23. Let result be the string concatenation of signPart, the code unit
// 0x0050 (LATIN CAPITAL LETTER P) and datePart.
// 24. If timePart is not "", then
if (time_part.Length() > 0) {
// a. Set result to the string concatenation of result, the code unit 0x0054
// (LATIN CAPITAL LETTER T), and timePart.
builder.AppendCharacter('T');
builder.AppendString(time_part.Finish().ToHandleChecked());
}
return builder.Finish().ToHandleChecked();
}
} // namespace } // namespace
namespace temporal { namespace temporal {
...@@ -5597,6 +5765,7 @@ MaybeHandle<Oddball> JSTemporalDuration::Blank( ...@@ -5597,6 +5765,7 @@ MaybeHandle<Oddball> JSTemporalDuration::Blank(
} }
namespace { namespace {
// #sec-temporal-createnegatedtemporalduration // #sec-temporal-createnegatedtemporalduration
MaybeHandle<JSTemporalDuration> CreateNegatedTemporalDuration( MaybeHandle<JSTemporalDuration> CreateNegatedTemporalDuration(
Isolate* isolate, Handle<JSTemporalDuration> duration) { Isolate* isolate, Handle<JSTemporalDuration> duration) {
...@@ -5608,7 +5777,6 @@ MaybeHandle<JSTemporalDuration> CreateNegatedTemporalDuration( ...@@ -5608,7 +5777,6 @@ MaybeHandle<JSTemporalDuration> CreateNegatedTemporalDuration(
// −duration.[[Hours]], −duration.[[Minutes]], −duration.[[Seconds]], // −duration.[[Hours]], −duration.[[Minutes]], −duration.[[Seconds]],
// −duration.[[Milliseconds]], −duration.[[Microseconds]], // −duration.[[Milliseconds]], −duration.[[Microseconds]],
// −duration.[[Nanoseconds]]). // −duration.[[Nanoseconds]]).
return CreateTemporalDuration( return CreateTemporalDuration(
isolate, isolate,
{-duration->years().Number(), {-duration->years().Number(),
...@@ -5657,6 +5825,21 @@ MaybeHandle<JSTemporalDuration> JSTemporalDuration::Abs( ...@@ -5657,6 +5825,21 @@ MaybeHandle<JSTemporalDuration> JSTemporalDuration::Abs(
std::abs(duration->nanoseconds().Number())}}); std::abs(duration->nanoseconds().Number())}});
} }
// #sec-temporal.duration.prototype.tojson
MaybeHandle<String> JSTemporalDuration::ToJSON(
Isolate* isolate, Handle<JSTemporalDuration> duration) {
// 1. Let duration be the this value.
// 2. Perform ? RequireInternalSlot(duration,
// [[InitializedTemporalDuration]]).
// 3. Return ! TemporalDurationToString(duration.[[Years]],
// duration.[[Months]], duration.[[Weeks]], duration.[[Days]],
// duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]],
// duration.[[Milliseconds]], duration.[[Microseconds]],
// duration.[[Nanoseconds]], "auto").
return TemporalDurationToString(isolate, duration, Precision::kAuto);
}
// #sec-temporal.calendar // #sec-temporal.calendar
MaybeHandle<JSTemporalCalendar> JSTemporalCalendar::Constructor( MaybeHandle<JSTemporalCalendar> JSTemporalCalendar::Constructor(
Isolate* isolate, Handle<JSFunction> target, Handle<HeapObject> new_target, Isolate* isolate, Handle<JSFunction> target, Handle<HeapObject> new_target,
......
...@@ -193,6 +193,10 @@ class JSTemporalDuration ...@@ -193,6 +193,10 @@ class JSTemporalDuration
V8_WARN_UNUSED_RESULT static MaybeHandle<JSTemporalDuration> Abs( V8_WARN_UNUSED_RESULT static MaybeHandle<JSTemporalDuration> Abs(
Isolate* isolate, Handle<JSTemporalDuration> duration); Isolate* isolate, Handle<JSTemporalDuration> duration);
// #sec-temporal.duration.prototype.tojson
V8_WARN_UNUSED_RESULT static MaybeHandle<String> ToJSON(
Isolate* isolate, Handle<JSTemporalDuration> duration);
DECL_PRINTER(JSTemporalDuration) DECL_PRINTER(JSTemporalDuration)
TQ_OBJECT_CONSTRUCTORS(JSTemporalDuration) TQ_OBJECT_CONSTRUCTORS(JSTemporalDuration)
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
############################################################################## ##############################################################################
# Temporal tests to be implemented # Temporal tests to be implemented
# https://crbug.com/v8/11544 # https://crbug.com/v8/11544
'temporal/calendar-date-until': [FAIL],
'temporal/calendar-week-of-year': [FAIL], 'temporal/calendar-week-of-year': [FAIL],
'temporal/duration-add': [FAIL], 'temporal/duration-add': [FAIL],
'temporal/duration-to-json': [FAIL], 'temporal/duration-to-json': [FAIL],
......
...@@ -515,8 +515,6 @@ ...@@ -515,8 +515,6 @@
'built-ins/Temporal/Duration/prototype/subtract/relativeto-zoneddatetime-timezone-getoffsetnanosecondsfor-out-of-range': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/relativeto-zoneddatetime-timezone-getoffsetnanosecondsfor-out-of-range': [FAIL],
'built-ins/Temporal/Duration/prototype/subtract/relativeto-zoneddatetime-timezone-getoffsetnanosecondsfor-wrong-type': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/relativeto-zoneddatetime-timezone-getoffsetnanosecondsfor-wrong-type': [FAIL],
'built-ins/Temporal/Duration/prototype/subtract/subclassing-ignored': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/subclassing-ignored': [FAIL],
'built-ins/Temporal/Duration/prototype/toJSON/branding': [FAIL],
'built-ins/Temporal/Duration/prototype/toJSON/negative-components': [FAIL],
'built-ins/Temporal/Duration/prototype/toLocaleString/branding': [FAIL], 'built-ins/Temporal/Duration/prototype/toLocaleString/branding': [FAIL],
'built-ins/Temporal/Duration/prototype/toString/blank-duration-precision': [FAIL], 'built-ins/Temporal/Duration/prototype/toString/blank-duration-precision': [FAIL],
'built-ins/Temporal/Duration/prototype/toString/branding': [FAIL], 'built-ins/Temporal/Duration/prototype/toString/branding': [FAIL],
...@@ -2494,7 +2492,6 @@ ...@@ -2494,7 +2492,6 @@
'built-ins/Temporal/Duration/prototype/subtract/relativeto-propertybag-calendar-wrong-type': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/relativeto-propertybag-calendar-wrong-type': [FAIL],
'built-ins/Temporal/Duration/prototype/subtract/relativeto-wrong-type': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/relativeto-wrong-type': [FAIL],
'built-ins/Temporal/Duration/prototype/subtract/timezone-wrong-type': [FAIL], 'built-ins/Temporal/Duration/prototype/subtract/timezone-wrong-type': [FAIL],
'built-ins/Temporal/Duration/prototype/toJSON/options': [FAIL],
'built-ins/Temporal/Duration/prototype/total/relativeto-number': [FAIL], 'built-ins/Temporal/Duration/prototype/total/relativeto-number': [FAIL],
'built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-number': [FAIL], 'built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-number': [FAIL],
'built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-wrong-type': [FAIL], 'built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-wrong-type': [FAIL],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment