mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-25 03:36:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibJS: Capture CalendarFields by reference in Calendar*FromFields AOs

Browse source 
These fields are modified by an invocation to CalendarResolveFields. All
callers currently don't care about these modifications, so they move the
CalendarFields struct into the AO. But it turns out that at least one AO
will care (InterpretTemporalDateTimeFields), thus we will need to take
by reference here.
This commit is contained in:
Timothy Flynn 2024-11-22 16:55:18 -05:00 • committed by Andreas Kling
commit 521638642f
Notes: github-actions[bot] 2024-11-23 13:47:20 +00:00
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibJS/Runtime/Temporal/Calendar.cpp
View file

@ -495,7 +495,7 @@ ThrowCompletionOr<String> get_temporal_calendar_identifier_with_iso_default(VM&
} }
// 12.2.10 CalendarDateFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendardatefromfields // 12.2.10 CalendarDateFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendardatefromfields
ThrowCompletionOr<ISODate> calendar_date_from_fields(VM& vm, StringView calendar, CalendarFields fields, Overflow overflow) ThrowCompletionOr<ISODate> calendar_date_from_fields(VM& vm, StringView calendar, CalendarFields& fields, Overflow overflow)
{ {
// 1. Perform ? CalendarResolveFields(calendar, fields, DATE). // 1. Perform ? CalendarResolveFields(calendar, fields, DATE).
TRY(calendar_resolve_fields(vm, calendar, fields, DateType::Date)); TRY(calendar_resolve_fields(vm, calendar, fields, DateType::Date));
@ -512,7 +512,7 @@ ThrowCompletionOr<ISODate> calendar_date_from_fields(VM& vm, StringView calendar
} }
// 12.2.11 CalendarYearMonthFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendaryearmonthfromfields // 12.2.11 CalendarYearMonthFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendaryearmonthfromfields
ThrowCompletionOr<ISODate> calendar_year_month_from_fields(VM& vm, StringView calendar, CalendarFields fields, Overflow overflow) ThrowCompletionOr<ISODate> calendar_year_month_from_fields(VM& vm, StringView calendar, CalendarFields& fields, Overflow overflow)
{ {
// 1. Perform ? CalendarResolveFields(calendar, fields, YEAR-MONTH). // 1. Perform ? CalendarResolveFields(calendar, fields, YEAR-MONTH).
TRY(calendar_resolve_fields(vm, calendar, fields, DateType::YearMonth)); TRY(calendar_resolve_fields(vm, calendar, fields, DateType::YearMonth));
@ -536,7 +536,7 @@ ThrowCompletionOr<ISODate> calendar_year_month_from_fields(VM& vm, StringView ca
} }
// 12.2.12 CalendarMonthDayFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendarmonthdayfromfields // 12.2.12 CalendarMonthDayFromFields ( calendar, fields, overflow ), https://tc39.es/proposal-temporal/#sec-temporal-calendarmonthdayfromfields
ThrowCompletionOr<ISODate> calendar_month_day_from_fields(VM& vm, StringView calendar, CalendarFields fields, Overflow overflow) ThrowCompletionOr<ISODate> calendar_month_day_from_fields(VM& vm, StringView calendar, CalendarFields& fields, Overflow overflow)
{ {
// 1. Perform ? CalendarResolveFields(calendar, fields, MONTH-DAY). // 1. Perform ? CalendarResolveFields(calendar, fields, MONTH-DAY).
TRY(calendar_resolve_fields(vm, calendar, fields, DateType::MonthDay)); TRY(calendar_resolve_fields(vm, calendar, fields, DateType::MonthDay));

6
Libraries/LibJS/Runtime/Temporal/Calendar.h
View file

@ -99,9 +99,9 @@ using CalendarFieldListOrPartial = Variant<Partial, CalendarFieldList>;
ThrowCompletionOr<String> canonicalize_calendar(VM&, StringView id); ThrowCompletionOr<String> canonicalize_calendar(VM&, StringView id);
Vector<String> const& available_calendars(); Vector<String> const& available_calendars();
ThrowCompletionOr<CalendarFields> prepare_calendar_fields(VM&, StringView calendar, Object const& fields, CalendarFieldList calendar_field_names, CalendarFieldList non_calendar_field_names, CalendarFieldListOrPartial required_field_names); ThrowCompletionOr<CalendarFields> prepare_calendar_fields(VM&, StringView calendar, Object const& fields, CalendarFieldList calendar_field_names, CalendarFieldList non_calendar_field_names, CalendarFieldListOrPartial required_field_names);
ThrowCompletionOr<ISODate> calendar_date_from_fields(VM&, StringView calendar, CalendarFields, Overflow); ThrowCompletionOr<ISODate> calendar_date_from_fields(VM&, StringView calendar, CalendarFields&, Overflow);
ThrowCompletionOr<ISODate> calendar_year_month_from_fields(VM&, StringView calendar, CalendarFields, Overflow); ThrowCompletionOr<ISODate> calendar_year_month_from_fields(VM&, StringView calendar, CalendarFields&, Overflow);
ThrowCompletionOr<ISODate> calendar_month_day_from_fields(VM&, StringView calendar, CalendarFields, Overflow); ThrowCompletionOr<ISODate> calendar_month_day_from_fields(VM&, StringView calendar, CalendarFields&, Overflow);
String format_calendar_annotation(StringView id, ShowCalendar); String format_calendar_annotation(StringView id, ShowCalendar);
bool calendar_equals(StringView one, StringView two); bool calendar_equals(StringView one, StringView two);
u8 iso_days_in_month(double year, double month); u8 iso_days_in_month(double year, double month);

2
Libraries/LibJS/Runtime/Temporal/PlainDate.cpp
View file

@ -106,7 +106,7 @@ ThrowCompletionOr<GC::Ref<PlainDate>> to_temporal_date(VM& vm, Value item, Value
auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options)); auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options));
// h. Let isoDate be ? CalendarDateFromFields(calendar, fields, overflow). // h. Let isoDate be ? CalendarDateFromFields(calendar, fields, overflow).
auto iso_date = TRY(calendar_date_from_fields(vm, calendar, move(fields), overflow)); auto iso_date = TRY(calendar_date_from_fields(vm, calendar, fields, overflow));
// i. Return ! CreateTemporalDate(isoDate, calendar). // i. Return ! CreateTemporalDate(isoDate, calendar).
return MUST(create_temporal_date(vm, iso_date, move(calendar))); return MUST(create_temporal_date(vm, iso_date, move(calendar)));

4
Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
View file

@ -207,7 +207,7 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::to_plain_year_month)
auto fields = iso_date_to_fields(calendar, temporal_date->iso_date(), DateType::Date); auto fields = iso_date_to_fields(calendar, temporal_date->iso_date(), DateType::Date);
// 5. Let isoDate be ? CalendarYearMonthFromFields(calendar, fields, CONSTRAIN). // 5. Let isoDate be ? CalendarYearMonthFromFields(calendar, fields, CONSTRAIN).
auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, move(fields), Overflow::Constrain)); auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, fields, Overflow::Constrain));
// 6. Return ! CreateTemporalYearMonth(isoDate, calendar). // 6. Return ! CreateTemporalYearMonth(isoDate, calendar).
return MUST(create_temporal_year_month(vm, iso_date, calendar)); return MUST(create_temporal_year_month(vm, iso_date, calendar));
@ -227,7 +227,7 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::to_plain_month_day)
auto fields = iso_date_to_fields(calendar, temporal_date->iso_date(), DateType::Date); auto fields = iso_date_to_fields(calendar, temporal_date->iso_date(), DateType::Date);
// 5. Let isoDate be ? CalendarMonthDayFromFields(calendar, fields, CONSTRAIN). // 5. Let isoDate be ? CalendarMonthDayFromFields(calendar, fields, CONSTRAIN).
auto iso_date = TRY(calendar_month_day_from_fields(vm, calendar, move(fields), Overflow::Constrain)); auto iso_date = TRY(calendar_month_day_from_fields(vm, calendar, fields, Overflow::Constrain));
// 6. Return ! CreateTemporalMonthDay(isoDate, calendar). // 6. Return ! CreateTemporalMonthDay(isoDate, calendar).
return MUST(create_temporal_month_day(vm, iso_date, calendar)); return MUST(create_temporal_month_day(vm, iso_date, calendar));

