diff options
author | Linus Groh <mail@linusgroh.de> | 2021-11-12 23:37:20 +0000 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-11-13 00:25:40 +0000 |
commit | 0d9defdad8ac947ef2b4583b01dedcdd5aaea8ba (patch) | |
tree | 8ce85d2d76343502e4cde5c6bb36e15335c16915 /Userland/Libraries/LibJS | |
parent | 778268b1a5b4c9b02c3c816855a40d32db932e65 (diff) | |
download | serenity-0d9defdad8ac947ef2b4583b01dedcdd5aaea8ba.zip |
LibJS: Rename MatchBehavior members back to their old names
I changed this in 6ef1a27 to "match the spec", but the spec calls it
`match exactly` and `match minutes` - so what we had before was correct
and the change made no sense whatsoever.
Diffstat (limited to 'Userland/Libraries/LibJS')
3 files changed, 7 insertions, 7 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp index 48558bf445..28bb9b544d 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp @@ -535,7 +535,7 @@ ThrowCompletionOr<Value> to_relative_temporal_object(GlobalObject& global_object auto offset_behavior = OffsetBehavior::Option; // 5. Let matchBehaviour be match exactly. - auto match_behavior = MatchBehavior::Exactly; + auto match_behavior = MatchBehavior::MatchExactly; ISODateTime result; Value offset_string; @@ -622,7 +622,7 @@ ThrowCompletionOr<Value> to_relative_temporal_object(GlobalObject& global_object } // h. Set matchBehaviour to match minutes. - match_behavior = MatchBehavior::Minutes; + match_behavior = MatchBehavior::MatchMinutes; // See NOTE above about why this is done. result = move(parsed_result.date_time); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp index c45f5ab4c1..96c571edd2 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.cpp @@ -93,7 +93,7 @@ ThrowCompletionOr<BigInt const*> interpret_iso_date_time_offset(GlobalObject& gl } // c. If matchBehaviour is match minutes, then - if (match_behavior == MatchBehavior::Minutes) { + if (match_behavior == MatchBehavior::MatchMinutes) { // i. Let roundedCandidateNanoseconds be ! RoundNumberToIncrement(candidateNanoseconds, 60 × 10^9, "halfExpand"). auto rounded_candidate_nanoseconds = round_number_to_increment(candidate_nanoseconds, 60000000000, "halfExpand"sv); @@ -129,7 +129,7 @@ ThrowCompletionOr<ZonedDateTime*> to_temporal_zoned_date_time(GlobalObject& glob auto offset_behavior = OffsetBehavior::Option; // 3. Let matchBehaviour be match exactly. - auto match_behavior = MatchBehavior::Exactly; + auto match_behavior = MatchBehavior::MatchExactly; Object* calendar = nullptr; Object* time_zone = nullptr; @@ -222,7 +222,7 @@ ThrowCompletionOr<ZonedDateTime*> to_temporal_zoned_date_time(GlobalObject& glob calendar = TRY(to_temporal_calendar_with_iso_default(global_object, js_string(vm, parsed_result.date_time.calendar.value()))); // j. Set matchBehaviour to match minutes. - match_behavior = MatchBehavior::Minutes; + match_behavior = MatchBehavior::MatchMinutes; // See NOTE above about why this is done. result = move(parsed_result.date_time); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.h b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.h index 7ffcdbaec2..9dcd2a0e2a 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTime.h @@ -47,8 +47,8 @@ enum class OffsetBehavior { }; enum class MatchBehavior { - Exactly, - Minutes, + MatchExactly, + MatchMinutes, }; ThrowCompletionOr<BigInt const*> interpret_iso_date_time_offset(GlobalObject&, i32 year, u8 month, u8 day, u8 hour, u8 minute, u8 second, u16 millisecond, u16 microsecond, u16 nanosecond, OffsetBehavior offset_behavior, double offset_nanoseconds, Value time_zone, StringView disambiguation, StringView offset_option, MatchBehavior match_behavior); |