RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:57:45 +00:00
Code Issues Activity Actions

LibJS: Correct BalanceDurationRelative algorithm

Browse source 
This is a normative change in the Temporal spec.

See:
- cbf5863
- f47d57d
This commit is contained in:
Linus Groh 2022-08-03 22:34:07 +01:00
parent 12edbb51bc
commit 8ed28890e4
1 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp
View file

@ -794,8 +794,8 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// a. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneYear). // a. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneYear).
auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_year)); auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_year));
// b. Set relativeTo to moveResult.[[RelativeTo]]. // b. Let newRelativeTo be moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); auto* new_relative_to = move_result.relative_to.cell();
// c. Let oneYearDays be moveResult.[[Days]]. // c. Let oneYearDays be moveResult.[[Days]].
auto one_year_days = move_result.days; auto one_year_days = move_result.days;
@ -808,21 +808,24 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// ii. Set years to years + sign. // ii. Set years to years + sign.
years += sign; years += sign;
// iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneYear). // iii. Set relativeTo to newRelativeTo.
relative_to = new_relative_to;
// iv. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneYear).
move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_year)); move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_year));
// iv. Set relativeTo to moveResult.[[RelativeTo]]. // v. Set newRelativeTo to moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); new_relative_to = move_result.relative_to.cell();
// v. Set oneYearDays to moveResult.[[Days]]. // vi. Set oneYearDays to moveResult.[[Days]].
one_year_days = move_result.days; one_year_days = move_result.days;
} }
// e. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth). // e. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth).
move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month)); move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month));
// f. Set relativeTo to moveResult.[[RelativeTo]]. // f. Set newRelativeTo to moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); new_relative_to = move_result.relative_to.cell();
// g. Let oneMonthDays be moveResult.[[Days]]. // g. Let oneMonthDays be moveResult.[[Days]].
auto one_month_days = move_result.days; auto one_month_days = move_result.days;
@ -835,21 +838,24 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// ii. Set months to months + sign. // ii. Set months to months + sign.
months += sign; months += sign;
// iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth). // iii. Set relativeTo to newRelativeTo.
relative_to = new_relative_to;
// iv. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth).
move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month)); move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month));
// iv. Set relativeTo to moveResult.[[RelativeTo]]. // v. Set newRelativeTo to moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); new_relative_to = move_result.relative_to.cell();
// v. Set oneMonthDays to moveResult.[[Days]]. // vi. Set oneMonthDays to moveResult.[[Days]].
one_month_days = move_result.days; one_month_days = move_result.days;
} }
// i. Let dateAdd be ? GetMethod(calendar, "dateAdd"). // i. Let dateAdd be ? GetMethod(calendar, "dateAdd").
auto* date_add = TRY(Value(&calendar).get_method(global_object, vm.names.dateAdd)); auto* date_add = TRY(Value(&calendar).get_method(global_object, vm.names.dateAdd));
// j. Let newRelativeTo be ? CalendarDateAdd(calendar, relativeTo, oneYear, undefined, dateAdd). // j. Set newRelativeTo to ? CalendarDateAdd(calendar, relativeTo, oneYear, undefined, dateAdd).
auto* new_relative_to = TRY(calendar_date_add(global_object, calendar, relative_to, *one_year, nullptr, date_add)); new_relative_to = TRY(calendar_date_add(global_object, calendar, relative_to, *one_year, nullptr, date_add));
// k. Let dateUntil be ? GetMethod(calendar, "dateUntil"). // k. Let dateUntil be ? GetMethod(calendar, "dateUntil").
auto* date_until = TRY(Value(&calendar).get_method(global_object, vm.names.dateUntil)); auto* date_until = TRY(Value(&calendar).get_method(global_object, vm.names.dateUntil));
@ -898,8 +904,8 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// a. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneMonth). // a. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneMonth).
auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month)); auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month));
// b. Set relativeTo to moveResult.[[RelativeTo]]. // b. Let newRelativeTo be moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); auto* new_relative_to = move_result.relative_to.cell();
// c. Let oneMonthDays be moveResult.[[Days]]. // c. Let oneMonthDays be moveResult.[[Days]].
auto one_month_days = move_result.days; auto one_month_days = move_result.days;
@ -912,13 +918,16 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// ii. Set months to months + sign. // ii. Set months to months + sign.
months += sign; months += sign;
// iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth). // iii. Set relativeTo to newRelativeTo.
relative_to = new_relative_to;
// iv. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth).
move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month)); move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_month));
// iv. Set relativeTo to moveResult.[[RelativeTo]]. // v. Set newRelativeTo to moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); new_relative_to = move_result.relative_to.cell();
// v. Set oneMonthDays to moveResult.[[Days]]. // vi. Set oneMonthDays to moveResult.[[Days]].
one_month_days = move_result.days; one_month_days = move_result.days;
} }
} }
@ -930,8 +939,8 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// b. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneWeek). // b. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneWeek).
auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_week)); auto move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_week));
// c. Set relativeTo to moveResult.[[RelativeTo]]. // c. Let newRelativeTo be moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); auto* new_relative_to = move_result.relative_to.cell();
// d. Let oneWeekDays be moveResult.[[Days]]. // d. Let oneWeekDays be moveResult.[[Days]].
auto one_week_days = move_result.days; auto one_week_days = move_result.days;
@ -944,13 +953,16 @@ ThrowCompletionOr<DateDurationRecord> balance_duration_relative(GlobalObject& gl
// ii. Set weeks to weeks + sign. // ii. Set weeks to weeks + sign.
weeks += sign; weeks += sign;
// iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneWeek). // iii. Set relativeTo to newRelativeTo.
relative_to = new_relative_to;
// iv. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneWeek).
move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_week)); move_result = TRY(move_relative_date(global_object, calendar, *relative_to, *one_week));
// iv. Set relativeTo to moveResult.[[RelativeTo]]. // v. Set newRelativeTo to moveResult.[[RelativeTo]].
relative_to = move_result.relative_to.cell(); new_relative_to = move_result.relative_to.cell();
// v. Set oneWeekDays to moveResult.[[Days]]. // vi. Set oneWeekDays to moveResult.[[Days]].
one_week_days = move_result.days; one_week_days = move_result.days;
} }
} }