mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-28 19:59:17 +00:00
LibJS: Merge Intl.DurationFormat style and display fields into a struct
This is an editorial change in the ECMA-402 spec. See:
d56d624
This commit is contained in:
Timothy Flynn
Tim Flynn
parent
00d00b84d3
commit
780de1395b
Notes:
github-actions[bot]
2025-03-18 15:48:15 +00:00
Author: https://github.com/trflynn89
Commit: 780de1395b
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3980
10 changed files with 213 additions and 282 deletions
|
|
@ -66,6 +66,12 @@ public:
|
|||
Nanoseconds,
|
||||
};
|
||||
|
||||
// 13.5.6.1 Duration Unit Options Records, https://tc39.es/ecma402/#sec-durationformat-unit-options-record
|
||||
struct DurationUnitOptions {
|
||||
ValueStyle style { ValueStyle::Long };
|
||||
Display display { Display::Auto };
|
||||
};
|
||||
|
||||
static constexpr auto relevant_extension_keys()
|
||||
{
|
||||
// 13.2.3 Internal slots, https://tc39.es/ecma402/#sec-Intl.DurationFormat-internal-slots
|
||||
|
|
@ -91,85 +97,35 @@ public:
|
|||
Style style() const { return m_style; }
|
||||
StringView style_string() const { return style_to_string(m_style); }
|
||||
|
||||
void set_years_style(ValueStyle years_style) { m_years_style = years_style; }
|
||||
ValueStyle years_style() const { return m_years_style; }
|
||||
StringView years_style_string() const { return value_style_to_string(m_years_style); }
|
||||
void set_years_options(DurationUnitOptions years_options) { m_years_options = years_options; }
|
||||
DurationUnitOptions years_options() const { return m_years_options; }
|
||||
|
||||
void set_years_display(Display years_display) { m_years_display = years_display; }
|
||||
Display years_display() const { return m_years_display; }
|
||||
StringView years_display_string() const { return display_to_string(m_years_display); }
|
||||
void set_months_options(DurationUnitOptions months_options) { m_months_options = months_options; }
|
||||
DurationUnitOptions months_options() const { return m_months_options; }
|
||||
|
||||
void set_months_style(ValueStyle months_style) { m_months_style = months_style; }
|
||||
ValueStyle months_style() const { return m_months_style; }
|
||||
StringView months_style_string() const { return value_style_to_string(m_months_style); }
|
||||
void set_weeks_options(DurationUnitOptions weeks_options) { m_weeks_options = weeks_options; }
|
||||
DurationUnitOptions weeks_options() const { return m_weeks_options; }
|
||||
|
||||
void set_months_display(Display months_display) { m_months_display = months_display; }
|
||||
Display months_display() const { return m_months_display; }
|
||||
StringView months_display_string() const { return display_to_string(m_months_display); }
|
||||
void set_days_options(DurationUnitOptions days_options) { m_days_options = days_options; }
|
||||
DurationUnitOptions days_options() const { return m_days_options; }
|
||||
|
||||
void set_weeks_style(ValueStyle weeks_style) { m_weeks_style = weeks_style; }
|
||||
ValueStyle weeks_style() const { return m_weeks_style; }
|
||||
StringView weeks_style_string() const { return value_style_to_string(m_weeks_style); }
|
||||
void set_hours_options(DurationUnitOptions hours_options) { m_hours_options = hours_options; }
|
||||
DurationUnitOptions hours_options() const { return m_hours_options; }
|
||||
|
||||
void set_weeks_display(Display weeks_display) { m_weeks_display = weeks_display; }
|
||||
Display weeks_display() const { return m_weeks_display; }
|
||||
StringView weeks_display_string() const { return display_to_string(m_weeks_display); }
|
||||
void set_minutes_options(DurationUnitOptions minutes_options) { m_minutes_options = minutes_options; }
|
||||
DurationUnitOptions minutes_options() const { return m_minutes_options; }
|
||||
|
||||
void set_days_style(ValueStyle days_style) { m_days_style = days_style; }
|
||||
ValueStyle days_style() const { return m_days_style; }
|
||||
StringView days_style_string() const { return value_style_to_string(m_days_style); }
|
||||
void set_seconds_options(DurationUnitOptions seconds_options) { m_seconds_options = seconds_options; }
|
||||
DurationUnitOptions seconds_options() const { return m_seconds_options; }
|
||||
|
||||
void set_days_display(Display days_display) { m_days_display = days_display; }
|
||||
Display days_display() const { return m_days_display; }
|
||||
StringView days_display_string() const { return display_to_string(m_days_display); }
|
||||
void set_milliseconds_options(DurationUnitOptions milliseconds_options) { m_milliseconds_options = milliseconds_options; }
|
||||
DurationUnitOptions milliseconds_options() const { return m_milliseconds_options; }
|
||||
|
||||
void set_hours_style(ValueStyle hours_style) { m_hours_style = hours_style; }
|
||||
ValueStyle hours_style() const { return m_hours_style; }
|
||||
StringView hours_style_string() const { return value_style_to_string(m_hours_style); }
|
||||
void set_microseconds_options(DurationUnitOptions microseconds_options) { m_microseconds_options = microseconds_options; }
|
||||
DurationUnitOptions microseconds_options() const { return m_microseconds_options; }
|
||||
|
||||
void set_hours_display(Display hours_display) { m_hours_display = hours_display; }
|
||||
Display hours_display() const { return m_hours_display; }
|
||||
StringView hours_display_string() const { return display_to_string(m_hours_display); }
|
||||
|
||||
void set_minutes_style(ValueStyle minutes_style) { m_minutes_style = minutes_style; }
|
||||
ValueStyle minutes_style() const { return m_minutes_style; }
|
||||
StringView minutes_style_string() const { return value_style_to_string(m_minutes_style); }
|
||||
|
||||
void set_minutes_display(Display minutes_display) { m_minutes_display = minutes_display; }
|
||||
Display minutes_display() const { return m_minutes_display; }
|
||||
StringView minutes_display_string() const { return display_to_string(m_minutes_display); }
|
||||
|
||||
void set_seconds_style(ValueStyle seconds_style) { m_seconds_style = seconds_style; }
|
||||
ValueStyle seconds_style() const { return m_seconds_style; }
|
||||
StringView seconds_style_string() const { return value_style_to_string(m_seconds_style); }
|
||||
|
||||
void set_seconds_display(Display seconds_display) { m_seconds_display = seconds_display; }
|
||||
Display seconds_display() const { return m_seconds_display; }
|
||||
StringView seconds_display_string() const { return display_to_string(m_seconds_display); }
|
||||
|
||||
void set_milliseconds_style(ValueStyle milliseconds_style) { m_milliseconds_style = milliseconds_style; }
|
||||
ValueStyle milliseconds_style() const { return m_milliseconds_style; }
|
||||
StringView milliseconds_style_string() const { return value_style_to_string(m_milliseconds_style); }
|
||||
|
||||
void set_milliseconds_display(Display milliseconds_display) { m_milliseconds_display = milliseconds_display; }
|
||||
Display milliseconds_display() const { return m_milliseconds_display; }
|
||||
StringView milliseconds_display_string() const { return display_to_string(m_milliseconds_display); }
|
||||
|
||||
void set_microseconds_style(ValueStyle microseconds_style) { m_microseconds_style = microseconds_style; }
|
||||
ValueStyle microseconds_style() const { return m_microseconds_style; }
|
||||
StringView microseconds_style_string() const { return value_style_to_string(m_microseconds_style); }
|
||||
|
||||
void set_microseconds_display(Display microseconds_display) { m_microseconds_display = microseconds_display; }
|
||||
Display microseconds_display() const { return m_microseconds_display; }
|
||||
StringView microseconds_display_string() const { return display_to_string(m_microseconds_display); }
|
||||
|
||||
void set_nanoseconds_style(ValueStyle nanoseconds_style) { m_nanoseconds_style = nanoseconds_style; }
|
||||
ValueStyle nanoseconds_style() const { return m_nanoseconds_style; }
|
||||
StringView nanoseconds_style_string() const { return value_style_to_string(m_nanoseconds_style); }
|
||||
|
||||
void set_nanoseconds_display(Display nanoseconds_display) { m_nanoseconds_display = nanoseconds_display; }
|
||||
Display nanoseconds_display() const { return m_nanoseconds_display; }
|
||||
StringView nanoseconds_display_string() const { return display_to_string(m_nanoseconds_display); }
|
||||
void set_nanoseconds_options(DurationUnitOptions nanoseconds_options) { m_nanoseconds_options = nanoseconds_options; }
|
||||
DurationUnitOptions nanoseconds_options() const { return m_nanoseconds_options; }
|
||||
|
||||
void set_fractional_digits(Optional<u8> fractional_digits) { m_fractional_digits = move(fractional_digits); }
|
||||
bool has_fractional_digits() const { return m_fractional_digits.has_value(); }
|
||||
|
|
@ -183,78 +139,62 @@ private:
|
|||
String m_hour_minute_separator; // [[HourMinutesSeparator]]
|
||||
String m_minute_second_separator; // [[MinutesSecondsSeparator]]
|
||||
|
||||
Style m_style { Style::Long }; // [[Style]]
|
||||
ValueStyle m_years_style { ValueStyle::Long }; // [[YearsStyle]]
|
||||
Display m_years_display { Display::Auto }; // [[YearsDisplay]]
|
||||
ValueStyle m_months_style { ValueStyle::Long }; // [[MonthsStyle]]
|
||||
Display m_months_display { Display::Auto }; // [[MonthsDisplay]]
|
||||
ValueStyle m_weeks_style { ValueStyle::Long }; // [[WeeksStyle]]
|
||||
Display m_weeks_display { Display::Auto }; // [[WeeksDisplay]]
|
||||
ValueStyle m_days_style { ValueStyle::Long }; // [[DaysStyle]]
|
||||
Display m_days_display { Display::Auto }; // [[DaysDisplay]]
|
||||
ValueStyle m_hours_style { ValueStyle::Long }; // [[HoursStyle]]
|
||||
Display m_hours_display { Display::Auto }; // [[HoursDisplay]]
|
||||
ValueStyle m_minutes_style { ValueStyle::Long }; // [[MinutesStyle]]
|
||||
Display m_minutes_display { Display::Auto }; // [[MinutesDisplay]]
|
||||
ValueStyle m_seconds_style { ValueStyle::Long }; // [[SecondsStyle]]
|
||||
Display m_seconds_display { Display::Auto }; // [[SecondsDisplay]]
|
||||
ValueStyle m_milliseconds_style { ValueStyle::Long }; // [[MillisecondsStyle]]
|
||||
Display m_milliseconds_display { Display::Auto }; // [[MillisecondsDisplay]]
|
||||
ValueStyle m_microseconds_style { ValueStyle::Long }; // [[MicrosecondsStyle]]
|
||||
Display m_microseconds_display { Display::Auto }; // [[MicrosecondsDisplay]]
|
||||
ValueStyle m_nanoseconds_style { ValueStyle::Long }; // [[NanosecondsStyle]]
|
||||
Display m_nanoseconds_display { Display::Auto }; // [[NanosecondsDisplay]]
|
||||
Optional<u8> m_fractional_digits; // [[FractionalDigits]]
|
||||
Style m_style { Style::Long }; // [[Style]]
|
||||
DurationUnitOptions m_years_options; // [[YearsOptions]]
|
||||
DurationUnitOptions m_months_options; // [[MonthsOptions]]
|
||||
DurationUnitOptions m_weeks_options; // [[WeeksOptions]]
|
||||
DurationUnitOptions m_days_options; // [[DaysOptions]]
|
||||
DurationUnitOptions m_hours_options; // [[HoursOptions]]
|
||||
DurationUnitOptions m_minutes_options; // [[MinutesOptions]]
|
||||
DurationUnitOptions m_seconds_options; // [[SecondsOptions]]
|
||||
DurationUnitOptions m_milliseconds_options; // [[MillisecondsOptions]]
|
||||
DurationUnitOptions m_microseconds_options; // [[MicrosecondsOptions]]
|
||||
DurationUnitOptions m_nanoseconds_options; // [[NanosecondsOptions]]
|
||||
Optional<u8> m_fractional_digits; // [[FractionalDigits]]
|
||||
};
|
||||
|
||||
struct DurationInstanceComponent {
|
||||
double (Temporal::Duration::*value_slot)() const;
|
||||
DurationFormat::ValueStyle (DurationFormat::*get_style_slot)() const;
|
||||
void (DurationFormat::*set_style_slot)(DurationFormat::ValueStyle);
|
||||
DurationFormat::Display (DurationFormat::*get_display_slot)() const;
|
||||
void (DurationFormat::*set_display_slot)(DurationFormat::Display);
|
||||
DurationFormat::DurationUnitOptions (DurationFormat::*get_internal_slot)() const;
|
||||
void (DurationFormat::*set_internal_slot)(DurationFormat::DurationUnitOptions);
|
||||
DurationFormat::Unit unit;
|
||||
ReadonlySpan<StringView> values;
|
||||
ReadonlySpan<StringView> styles;
|
||||
DurationFormat::ValueStyle digital_default;
|
||||
};
|
||||
|
||||
// Table 20: Internal slots and property names of DurationFormat instances relevant to Intl.DurationFormat constructor, https://tc39.es/ecma402/#table-durationformat
|
||||
// Table 23: DurationFormat instance internal slots and properties relevant to PartitionDurationFormatPattern, https://tc39.es/ecma402/#table-partition-duration-format-pattern
|
||||
static constexpr auto date_values = AK::Array { "long"sv, "short"sv, "narrow"sv };
|
||||
static constexpr auto time_values = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv, "2-digit"sv };
|
||||
static constexpr auto sub_second_values = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv };
|
||||
// Table 24: DurationFormat instance internal slots and properties relevant to PartitionDurationFormatPattern, https://tc39.es/ecma402/#table-partition-duration-format-pattern
|
||||
static constexpr auto date_styles = AK::Array { "long"sv, "short"sv, "narrow"sv };
|
||||
static constexpr auto time_styles = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv, "2-digit"sv };
|
||||
static constexpr auto sub_second_styles = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv };
|
||||
|
||||
static constexpr auto duration_instances_components = to_array<DurationInstanceComponent>({
|
||||
{ &Temporal::Duration::years, &DurationFormat::years_style, &DurationFormat::set_years_style, &DurationFormat::years_display, &DurationFormat::set_years_display, DurationFormat::Unit::Years, date_values, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::months, &DurationFormat::months_style, &DurationFormat::set_months_style, &DurationFormat::months_display, &DurationFormat::set_months_display, DurationFormat::Unit::Months, date_values, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::weeks, &DurationFormat::weeks_style, &DurationFormat::set_weeks_style, &DurationFormat::weeks_display, &DurationFormat::set_weeks_display, DurationFormat::Unit::Weeks, date_values, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::days, &DurationFormat::days_style, &DurationFormat::set_days_style, &DurationFormat::days_display, &DurationFormat::set_days_display, DurationFormat::Unit::Days, date_values, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::hours, &DurationFormat::hours_style, &DurationFormat::set_hours_style, &DurationFormat::hours_display, &DurationFormat::set_hours_display, DurationFormat::Unit::Hours, time_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::minutes, &DurationFormat::minutes_style, &DurationFormat::set_minutes_style, &DurationFormat::minutes_display, &DurationFormat::set_minutes_display, DurationFormat::Unit::Minutes, time_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::seconds, &DurationFormat::seconds_style, &DurationFormat::set_seconds_style, &DurationFormat::seconds_display, &DurationFormat::set_seconds_display, DurationFormat::Unit::Seconds, time_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::milliseconds, &DurationFormat::milliseconds_style, &DurationFormat::set_milliseconds_style, &DurationFormat::milliseconds_display, &DurationFormat::set_milliseconds_display, DurationFormat::Unit::Milliseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::microseconds, &DurationFormat::microseconds_style, &DurationFormat::set_microseconds_style, &DurationFormat::microseconds_display, &DurationFormat::set_microseconds_display, DurationFormat::Unit::Microseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::nanoseconds, &DurationFormat::nanoseconds_style, &DurationFormat::set_nanoseconds_style, &DurationFormat::nanoseconds_display, &DurationFormat::set_nanoseconds_display, DurationFormat::Unit::Nanoseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::years, &DurationFormat::years_options, &DurationFormat::set_years_options, DurationFormat::Unit::Years, date_styles, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::months, &DurationFormat::months_options, &DurationFormat::set_months_options, DurationFormat::Unit::Months, date_styles, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::weeks, &DurationFormat::weeks_options, &DurationFormat::set_weeks_options, DurationFormat::Unit::Weeks, date_styles, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::days, &DurationFormat::days_options, &DurationFormat::set_days_options, DurationFormat::Unit::Days, date_styles, DurationFormat::ValueStyle::Short },
|
||||
{ &Temporal::Duration::hours, &DurationFormat::hours_options, &DurationFormat::set_hours_options, DurationFormat::Unit::Hours, time_styles, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::minutes, &DurationFormat::minutes_options, &DurationFormat::set_minutes_options, DurationFormat::Unit::Minutes, time_styles, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::seconds, &DurationFormat::seconds_options, &DurationFormat::set_seconds_options, DurationFormat::Unit::Seconds, time_styles, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::milliseconds, &DurationFormat::milliseconds_options, &DurationFormat::set_milliseconds_options, DurationFormat::Unit::Milliseconds, sub_second_styles, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::microseconds, &DurationFormat::microseconds_options, &DurationFormat::set_microseconds_options, DurationFormat::Unit::Microseconds, sub_second_styles, DurationFormat::ValueStyle::Numeric },
|
||||
{ &Temporal::Duration::nanoseconds, &DurationFormat::nanoseconds_options, &DurationFormat::set_nanoseconds_options, DurationFormat::Unit::Nanoseconds, sub_second_styles, DurationFormat::ValueStyle::Numeric },
|
||||
});
|
||||
|
||||
struct DurationUnitOptions {
|
||||
DurationFormat::ValueStyle style;
|
||||
DurationFormat::Display display;
|
||||
};
|
||||
|
||||
struct DurationFormatPart {
|
||||
StringView type;
|
||||
String value;
|
||||
StringView unit;
|
||||
};
|
||||
|
||||
ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM&, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours);
|
||||
ThrowCompletionOr<DurationFormat::DurationUnitOptions> get_duration_unit_options(VM&, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours);
|
||||
Crypto::BigFraction compute_fractional_digits(DurationFormat const&, Temporal::Duration const&);
|
||||
bool next_unit_fractional(DurationFormat const&, DurationFormat::Unit unit);
|
||||
Vector<DurationFormatPart> format_numeric_hours(VM&, DurationFormat const&, MathematicalValue const& hours_value, bool sign_displayed);
|
||||
Vector<DurationFormatPart> format_numeric_minutes(VM&, DurationFormat const&, MathematicalValue const& minutes_value, bool hours_displayed, bool sign_displayed);
|
||||
Vector<DurationFormatPart> format_numeric_seconds(VM&, DurationFormat const&, MathematicalValue const& seconds_value, bool minutes_displayed, bool sign_displayed);
|
||||
Vector<DurationFormatPart> format_numeric_units(VM&, DurationFormat const&, Temporal::Duration const&, DurationFormat::Unit first_numeric_unit, bool sign_displayed);
|
||||
bool is_fractional_second_unit_name(DurationFormat::Unit);
|
||||
Vector<DurationFormatPart> list_format_parts(VM&, DurationFormat const&, Vector<Vector<DurationFormatPart>>& partitioned_parts_list);
|
||||
Vector<DurationFormatPart> partition_duration_format_pattern(VM&, DurationFormat const&, Temporal::Duration const&);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue