From d795f9c6cfe9047c0fe1822fd8c2cffd0de193b3 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 16 Oct 2022 11:48:58 +0300 Subject: [PATCH] LibJS: Change dateAdd to a required parameter of MoveRelativeDate This is an editorial change in the Temporal spec. See: https://github.com/tc39/proposal-temporal/commit/45d9079 --- .../Libraries/LibJS/Runtime/Temporal/Duration.cpp | 12 ++++-------- Userland/Libraries/LibJS/Runtime/Temporal/Duration.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp index 5a28608e68..518f6351c2 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp @@ -1096,20 +1096,16 @@ ThrowCompletionOr add_duration(VM& vm, double years1, double mon return difference_zoned_date_time(vm, relative_to.nanoseconds(), *end_ns, time_zone, calendar, largest_unit, *Object::create(realm, nullptr)); } -// 7.5.23 MoveRelativeDate ( calendar, relativeTo, duration [ , dateAdd ] ), https://tc39.es/proposal-temporal/#sec-temporal-moverelativedate +// 7.5.23 MoveRelativeDate ( calendar, relativeTo, duration, dateAdd ), https://tc39.es/proposal-temporal/#sec-temporal-moverelativedate ThrowCompletionOr move_relative_date(VM& vm, Object& calendar, PlainDate& relative_to, Duration& duration, FunctionObject* date_add) { - // 1. If dateAdd is not present, set dateAdd to ? GetMethod(calendar, "dateAdd"). - if (!date_add) - date_add = TRY(Value(&calendar).get_method(vm, vm.names.dateAdd)); - - // 2. Let newDate be ? CalendarDateAdd(calendar, relativeTo, duration, undefined, dateAdd) + // 1. Let newDate be ? CalendarDateAdd(calendar, relativeTo, duration, undefined, dateAdd) auto* new_date = TRY(calendar_date_add(vm, calendar, &relative_to, duration, nullptr, date_add)); - // 3. Let days be DaysUntil(relativeTo, newDate). + // 2. Let days be DaysUntil(relativeTo, newDate). auto days = days_until(relative_to, *new_date); - // 4. Return the Record { [[RelativeTo]]: newDate, [[Days]]: days }. + // 3. Return the Record { [[RelativeTo]]: newDate, [[Days]]: days }. return MoveRelativeDateResult { .relative_to = make_handle(new_date), .days = days }; } diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h index 3da7b90de8..360bb8675c 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h @@ -153,7 +153,7 @@ ThrowCompletionOr balance_duration(VM&, double days, double ThrowCompletionOr unbalance_duration_relative(VM&, double years, double months, double weeks, double days, String const& largest_unit, Value relative_to); ThrowCompletionOr balance_duration_relative(VM&, double years, double months, double weeks, double days, String const& largest_unit, Value relative_to); ThrowCompletionOr add_duration(VM&, double years1, double months1, double weeks1, double days1, double hours1, double minutes1, double seconds1, double milliseconds1, double microseconds1, double nanoseconds1, double years2, double months2, double weeks2, double days2, double hours2, double minutes2, double seconds2, double milliseconds2, double microseconds2, double nanoseconds2, Value relative_to_value); -ThrowCompletionOr move_relative_date(VM&, Object& calendar, PlainDate& relative_to, Duration& duration, FunctionObject* date_add = nullptr); +ThrowCompletionOr move_relative_date(VM&, Object& calendar, PlainDate& relative_to, Duration& duration, FunctionObject* date_add); ThrowCompletionOr move_relative_zoned_date_time(VM&, ZonedDateTime&, double years, double months, double weeks, double days); ThrowCompletionOr round_duration(VM&, double years, double months, double weeks, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, double nanoseconds, u32 increment, StringView unit, StringView rounding_mode, Object* relative_to_object = nullptr); ThrowCompletionOr adjust_rounded_duration_days(VM&, double years, double months, double weeks, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, double nanoseconds, u32 increment, StringView unit, StringView rounding_mode, Object* relative_to_object);