diff --git a/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp b/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp index 0a6ffc535b8..288cc64c71d 100644 --- a/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp +++ b/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp @@ -578,8 +578,8 @@ ThrowCompletionOr get_temporal_relative_to_option(VM& vm, Object con // g. Let timeZone be fields.[[TimeZone]]. time_zone = move(fields.time_zone); - // h. Let offsetString be fields.[[Offset]]. - offset_string = move(fields.offset); + // h. Let offsetString be fields.[[OffsetString]]. + offset_string = move(fields.offset_string); // i. If offsetString is UNSET, then if (!offset_string.has_value()) { diff --git a/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Libraries/LibJS/Runtime/Temporal/Calendar.cpp index 5752920a796..97e4ce6e7a8 100644 --- a/Libraries/LibJS/Runtime/Temporal/Calendar.cpp +++ b/Libraries/LibJS/Runtime/Temporal/Calendar.cpp @@ -49,7 +49,7 @@ enum class CalendarFieldConversion { __JS_ENUMERATE(CalendarField::Millisecond, millisecond, vm.names.millisecond, CalendarFieldConversion::ToIntegerWithTruncation) \ __JS_ENUMERATE(CalendarField::Microsecond, microsecond, vm.names.microsecond, CalendarFieldConversion::ToIntegerWithTruncation) \ __JS_ENUMERATE(CalendarField::Nanosecond, nanosecond, vm.names.nanosecond, CalendarFieldConversion::ToIntegerWithTruncation) \ - __JS_ENUMERATE(CalendarField::Offset, offset, vm.names.offset, CalendarFieldConversion::ToOffsetString) \ + __JS_ENUMERATE(CalendarField::Offset, offset_string, vm.names.offset, CalendarFieldConversion::ToOffsetString) \ __JS_ENUMERATE(CalendarField::TimeZone, time_zone, vm.names.timeZone, CalendarFieldConversion::ToTemporalTimeZoneIdentifier) struct CalendarFieldData { diff --git a/Libraries/LibJS/Runtime/Temporal/Calendar.h b/Libraries/LibJS/Runtime/Temporal/Calendar.h index 89e17074037..26ac2399a31 100644 --- a/Libraries/LibJS/Runtime/Temporal/Calendar.h +++ b/Libraries/LibJS/Runtime/Temporal/Calendar.h @@ -71,7 +71,7 @@ struct CalendarFields { .millisecond = {}, .microsecond = {}, .nanosecond = {}, - .offset = {}, + .offset_string = {}, .time_zone = {}, }; } @@ -88,7 +88,7 @@ struct CalendarFields { Optional millisecond { 0 }; Optional microsecond { 0 }; Optional nanosecond { 0 }; - Optional offset; + Optional offset_string; Optional time_zone; }; diff --git a/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp b/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp index c8c6be063d6..1020709082a 100644 --- a/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp +++ b/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp @@ -191,7 +191,7 @@ ThrowCompletionOr> to_temporal_zoned_date_time(VM& vm, Va time_zone = fields.time_zone.release_value(); // e. Let offsetString be fields.[[OffsetString]]. - offset_string = move(fields.offset); + offset_string = move(fields.offset_string); // f. If offsetString is UNSET, then if (!offset_string.has_value()) { diff --git a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp index c8a2f92722b..b968ac5bef2 100644 --- a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp +++ b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp @@ -415,7 +415,7 @@ JS_DEFINE_NATIVE_FUNCTION(ZonedDateTimePrototype::with) fields.nanosecond = iso_date_time.time.nanosecond; // 16. Set fields.[[OffsetString]] to FormatUTCOffsetNanoseconds(offsetNanoseconds). - fields.offset = format_utc_offset_nanoseconds(offset_nanoseconds); + fields.offset_string = format_utc_offset_nanoseconds(offset_nanoseconds); // 17. Let partialZonedDateTime be ? PrepareCalendarFields(calendar, temporalZonedDateTimeLike, « YEAR, MONTH, MONTH-CODE, DAY », « HOUR, MINUTE, SECOND, MILLISECOND, MICROSECOND, NANOSECOND, OFFSET », PARTIAL). static constexpr auto calendar_field_names = to_array({ CalendarField::Year, CalendarField::Month, CalendarField::MonthCode, CalendarField::Day }); @@ -441,7 +441,7 @@ JS_DEFINE_NATIVE_FUNCTION(ZonedDateTimePrototype::with) auto date_time_result = TRY(interpret_temporal_date_time_fields(vm, calendar, fields, overflow)); // 24. Let newOffsetNanoseconds be ! ParseDateTimeUTCOffset(fields.[[OffsetString]]). - auto new_offset_nanoseconds = parse_date_time_utc_offset(*fields.offset); + auto new_offset_nanoseconds = parse_date_time_utc_offset(*fields.offset_string); // 25. Let epochNanoseconds be ? InterpretISODateTimeOffset(dateTimeResult.[[ISODate]], dateTimeResult.[[Time]], OPTION, newOffsetNanoseconds, timeZone, disambiguation, offset, MATCH-EXACTLY). auto new_epoch_nanoseconds = TRY(interpret_iso_date_time_offset(vm, date_time_result.iso_date, date_time_result.time, OffsetBehavior::Option, new_offset_nanoseconds, time_zone, disambiguation, offset, MatchBehavior::MatchExactly));