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

LibJS: Rename DefaultMergeFields to DefaultMergeCalendarFields

Browse source 
This is an editorial change in the Temporal spec.

See: 0ee80b2
This commit is contained in:
Linus Groh 2022-06-09 19:45:53 +01:00 • committed by Andreas Kling
parent 125530c71d
commit 86e22abd76
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp
View file

@ -132,8 +132,8 @@ ThrowCompletionOr<Object*> calendar_merge_fields(GlobalObject& global_object, Ob
// 2. If mergeFields is undefined, then
if (!merge_fields) {
// a. Return ? DefaultMergeFields(fields, additionalFields).
return TRY(default_merge_fields(global_object, fields, additional_fields));
// a. Return ? DefaultMergeCalendarFields(fields, additionalFields).
return TRY(default_merge_calendar_fields(global_object, fields, additional_fields));
}
// 3. Let result be ? Call(mergeFields, calendar, « fields, additionalFields »).
@ -910,8 +910,8 @@ u8 iso_day(Object& temporal_object)
VERIFY_NOT_REACHED();
}
// 12.2.40 DefaultMergeFields ( fields, additionalFields ), https://tc39.es/proposal-temporal/#sec-temporal-defaultmergefields
ThrowCompletionOr<Object*> default_merge_fields(GlobalObject& global_object, Object const& fields, Object const& additional_fields)
// 12.2.40 DefaultMergeCalendarFields ( fields, additionalFields ), https://tc39.es/proposal-temporal/#sec-temporal-defaultmergecalendarfields
ThrowCompletionOr<Object*> default_merge_calendar_fields(GlobalObject& global_object, Object const& fields, Object const& additional_fields)
{
auto& vm = global_object.vm();

2
Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h
View file

@ -73,6 +73,6 @@ i32 iso_year(Object& temporal_object);
u8 iso_month(Object& temporal_object);
String iso_month_code(Object& temporal_object);
u8 iso_day(Object& temporal_object);
ThrowCompletionOr<Object*> default_merge_fields(GlobalObject&, Object const& fields, Object const& additional_fields);
ThrowCompletionOr<Object*> default_merge_calendar_fields(GlobalObject&, Object const& fields, Object const& additional_fields);
}

4
Userland/Libraries/LibJS/Runtime/Temporal/CalendarPrototype.cpp
View file

@ -577,8 +577,8 @@ JS_DEFINE_NATIVE_FUNCTION(CalendarPrototype::merge_fields)
// 5. Set additionalFields to ? ToObject(additionalFields).
auto* additional_fields = TRY(vm.argument(1).to_object(global_object));
// 6. Return ? DefaultMergeFields(fields, additionalFields).
return TRY(default_merge_fields(global_object, *fields, *additional_fields));
// 6. Return ? DefaultMergeCalendarFields(fields, additionalFields).
return TRY(default_merge_calendar_fields(global_object, *fields, *additional_fields));
}
// 12.4.23 Temporal.Calendar.prototype.toString ( ), https://tc39.es/proposal-temporal/#sec-temporal.calendar.prototype.tostring