AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[Temporal] Add round to PlainTime

Browse Source 
Spec Text:
https://tc39.es/proposal-temporal/#sec-temporal.plaintime.prototype.round

Bug: v8:11544
Change-Id: I564cec6fdc030e3d39a9798c047534228f670dc6
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3692428
Commit-Queue: Frank Tang <ftang@chromium.org>
Reviewed-by: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#81427}
This commit is contained in:
Frank Tang 2022-06-24 19:53:26 -07:00 committed by V8 LUCI CQ
parent 2f047e00ec
commit 9262713316
4 changed files with 141 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/builtins/builtins-temporal.cc
View File

@ -48,8 +48,6 @@ TO_BE_IMPLEMENTED(TemporalPlainDatePrototypeSince)
TO_BE_IMPLEMENTED(TemporalPlainTimePrototypeUntil)
/* Temporal #sec-temporal.plaintime.prototype.since */
TO_BE_IMPLEMENTED(TemporalPlainTimePrototypeSince)
/* Temporal #sec-temporal.plaintime.prototype.round */
TO_BE_IMPLEMENTED(TemporalPlainTimePrototypeRound)
/* Temporal.PlaneDateTime */
/* Temporal #sec-temporal.plaindatetime.prototype.until */
@ -353,6 +351,7 @@ TEMPORAL_PROTOTYPE_METHOD1(PlainTime, Equals, equals)
TEMPORAL_PROTOTYPE_METHOD1(PlainTime, Add, add)
TEMPORAL_PROTOTYPE_METHOD1(PlainTime, Subtract, subtract)
TEMPORAL_PROTOTYPE_METHOD0(PlainTime, GetISOFields, getISOFields)
TEMPORAL_PROTOTYPE_METHOD1(PlainTime, Round, round)
TEMPORAL_PROTOTYPE_METHOD1(PlainTime, ToPlainDateTime, toPlainDateTime)
TEMPORAL_PROTOTYPE_METHOD0(PlainTime, ToJSON, toJSON)
TEMPORAL_PROTOTYPE_METHOD2(PlainTime, ToLocaleString, toLocaleString)

146
src/objects/js-temporal-objects.cc
View File