2
Libraries/LibJS/Runtime/Temporal/PlainMonthDay.cpp
View file

@ -62,7 +62,7 @@ ThrowCompletionOr<GC::Ref<PlainMonthDay>> to_temporal_month_day(VM& vm, Value it
auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options)); auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options));
// f. Let isoDate be ? CalendarMonthDayFromFields(calendar, fields, overflow). // f. Let isoDate be ? CalendarMonthDayFromFields(calendar, fields, overflow).
auto iso_date = TRY(calendar_month_day_from_fields(vm, calendar, move(fields), overflow)); auto iso_date = TRY(calendar_month_day_from_fields(vm, calendar, fields, overflow));
// g. Return ! CreateTemporalMonthDay(isoDate, calendar). // g. Return ! CreateTemporalMonthDay(isoDate, calendar).
return MUST(create_temporal_month_day(vm, iso_date, move(calendar))); return MUST(create_temporal_month_day(vm, iso_date, move(calendar)));

10
Libraries/LibJS/Runtime/Temporal/PlainYearMonth.cpp
View file

@ -64,7 +64,7 @@ ThrowCompletionOr<GC::Ref<PlainYearMonth>> to_temporal_year_month(VM& vm, Value
auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options)); auto overflow = TRY(get_temporal_overflow_option(vm, resolved_options));
// f. Let isoDate be ? CalendarYearMonthFromFields(calendar, fields, overflow). // f. Let isoDate be ? CalendarYearMonthFromFields(calendar, fields, overflow).
auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, move(fields), overflow)); auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, fields, overflow));
// g. Return ! CreateTemporalYearMonth(isoDate, calendar). // g. Return ! CreateTemporalYearMonth(isoDate, calendar).
return MUST(create_temporal_year_month(vm, iso_date, move(calendar))); return MUST(create_temporal_year_month(vm, iso_date, move(calendar)));
@ -224,7 +224,7 @@ ThrowCompletionOr<GC::Ref<Duration>> difference_temporal_plain_year_month(VM& vm
this_fields.day = 1; this_fields.day = 1;
// 9. Let thisDate be ? CalendarDateFromFields(calendar, thisFields, CONSTRAIN). // 9. Let thisDate be ? CalendarDateFromFields(calendar, thisFields, CONSTRAIN).
auto this_date = TRY(calendar_date_from_fields(vm, calendar, move(this_fields), Overflow::Constrain)); auto this_date = TRY(calendar_date_from_fields(vm, calendar, this_fields, Overflow::Constrain));
// 10. Let otherFields be ISODateToFields(calendar, other.[[ISODate]], YEAR-MONTH). // 10. Let otherFields be ISODateToFields(calendar, other.[[ISODate]], YEAR-MONTH).
auto other_fields = iso_date_to_fields(calendar, other->iso_date(), DateType::YearMonth); auto other_fields = iso_date_to_fields(calendar, other->iso_date(), DateType::YearMonth);
@ -233,7 +233,7 @@ ThrowCompletionOr<GC::Ref<Duration>> difference_temporal_plain_year_month(VM& vm
other_fields.day = 1; other_fields.day = 1;
// 12. Let otherDate be ? CalendarDateFromFields(calendar, otherFields, CONSTRAIN). // 12. Let otherDate be ? CalendarDateFromFields(calendar, otherFields, CONSTRAIN).
auto other_date = TRY(calendar_date_from_fields(vm, calendar, move(other_fields), Overflow::Constrain)); auto other_date = TRY(calendar_date_from_fields(vm, calendar, other_fields, Overflow::Constrain));
// 13. Let dateDifference be CalendarDateUntil(calendar, thisDate, otherDate, settings.[[LargestUnit]]). // 13. Let dateDifference be CalendarDateUntil(calendar, thisDate, otherDate, settings.[[LargestUnit]]).
auto date_difference = calendar_date_until(vm, calendar, this_date, other_date, settings.largest_unit); auto date_difference = calendar_date_until(vm, calendar, this_date, other_date, settings.largest_unit);
@ -299,7 +299,7 @@ ThrowCompletionOr<GC::Ref<PlainYearMonth>> add_duration_to_year_month(VM& vm, Ar
fields.day = 1; fields.day = 1;
// 9. Let intermediateDate be ? CalendarDateFromFields(calendar, fields, CONSTRAIN). // 9. Let intermediateDate be ? CalendarDateFromFields(calendar, fields, CONSTRAIN).
auto intermediate_date = TRY(calendar_date_from_fields(vm, calendar, move(fields), Overflow::Constrain)); auto intermediate_date = TRY(calendar_date_from_fields(vm, calendar, fields, Overflow::Constrain));
ISODate date; ISODate date;
@ -333,7 +333,7 @@ ThrowCompletionOr<GC::Ref<PlainYearMonth>> add_duration_to_year_month(VM& vm, Ar
auto added_date_fields = iso_date_to_fields(calendar, added_date, DateType::YearMonth); auto added_date_fields = iso_date_to_fields(calendar, added_date, DateType::YearMonth);
// 15. Let isoDate be ? CalendarYearMonthFromFields(calendar, addedDateFields, overflow). // 15. Let isoDate be ? CalendarYearMonthFromFields(calendar, addedDateFields, overflow).
auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, move(added_date_fields), overflow)); auto iso_date = TRY(calendar_year_month_from_fields(vm, calendar, added_date_fields, overflow));
// 16. Return ! CreateTemporalYearMonth(isoDate, calendar). // 16. Return ! CreateTemporalYearMonth(isoDate, calendar).
return MUST(create_temporal_year_month(vm, iso_date, calendar)); return MUST(create_temporal_year_month(vm, iso_date, calendar));