From 0bc55424c8d9297d278bc97f864f8c3c9cf0220c Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 11 Dec 2024 09:29:07 -0500 Subject: [PATCH] LibJS: Fix variable reference in CreateDateTimeFormat This is an editorial change in the Temporal proposal. See: https://github.com/tc39/proposal-temporal/commit/8acd353 --- .../LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp b/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp index 0cd116c498f..c8a33df7797 100644 --- a/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp +++ b/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp @@ -367,15 +367,15 @@ ThrowCompletionOr> create_date_time_format(VM& vm, Funct // f. If dateStyle is not undefined, then if (!date_style.is_undefined()) { - // i. Set dateTimeFormat.[[TemporalPlainDateFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, matcher, « [[weekday]], [[era]], [[year]], [[month]], [[day]] »). + // i. Set dateTimeFormat.[[TemporalPlainDateFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, formatMatcher, « [[weekday]], [[era]], [[year]], [[month]], [[day]] »). auto temporal_plain_date_format = adjust_date_time_style_format(best_format, { { Weekday, Era, Year, Month, Day } }); date_time_format->set_temporal_plain_date_format(move(temporal_plain_date_format)); - // ii. Set dateTimeFormat.[[TemporalPlainYearMonthFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, matcher, « [[era]], [[year]], [[month]] »). + // ii. Set dateTimeFormat.[[TemporalPlainYearMonthFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, formatMatcher, « [[era]], [[year]], [[month]] »). auto temporal_plain_year_month_format = adjust_date_time_style_format(best_format, { { Era, Year, Month } }); date_time_format->set_temporal_plain_year_month_format(move(temporal_plain_year_month_format)); - // iii. Set dateTimeFormat.[[TemporalPlainMonthDayFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, matcher, « [[month]], [[day]] »). + // iii. Set dateTimeFormat.[[TemporalPlainMonthDayFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, formatMatcher, « [[month]], [[day]] »). auto temporal_plain_month_day_format = adjust_date_time_style_format(best_format, { { Month, Day } }); date_time_format->set_temporal_plain_month_day_format(move(temporal_plain_month_day_format)); } @@ -388,7 +388,7 @@ ThrowCompletionOr> create_date_time_format(VM& vm, Funct // h. If timeStyle is not undefined, then if (!time_style.is_undefined()) { - // i. Set dateTimeFormat.[[TemporalPlainTimeFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, matcher, « [[dayPeriod]], [[hour]], [[minute]], [[second]], [[fractionalSecondDigits]] »). + // i. Set dateTimeFormat.[[TemporalPlainTimeFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, formatMatcher, « [[dayPeriod]], [[hour]], [[minute]], [[second]], [[fractionalSecondDigits]] »). auto temporal_plain_time_format = adjust_date_time_style_format(best_format, { { DayPeriod, Hour, Minute, Second, FractionalSecondDigits } }); date_time_format->set_temporal_plain_time_format(move(temporal_plain_time_format)); } @@ -397,7 +397,7 @@ ThrowCompletionOr> create_date_time_format(VM& vm, Funct // i. Set dateTimeFormat.[[TemporalPlainTimeFormat]] to null. } - // j. Set dateTimeFormat.[[TemporalPlainDateTimeFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, matcher, « [[weekday]], [[era]], [[year]], [[month]], [[day]], [[dayPeriod]], [[hour]], [[minute]], [[second]], [[fractionalSecondDigits]] »). + // j. Set dateTimeFormat.[[TemporalPlainDateTimeFormat]] to AdjustDateTimeStyleFormat(formats, bestFormat, formatMatcher, « [[weekday]], [[era]], [[year]], [[month]], [[day]], [[dayPeriod]], [[hour]], [[minute]], [[second]], [[fractionalSecondDigits]] »). auto temporal_plain_date_time_format = adjust_date_time_style_format(best_format, { { Weekday, Era, Year, Month, Day, DayPeriod, Hour, Minute, Second, FractionalSecondDigits } }); date_time_format->set_temporal_plain_date_time_format(move(temporal_plain_date_time_format));