From e087cd574e44ef04d5b9edc1591c1fa85ebf0a09 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 4 Feb 2022 19:29:15 +0000 Subject: [PATCH] LibJS: Rename variables to 'calendarLike' in a couple of places This is an editorial change in the Temporal spec. See: https://github.com/tc39/proposal-temporal/commit/9af2d35 --- .../LibJS/Runtime/Temporal/Calendar.cpp | 8 +++---- .../Runtime/Temporal/CalendarConstructor.cpp | 8 +++---- .../Libraries/LibJS/Runtime/Temporal/Now.cpp | 24 +++++++++---------- .../Runtime/Temporal/PlainDatePrototype.cpp | 8 ++++--- .../Temporal/PlainDateTimePrototype.cpp | 8 ++++--- .../LibJS/Runtime/Temporal/PlainMonthDay.cpp | 12 +++++----- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp index 7f2b397533..71bfdfcb06 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp @@ -449,11 +449,11 @@ ThrowCompletionOr get_temporal_calendar_with_iso_default(GlobalObject& if (is(item)) return &static_cast(item).calendar(); - // 2. Let calendar be ? Get(item, "calendar"). - auto calendar = TRY(item.get(vm.names.calendar)); + // 2. Let calendarLike be ? Get(item, "calendar"). + auto calendar_like = TRY(item.get(vm.names.calendar)); - // 3. Return ? ToTemporalCalendarWithISODefault(calendar). - return to_temporal_calendar_with_iso_default(global_object, calendar); + // 3. Return ? ToTemporalCalendarWithISODefault(calendarLike). + return to_temporal_calendar_with_iso_default(global_object, calendar_like); } // 12.1.24 DateFromFields ( calendar, fields, options ), https://tc39.es/proposal-temporal/#sec-temporal-datefromfields diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/CalendarConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/CalendarConstructor.cpp index 8aa0be0818..df2b445743 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/CalendarConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/CalendarConstructor.cpp @@ -60,13 +60,13 @@ ThrowCompletionOr CalendarConstructor::construct(FunctionObject& new_ta return TRY(create_temporal_calendar(global_object, identifier, &new_target)); } -// 12.3.2 Temporal.Calendar.from ( item ), https://tc39.es/proposal-temporal/#sec-temporal.calendar.from +// 12.3.2 Temporal.Calendar.from ( calendarLike ), https://tc39.es/proposal-temporal/#sec-temporal.calendar.from JS_DEFINE_NATIVE_FUNCTION(CalendarConstructor::from) { - auto item = vm.argument(0); + auto calendar_like = vm.argument(0); - // 1. Return ? ToTemporalCalendar(item). - return TRY(to_temporal_calendar(global_object, item)); + // 1. Return ? ToTemporalCalendar(calendarLike). + return TRY(to_temporal_calendar(global_object, calendar_like)); } } diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Now.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Now.cpp index 971a666200..a37c39383b 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Now.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Now.cpp @@ -60,14 +60,14 @@ JS_DEFINE_NATIVE_FUNCTION(Now::instant) return system_instant(global_object); } -// 2.2.3 Temporal.Now.plainDateTime ( calendar [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindatetime +// 2.2.3 Temporal.Now.plainDateTime ( calendarLike [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindatetime JS_DEFINE_NATIVE_FUNCTION(Now::plain_date_time) { - auto calendar = vm.argument(0); + auto calendar_like = vm.argument(0); auto temporal_time_zone_like = vm.argument(1); - // 1. Return ? SystemDateTime(temporalTimeZoneLike, calendar). - return TRY(system_date_time(global_object, temporal_time_zone_like, calendar)); + // 1. Return ? SystemDateTime(temporalTimeZoneLike, calendarLike). + return TRY(system_date_time(global_object, temporal_time_zone_like, calendar_like)); } // 2.2.4 Temporal.Now.plainDateTimeISO ( [ temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindatetimeiso @@ -82,14 +82,14 @@ JS_DEFINE_NATIVE_FUNCTION(Now::plain_date_time_iso) return TRY(system_date_time(global_object, temporal_time_zone_like, calendar)); } -// 2.2.5 Temporal.Now.zonedDateTime ( calendar [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.zoneddatetime +// 2.2.5 Temporal.Now.zonedDateTime ( calendarLike [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.zoneddatetime JS_DEFINE_NATIVE_FUNCTION(Now::zoned_date_time) { - auto calendar = vm.argument(0); + auto calendar_like = vm.argument(0); auto temporal_time_zone_like = vm.argument(1); - // 1. Return ? SystemZonedDateTime(temporalTimeZoneLike, calendar). - return TRY(system_zoned_date_time(global_object, temporal_time_zone_like, calendar)); + // 1. Return ? SystemZonedDateTime(temporalTimeZoneLike, calendarLike). + return TRY(system_zoned_date_time(global_object, temporal_time_zone_like, calendar_like)); } // 2.2.6 Temporal.Now.zonedDateTimeISO ( [ temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.zoneddatetimeiso @@ -104,14 +104,14 @@ JS_DEFINE_NATIVE_FUNCTION(Now::zoned_date_time_iso) return TRY(system_zoned_date_time(global_object, temporal_time_zone_like, calendar)); } -// 2.2.7 Temporal.Now.plainDate ( calendar [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindate +// 2.2.7 Temporal.Now.plainDate ( calendarLike [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindate JS_DEFINE_NATIVE_FUNCTION(Now::plain_date) { - auto calendar = vm.argument(0); + auto calendar_like = vm.argument(0); auto temporal_time_zone_like = vm.argument(1); - // 1. Let dateTime be ? SystemDateTime(temporalTimeZoneLike, calendar). - auto* date_time = TRY(system_date_time(global_object, temporal_time_zone_like, calendar)); + // 1. Let dateTime be ? SystemDateTime(temporalTimeZoneLike, calendarLike). + auto* date_time = TRY(system_date_time(global_object, temporal_time_zone_like, calendar_like)); // 2. Return ! CreateTemporalDate(dateTime.[[ISOYear]], dateTime.[[ISOMonth]], dateTime.[[ISODay]], dateTime.[[Calendar]]). return TRY(create_temporal_date(global_object, date_time->iso_year(), date_time->iso_month(), date_time->iso_day(), date_time->calendar())); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp index 55102caceb..d8bc8a7df3 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp @@ -424,15 +424,17 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::with) return TRY(date_from_fields(global_object, calendar, *fields, *options)); } -// 3.3.22 Temporal.PlainDate.prototype.withCalendar ( calendar ), https://tc39.es/proposal-temporal/#sec-temporal.plaindate.prototype.withcalendar +// 3.3.22 Temporal.PlainDate.prototype.withCalendar ( calendarLike ), https://tc39.es/proposal-temporal/#sec-temporal.plaindate.prototype.withcalendar JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::with_calendar) { + auto calendar_like = vm.argument(0); + // 1. Let temporalDate be the this value. // 2. Perform ? RequireInternalSlot(temporalDate, [[InitializedTemporalDate]]). auto* temporal_date = TRY(typed_this_object(global_object)); - // 3. Let calendar be ? ToTemporalCalendar(calendar). - auto* calendar = TRY(to_temporal_calendar(global_object, vm.argument(0))); + // 3. Let calendar be ? ToTemporalCalendar(calendarLike). + auto* calendar = TRY(to_temporal_calendar(global_object, calendar_like)); // 4. Return ? CreateTemporalDate(temporalDate.[[ISOYear]], temporalDate.[[ISOMonth]], temporalDate.[[ISODay]], calendar). return TRY(create_temporal_date(global_object, temporal_date->iso_year(), temporal_date->iso_month(), temporal_date->iso_day(), *calendar)); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp index 834029816e..ef8d4fc2d2 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp @@ -442,15 +442,17 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDateTimePrototype::with_plain_date) return TRY(create_temporal_date_time(global_object, plain_date->iso_year(), plain_date->iso_month(), plain_date->iso_day(), date_time->iso_hour(), date_time->iso_minute(), date_time->iso_second(), date_time->iso_millisecond(), date_time->iso_microsecond(), date_time->iso_nanosecond(), *calendar)); } -// 5.3.25 Temporal.PlainDateTime.prototype.withCalendar ( calendar ), https://tc39.es/proposal-temporal/#sec-temporal.plaindatetime.prototype.withcalendar +// 5.3.25 Temporal.PlainDateTime.prototype.withCalendar ( calendarLike ), https://tc39.es/proposal-temporal/#sec-temporal.plaindatetime.prototype.withcalendar JS_DEFINE_NATIVE_FUNCTION(PlainDateTimePrototype::with_calendar) { + auto calendar_like = vm.argument(0); + // 1. Let dateTime be the this value. // 2. Perform ? RequireInternalSlot(dateTime, [[InitializedTemporalDateTime]]). auto* date_time = TRY(typed_this_object(global_object)); - // 3. Let calendar be ? ToTemporalCalendar(calendar). - auto* calendar = TRY(to_temporal_calendar(global_object, vm.argument(0))); + // 3. Let calendar be ? ToTemporalCalendar(calendarLike). + auto* calendar = TRY(to_temporal_calendar(global_object, calendar_like)); // 4. Return ? CreateTemporalDateTime(dateTime.[[ISOYear]], dateTime.[[ISOMonth]], dateTime.[[ISODay]], dateTime.[[ISOHour]], dateTime.[[ISOMinute]], dateTime.[[ISOSecond]], dateTime.[[ISOMillisecond]], dateTime.[[ISOMicrosecond]], dateTime.[[ISONanosecond]], calendar). return TRY(create_temporal_date_time(global_object, date_time->iso_year(), date_time->iso_month(), date_time->iso_day(), date_time->iso_hour(), date_time->iso_minute(), date_time->iso_second(), date_time->iso_millisecond(), date_time->iso_microsecond(), date_time->iso_nanosecond(), *calendar)); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainMonthDay.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainMonthDay.cpp index 7e645313a9..1026860607 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainMonthDay.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainMonthDay.cpp @@ -80,17 +80,17 @@ ThrowCompletionOr to_temporal_month_day(GlobalObject& global_obj calendar = &static_cast(item_object).calendar(); calendar_absent = false; } else { - // i. Let calendar be ? Get(item, "calendar"). - auto calendar_value = TRY(item_object.get(vm.names.calendar)); + // i. Let calendarLike be ? Get(item, "calendar"). + auto calendar_like = TRY(item_object.get(vm.names.calendar)); - // ii. If calendar is undefined, then + // ii. If calendarLike is undefined, then // 1. Let calendarAbsent be true. // iii. Else, // 1. Let calendarAbsent be false. - calendar_absent = calendar_value.is_undefined(); + calendar_absent = calendar_like.is_undefined(); - // iv. Set calendar to ? ToTemporalCalendarWithISODefault(calendar). - calendar = TRY(to_temporal_calendar_with_iso_default(global_object, calendar_value)); + // iv. Let calendar be ? ToTemporalCalendarWithISODefault(calendarLike). + calendar = TRY(to_temporal_calendar_with_iso_default(global_object, calendar_like)); } // d. Let fieldNames be ? CalendarFields(calendar, « "day", "month", "monthCode", "year" »).