From 152251f5a74f638f707145887748cb6a155b6401 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Sun, 18 Jul 2021 21:41:29 +0100 Subject: [PATCH] LibJS: Move Temporal AO structs/enum classes above function declarations This is a bit closer to our usual style, and tidier. --- .../Runtime/Temporal/AbstractOperations.h | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.h b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.h index 9957a3bc2c..82f19b84c2 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.h @@ -12,17 +12,12 @@ namespace JS::Temporal { -Object* get_options_object(GlobalObject&, Value options); enum class OptionType { Boolean, String, Number }; -Value get_option(GlobalObject&, Object& options, String const& property, Vector const& types, Vector const& values, Value fallback); -String to_temporal_rounding_mode(GlobalObject&, Object& normalized_options, String const& fallback); -u64 to_temporal_rounding_increment(GlobalObject&, Object& normalized_options, Optional dividend, bool inclusive); -Optional to_smallest_temporal_unit(GlobalObject&, Object& normalized_options, Vector const& disallowed_units, Optional fallback); -BigInt* round_number_to_increment(GlobalObject&, BigInt const&, u64 increment, String const& rounding_mode); + struct ISODateTime { i32 year; i32 month; @@ -35,7 +30,7 @@ struct ISODateTime { i32 nanosecond; Optional calendar; }; -Optional parse_iso_date_time(GlobalObject&, String const& iso_string); + struct TemporalInstant { i32 year; i32 month; @@ -48,12 +43,21 @@ struct TemporalInstant { i32 nanosecond; Optional time_zone_offset; }; -Optional parse_temporal_instant_string(GlobalObject&, String const& iso_string); + struct TemporalTimeZone { bool z; Optional offset; Optional name; }; + +Object* get_options_object(GlobalObject&, Value options); +Value get_option(GlobalObject&, Object& options, String const& property, Vector const& types, Vector const& values, Value fallback); +String to_temporal_rounding_mode(GlobalObject&, Object& normalized_options, String const& fallback); +u64 to_temporal_rounding_increment(GlobalObject&, Object& normalized_options, Optional dividend, bool inclusive); +Optional to_smallest_temporal_unit(GlobalObject&, Object& normalized_options, Vector const& disallowed_units, Optional fallback); +BigInt* round_number_to_increment(GlobalObject&, BigInt const&, u64 increment, String const& rounding_mode); +Optional parse_iso_date_time(GlobalObject&, String const& iso_string); +Optional parse_temporal_instant_string(GlobalObject&, String const& iso_string); Optional parse_temporal_time_zone_string(GlobalObject&, String const& iso_string); }