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

LibJS: Add an explicit operation for merging calendar field names

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

See: 2bd7977
This commit is contained in:
Linus Groh 2022-06-15 00:05:05 +01:00
parent ee80164ac1
commit 3025f77991
4 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1004,4 +1004,32 @@ ThrowCompletionOr<Object*> default_merge_calendar_fields(GlobalObject& global_ob
return merged; return merged;
} }
// 12.2.41 CalendarMergeFieldNames ( receiverFieldNames, inputFieldNames ), https://tc39.es/proposal-temporal/#sec-temporal-calendarmergefieldnames
Vector<String> calendar_merge_field_names(Vector<String> const& receiver_field_names, Vector<String> const& input_field_names)
{
// 1. Let merged be a new empty List.
Vector<String> merged;
// 2. For each element name of receiverFieldNames, do
for (auto const& field_name : receiver_field_names) {
// a. If merged does not contain name, then
if (!merged.contains_slow(field_name)) {
// i. Append name to merged.
merged.append(field_name);
}
}
// 3. For each element name of inputFieldNames, do
for (auto const& field_name : input_field_names) {
// a. If merged does not contain name, then
if (!merged.contains_slow(field_name)) {
// i. Append name to merged.
merged.append(field_name);
}
}
// 4. Return merged.
return merged;
}
} }

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

@ -74,5 +74,6 @@ u8 iso_month(Object& temporal_object);
String iso_month_code(Object& temporal_object); String iso_month_code(Object& temporal_object);
u8 iso_day(Object& temporal_object); u8 iso_day(Object& temporal_object);
ThrowCompletionOr<Object*> default_merge_calendar_fields(GlobalObject&, Object const& fields, Object const& additional_fields); ThrowCompletionOr<Object*> default_merge_calendar_fields(GlobalObject&, Object const& fields, Object const& additional_fields);
Vector<String> calendar_merge_field_names(Vector<String> const& receiver_field_names, Vector<String> const& input_field_names);
} }

12
Userland/Libraries/LibJS/Runtime/Temporal/PlainMonthDayPrototype.cpp
View file

@ -231,16 +231,8 @@ JS_DEFINE_NATIVE_FUNCTION(PlainMonthDayPrototype::to_plain_date)
// 9. Let mergedFields be ? CalendarMergeFields(calendar, fields, inputFields). // 9. Let mergedFields be ? CalendarMergeFields(calendar, fields, inputFields).
auto* merged_fields = TRY(calendar_merge_fields(global_object, calendar, *fields, *input_fields)); auto* merged_fields = TRY(calendar_merge_fields(global_object, calendar, *fields, *input_fields));
// 10. Let mergedFieldNames be the List containing all the elements of receiverFieldNames followed by all the elements of inputFieldNames, with duplicate elements removed. // 10. Let mergedFieldNames be CalendarMergeFieldNames(receiverFieldNames, inputFieldNames).
Vector<String> merged_field_names; auto merged_field_names = calendar_merge_field_names(receiver_field_names, input_field_names);
for (auto& field_name : receiver_field_names) {
if (!merged_field_names.contains_slow(field_name))
merged_field_names.append(move(field_name));
}
for (auto& field_name : input_field_names) {
if (!merged_field_names.contains_slow(field_name))
merged_field_names.append(move(field_name));
}
// 11. Set mergedFields to ? PrepareTemporalFields(mergedFields, mergedFieldNames, «»). // 11. Set mergedFields to ? PrepareTemporalFields(mergedFields, mergedFieldNames, «»).
merged_fields = TRY(prepare_temporal_fields(global_object, *merged_fields, merged_field_names, Vector<StringView> {})); merged_fields = TRY(prepare_temporal_fields(global_object, *merged_fields, merged_field_names, Vector<StringView> {}));

12
Userland/Libraries/LibJS/Runtime/Temporal/PlainYearMonthPrototype.cpp
View file

@ -398,16 +398,8 @@ JS_DEFINE_NATIVE_FUNCTION(PlainYearMonthPrototype::to_plain_date)
// 9. Let mergedFields be ? CalendarMergeFields(calendar, fields, inputFields). // 9. Let mergedFields be ? CalendarMergeFields(calendar, fields, inputFields).
auto* merged_fields = TRY(calendar_merge_fields(global_object, calendar, *fields, *input_fields)); auto* merged_fields = TRY(calendar_merge_fields(global_object, calendar, *fields, *input_fields));
// 10. Let mergedFieldNames be the List containing all the elements of receiverFieldNames followed by all the elements of inputFieldNames, with duplicate elements removed. // 10. Let mergedFieldNames be CalendarMergeFieldNames(receiverFieldNames, inputFieldNames).
Vector<String> merged_field_names; auto merged_field_names = calendar_merge_field_names(receiver_field_names, input_field_names);
for (auto& field_name : receiver_field_names) {
if (!merged_field_names.contains_slow(field_name))
merged_field_names.append(move(field_name));
}
for (auto& field_name : input_field_names) {
if (!merged_field_names.contains_slow(field_name))
merged_field_names.append(move(field_name));
}
// 11. Set mergedFields to ? PrepareTemporalFields(mergedFields, mergedFieldNames, «»). // 11. Set mergedFields to ? PrepareTemporalFields(mergedFields, mergedFieldNames, «»).
merged_fields = TRY(prepare_temporal_fields(global_object, *merged_fields, merged_field_names, Vector<StringView> {})); merged_fields = TRY(prepare_temporal_fields(global_object, *merged_fields, merged_field_names, Vector<StringView> {}));