tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporal: Do away with CalculateOffsetShift in Duration.compare

This commit is contained in:
Philip Chimento 2023-03-07 21:02:43 -08:00 committed by Ms2ger
parent 5972c16b07
commit e98bfb332e
2 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/built-ins/Temporal/Duration/compare/calendar-dateadd-called-with-options-undefined.js
View File

@ -17,6 +17,5 @@ const relativeTo = new Temporal.ZonedDateTime(0n, timeZone, calendar);
const duration1 = new Temporal.Duration(0, 0, 1); const duration1 = new Temporal.Duration(0, 0, 1);
const duration2 = new Temporal.Duration(0, 0, 1, 1); const duration2 = new Temporal.Duration(0, 0, 1, 1);
Temporal.Duration.compare(duration1, duration2, { relativeTo }); Temporal.Duration.compare(duration1, duration2, { relativeTo });
assert.sameValue(calendar.dateAddCallCount, 4); assert.sameValue(calendar.dateAddCallCount, 2);
// one call in CalculateOffsetShift for each duration argument, plus one in // one call for each duration argument to add it to relativeTo
// UnbalanceDurationRelative for each duration argument

63
test/built-ins/Temporal/Duration/compare/order-of-operations.js
View File

@ -266,31 +266,19 @@ const expectedOpsForZonedRelativeTo = expected.concat([
"call options.relativeTo.timeZone.getOffsetNanosecondsFor", "call options.relativeTo.timeZone.getOffsetNanosecondsFor",
]); ]);
const expectedOpsForCalculateOffsetShift = [ const expectedOpsForZonedCalendarCompare = [
// CalculateOffsetShift on first argument
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// ...in AddZonedDateTime
"get options.relativeTo.timeZone.getOffsetNanosecondsFor", "get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor", "call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// AddZonedDateTime on first argument
"get options.relativeTo.calendar.dateAdd", "get options.relativeTo.calendar.dateAdd",
"call options.relativeTo.calendar.dateAdd", "call options.relativeTo.calendar.dateAdd",
"get options.relativeTo.timeZone.getPossibleInstantsFor", "get options.relativeTo.timeZone.getPossibleInstantsFor",
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
// ...done with AddZonedDateTime // AddZonedDateTime on second argument
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// CalculateOffsetShift on second argument
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
"get options.relativeTo.calendar.dateAdd", "get options.relativeTo.calendar.dateAdd",
"call options.relativeTo.calendar.dateAdd", "call options.relativeTo.calendar.dateAdd",
"get options.relativeTo.timeZone.getPossibleInstantsFor", "get options.relativeTo.timeZone.getPossibleInstantsFor",
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
]; ];
const zonedRelativeTo = TemporalHelpers.propertyBagObserver(actual, { const zonedRelativeTo = TemporalHelpers.propertyBagObserver(actual, {
@ -317,7 +305,7 @@ Temporal.Duration.compare(
); );
assert.compareArray( assert.compareArray(
actual, actual,
expectedOpsForZonedRelativeTo.concat(expectedOpsForCalculateOffsetShift), expectedOpsForZonedRelativeTo.concat(expectedOpsForZonedCalendarCompare),
"order of operations with ZonedDateTime relativeTo and no calendar units except days" "order of operations with ZonedDateTime relativeTo and no calendar units except days"
); );
actual.splice(0); // clear actual.splice(0); // clear
@ -330,47 +318,20 @@ Temporal.Duration.compare(
); );
assert.compareArray( assert.compareArray(
actual, actual,
expectedOpsForZonedRelativeTo.concat([ expectedOpsForZonedRelativeTo,
// CalculateOffsetShift on first arg
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// AddZonedDateTime
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// CalculateOffsetShift on second arg
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// AddZonedDateTime
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
]),
"order of operations with ZonedDateTime relativeTo and only time units" "order of operations with ZonedDateTime relativeTo and only time units"
); );
actual.splice(0); // clear actual.splice(0); // clear
// code path through UnbalanceDurationRelative that balances higher units down // order of observable operations with zoned relativeTo and calendar units
// to days:
const expectedOpsForDayBalancing = expectedOpsForZonedRelativeTo.concat(
expectedOpsForCalculateOffsetShift,
[
// ToTemporalDate
"get options.relativeTo.timeZone.getOffsetNanosecondsFor",
"call options.relativeTo.timeZone.getOffsetNanosecondsFor",
// UnbalanceDurationRelative
"get options.relativeTo.calendar.dateAdd", // 11.a.ii
"call options.relativeTo.calendar.dateAdd", // 11.a.iii.1 MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 11.a.iv.1 MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 11.a.v.1 MoveRelativeDate
// UnbalanceDurationRelative again for the second argument:
"get options.relativeTo.calendar.dateAdd", // 11.a.ii
"call options.relativeTo.calendar.dateAdd", // 11.a.iii.1 MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 11.a.iv.1 MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 11.a.v.1 MoveRelativeDate
]
);
Temporal.Duration.compare( Temporal.Duration.compare(
createDurationPropertyBagObserver("one", 1, 1, 1), createDurationPropertyBagObserver("one", 1, 1, 1),
createDurationPropertyBagObserver("two", 1, 1, 1, 1), createDurationPropertyBagObserver("two", 1, 1, 1, 1),
createOptionsObserver(zonedRelativeTo) createOptionsObserver(zonedRelativeTo)
); );
assert.compareArray(actual, expectedOpsForDayBalancing, "order of operations with calendar units"); assert.compareArray(
actual,
expectedOpsForZonedRelativeTo.concat(expectedOpsForZonedCalendarCompare),
"order of operations with ZonedDateTime relativeTo and calendar units"
);
actual.splice(0); // clear