@ -9441,7 +9441,7 @@ namespace {
DateTimeRecordCommon RoundTime(Isolate* isolate, const TimeRecordCommon& time,
double increment, Unit unit,
RoundingMode rounding_mode,
double day_length_ns);
double day_length_ns = 8.64e13);
// #sec-temporal-roundisodatetime
DateTimeRecordCommon RoundISODateTime(Isolate* isolate,
@ -10958,6 +10958,140 @@ MaybeHandle<Oddball> JSTemporalPlainTime::Equals(
return isolate->factory()->true_value();
}
namespace {
// #sec-temporal-maximumtemporaldurationroundingincrement
struct Maximum {
bool defined;
double value;
};
Maximum MaximumTemporalDurationRoundingIncrement(Unit unit) {
switch (unit) {
// 1. If unit is "year", "month", "week", or "day", then
case Unit::kYear:
case Unit::kMonth:
case Unit::kWeek:
case Unit::kDay:
// a. Return undefined.
return {false, 0};
// 2. If unit is "hour", then
case Unit::kHour:
// a. Return 24.
return {true, 24};
// 3. If unit is "minute" or "second", then
case Unit::kMinute:
case Unit::kSecond:
// a. Return 60.
return {true, 60};
// 4. Assert: unit is one of "millisecond", "microsecond", or "nanosecond".
case Unit::kMillisecond:
case Unit::kMicrosecond:
case Unit::kNanosecond:
// 5. Return 1000.
return {true, 1000};
default:
UNREACHABLE();
}
}
// #sec-temporal-totemporalroundingincrement
Maybe<double> ToTemporalRoundingIncrement(Isolate* isolate,
Handle<JSReceiver> normalized_options,
double dividend,
bool dividend_is_defined,
bool inclusive);
} // namespace
// #sec-temporal.plaintime.prototype.round
MaybeHandle<JSTemporalPlainTime> JSTemporalPlainTime::Round(
Isolate* isolate, Handle<JSTemporalPlainTime> temporal_time,
Handle<Object> round_to_obj) {
const char* method_name = "Temporal.PlainTime.prototype.round";
Factory* factory = isolate->factory();
// 1. Let temporalTime be the this value.
// 2. Perform ? RequireInternalSlot(temporalTime,
// [[InitializedTemporalTime]]).
// 3. If roundTo is undefined, then
if (round_to_obj->IsUndefined()) {
// a. Throw a TypeError exception.
THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALID_ARG_TYPE_ERROR(),
JSTemporalPlainTime);
}
Handle<JSReceiver> round_to;
// 4. If Type(roundTo) is String, then
if (round_to_obj->IsString()) {
// a. Let paramString be roundTo.
Handle<String> param_string = Handle<String>::cast(round_to_obj);
// b. Set roundTo to ! OrdinaryObjectCreate(null).
round_to = factory->NewJSObjectWithNullProto();
// c. Perform ! CreateDataPropertyOrThrow(roundTo, "_smallestUnit_",
// paramString).
CHECK(JSReceiver::CreateDataProperty(isolate, round_to,
factory->smallestUnit_string(),
param_string, Just(kThrowOnError))
.FromJust());
} else {
// 5. Set roundTo to ? GetOptionsObject(roundTo).
ASSIGN_RETURN_ON_EXCEPTION(
isolate, round_to, GetOptionsObject(isolate, round_to_obj, method_name),
JSTemporalPlainTime);
}
// 5. Let smallestUnit be ? ToSmallestTemporalUnit(roundTo, « "year", "month",
// "week", "day" », undefined).
Unit smallest_unit;
MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
isolate, smallest_unit,
ToSmallestTemporalUnit(
isolate, round_to,
std::set<Unit>({Unit::kYear, Unit::kMonth, Unit::kWeek, Unit::kDay}),
Unit::kNotPresent, method_name),
Handle<JSTemporalPlainTime>());
// 6. If smallestUnit is undefined, throw a RangeError exception.
if (smallest_unit == Unit::kNotPresent) {
THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALID_ARG_RANGE_ERROR(),
JSTemporalPlainTime);
}
// 7. Let roundingMode be ? ToTemporalRoundingMode(roundTo, "halfExpand").
RoundingMode rounding_mode;
MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
isolate, rounding_mode,
ToTemporalRoundingMode(isolate, round_to, RoundingMode::kHalfExpand,
method_name),
Handle<JSTemporalPlainTime>());
// 8. Let maximum be ! MaximumTemporalDurationRoundingIncrement(smallestUnit).
Maximum maximum = MaximumTemporalDurationRoundingIncrement(smallest_unit);
// 9. Let roundingIncrement be ? ToTemporalRoundingIncrement(roundTo,
// maximum, false).
double rounding_increment;
MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
isolate, rounding_increment,
ToTemporalRoundingIncrement(isolate, round_to, maximum.value,
maximum.defined, false),
Handle<JSTemporalPlainTime>());
// 12. Let result be ! RoundTime(temporalTime.[[ISOHour]],
// temporalTime.[[ISOMinute]], temporalTime.[[ISOSecond]],
// temporalTime.[[ISOMillisecond]], temporalTime.[[ISOMicrosecond]],
// temporalTime.[[ISONanosecond]], roundingIncrement, smallestUnit,
// roundingMode).
DateTimeRecordCommon result = RoundTime(
isolate,
{temporal_time->iso_hour(), temporal_time->iso_minute(),
temporal_time->iso_second(), temporal_time->iso_millisecond(),
temporal_time->iso_microsecond(), temporal_time->iso_nanosecond()},
rounding_increment, smallest_unit, rounding_mode);
// 13. Return ? CreateTemporalTime(result.[[Hour]], result.[[Minute]],
// result.[[Second]], result.[[Millisecond]], result.[[Microsecond]],
// result.[[Nanosecond]]).
return CreateTemporalTime(isolate, result.time);
}
// #sec-temporal.plaintime.prototype.with
MaybeHandle<JSTemporalPlainTime> JSTemporalPlainTime::With(
Isolate* isolate, Handle<JSTemporalPlainTime> temporal_time,
@ -11359,16 +11493,6 @@ DateTimeRecordCommon RoundTime(Isolate* isolate, const TimeRecordCommon& time,
}
}
DateTimeRecordCommon RoundTime(Isolate* isolate, const TimeRecordCommon& time,
double increment, Unit unit,
RoundingMode rounding_mode) {
TEMPORAL_ENTER_FUNC();
// 3-a. If dayLengthNs is not present, set it to 8.64 × 10^13.
return RoundTime(isolate, time, increment, unit, rounding_mode,
86400000000000LLU);
}
// GetOption wihle the types is << Number, String >> and values is empty.
// #sec-getoption
MaybeHandle<Object> GetOption_NumberOrString(Isolate* isolate,

5
src/objects/js-temporal-objects.h
View File

@ -596,6 +596,11 @@ class JSTemporalPlainTime
Isolate* isolate, Handle<JSTemporalPlainTime> plain_time,
Handle<Object> temporal_duration_like);
// #sec-temporal.plaintime.prototype.round
V8_WARN_UNUSED_RESULT static MaybeHandle<JSTemporalPlainTime> Round(
Isolate* isolate, Handle<JSTemporalPlainTime> plain_time,
Handle<Object> options);
// #sec-temporal.plaintime.prototype.getisofields
V8_WARN_UNUSED_RESULT static MaybeHandle<JSReceiver> GetISOFields(
Isolate* isolate, Handle<JSTemporalPlainTime> plain_time);

29
test/test262/test262.status
View File

@ -831,20 +831,6 @@
'built-ins/Temporal/PlainTime/prototype/add/argument-string-negative-fractional-units': [FAIL],
'built-ins/Temporal/PlainTime/prototype/add/balance-negative-time-units': [FAIL],
'built-ins/Temporal/PlainTime/prototype/equals/argument-zoneddatetime-balance-negative-time-units': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/branding': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-nan': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-non-integer': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-out-of-range': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-undefined': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-wrong-type': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-invalid-string': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-undefined': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-wrong-type': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/smallestunit-invalid-string': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/smallestunit-plurals-accepted': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/smallestunit-string-shorthand': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/smallestunit-wrong-type': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/subclassing-ignored': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-string-with-utc-designator': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-zoneddatetime-balance-negative-time-units': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-zoneddatetime-negative-epochnanoseconds': [FAIL],
@ -1306,19 +1292,6 @@
'built-ins/Temporal/PlainTime/prototype/equals/argument-string-no-implicit-midnight': [FAIL],
'built-ins/Temporal/PlainTime/prototype/equals/argument-string-time-designator-required-for-disambiguation': [FAIL],
'built-ins/Temporal/PlainTime/prototype/equals/argument-string-with-time-designator': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/rounding-cross-midnight': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-hours': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-invalid': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-microseconds': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-milliseconds': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-minutes': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-nanoseconds': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingincrement-seconds': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-ceil': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-floor': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-halfExpand': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundingmode-trunc': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/smallestunit-missing': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-cast': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-string-no-implicit-midnight': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/argument-string-time-designator-required-for-disambiguation': [FAIL],
@ -1512,8 +1485,6 @@
'built-ins/Temporal/PlainDateTime/prototype/until/roundingmode-trunc-is-default': [FAIL],
'built-ins/Temporal/PlainDateTime/prototype/until/round-relative-to-receiver': [FAIL],
'built-ins/Temporal/PlainDateTime/prototype/with/calendar-temporal-object-throws': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/options-wrong-type': [FAIL],
'built-ins/Temporal/PlainTime/prototype/round/roundto-invalid-string': [FAIL],
'built-ins/Temporal/PlainTime/prototype/since/options-wrong-type': [FAIL],
'built-ins/Temporal/PlainTime/prototype/until/options-wrong-type': [FAIL],
'built-ins/Temporal/PlainYearMonth/prototype/since/options-wrong-type': [FAIL],