1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:07:45 +00:00

Userland: Move files destined for LibLocale to the Locale namespace

This commit is contained in:
Timothy Flynn 2022-09-02 12:01:10 -04:00 committed by Tim Flynn
parent 88504b89e1
commit ff48220dca
55 changed files with 720 additions and 716 deletions

View file

@ -21,10 +21,10 @@ namespace JS::Intl {
class DateTimeFormat final
: public Object
, public Unicode::CalendarPattern {
, public ::Locale::CalendarPattern {
JS_OBJECT(DateTimeFormat, Object);
using Patterns = Unicode::CalendarPattern;
using Patterns = ::Locale::CalendarPattern;
public:
enum class Style {
@ -56,9 +56,9 @@ public:
void set_numbering_system(String numbering_system) { m_numbering_system = move(numbering_system); }
bool has_hour_cycle() const { return m_hour_cycle.has_value(); }
Unicode::HourCycle hour_cycle() const { return *m_hour_cycle; }
StringView hour_cycle_string() const { return Unicode::hour_cycle_to_string(*m_hour_cycle); }
void set_hour_cycle(Unicode::HourCycle hour_cycle) { m_hour_cycle = hour_cycle; }
::Locale::HourCycle hour_cycle() const { return *m_hour_cycle; }
StringView hour_cycle_string() const { return ::Locale::hour_cycle_to_string(*m_hour_cycle); }
void set_hour_cycle(::Locale::HourCycle hour_cycle) { m_hour_cycle = hour_cycle; }
void clear_hour_cycle() { m_hour_cycle.clear(); }
String const& time_zone() const { return m_time_zone; }
@ -77,51 +77,51 @@ public:
String const& pattern() const { return Patterns::pattern; };
void set_pattern(String pattern) { Patterns::pattern = move(pattern); }
Span<Unicode::CalendarRangePattern const> range_patterns() const { return m_range_patterns.span(); };
void set_range_patterns(Vector<Unicode::CalendarRangePattern> range_patterns) { m_range_patterns = move(range_patterns); }
Span<::Locale::CalendarRangePattern const> range_patterns() const { return m_range_patterns.span(); };
void set_range_patterns(Vector<::Locale::CalendarRangePattern> range_patterns) { m_range_patterns = move(range_patterns); }
bool has_era() const { return Patterns::era.has_value(); }
Unicode::CalendarPatternStyle era() const { return *Patterns::era; };
StringView era_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::era); }
::Locale::CalendarPatternStyle era() const { return *Patterns::era; };
StringView era_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::era); }
bool has_year() const { return Patterns::year.has_value(); }
Unicode::CalendarPatternStyle year() const { return *Patterns::year; };
StringView year_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::year); }
::Locale::CalendarPatternStyle year() const { return *Patterns::year; };
StringView year_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::year); }
bool has_month() const { return Patterns::month.has_value(); }
Unicode::CalendarPatternStyle month() const { return *Patterns::month; };
StringView month_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::month); }
::Locale::CalendarPatternStyle month() const { return *Patterns::month; };
StringView month_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::month); }
bool has_weekday() const { return Patterns::weekday.has_value(); }
Unicode::CalendarPatternStyle weekday() const { return *Patterns::weekday; };
StringView weekday_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::weekday); }
::Locale::CalendarPatternStyle weekday() const { return *Patterns::weekday; };
StringView weekday_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::weekday); }
bool has_day() const { return Patterns::day.has_value(); }
Unicode::CalendarPatternStyle day() const { return *Patterns::day; };
StringView day_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::day); }
::Locale::CalendarPatternStyle day() const { return *Patterns::day; };
StringView day_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::day); }
bool has_day_period() const { return Patterns::day_period.has_value(); }
Unicode::CalendarPatternStyle day_period() const { return *Patterns::day_period; };
StringView day_period_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::day_period); }
::Locale::CalendarPatternStyle day_period() const { return *Patterns::day_period; };
StringView day_period_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::day_period); }
bool has_hour() const { return Patterns::hour.has_value(); }
Unicode::CalendarPatternStyle hour() const { return *Patterns::hour; };
StringView hour_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::hour); }
::Locale::CalendarPatternStyle hour() const { return *Patterns::hour; };
StringView hour_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::hour); }
bool has_minute() const { return Patterns::minute.has_value(); }
Unicode::CalendarPatternStyle minute() const { return *Patterns::minute; };
StringView minute_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::minute); }
::Locale::CalendarPatternStyle minute() const { return *Patterns::minute; };
StringView minute_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::minute); }
bool has_second() const { return Patterns::second.has_value(); }
Unicode::CalendarPatternStyle second() const { return *Patterns::second; };
StringView second_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::second); }
::Locale::CalendarPatternStyle second() const { return *Patterns::second; };
StringView second_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::second); }
bool has_fractional_second_digits() const { return Patterns::fractional_second_digits.has_value(); }
u8 fractional_second_digits() const { return *Patterns::fractional_second_digits; };
bool has_time_zone_name() const { return Patterns::time_zone_name.has_value(); }
Unicode::CalendarPatternStyle time_zone_name() const { return *Patterns::time_zone_name; };
StringView time_zone_name_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::time_zone_name); }
::Locale::CalendarPatternStyle time_zone_name() const { return *Patterns::time_zone_name; };
StringView time_zone_name_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::time_zone_name); }
NativeFunction* bound_format() const { return m_bound_format; }
void set_bound_format(NativeFunction* bound_format) { m_bound_format = bound_format; }
@ -134,15 +134,15 @@ private:
virtual void visit_edges(Visitor&) override;
String m_locale; // [[Locale]]
String m_calendar; // [[Calendar]]
String m_numbering_system; // [[NumberingSystem]]
Optional<Unicode::HourCycle> m_hour_cycle; // [[HourCycle]]
String m_time_zone; // [[TimeZone]]
Optional<Style> m_date_style; // [[DateStyle]]
Optional<Style> m_time_style; // [[TimeStyle]]
Vector<Unicode::CalendarRangePattern> m_range_patterns; // [[RangePatterns]]
NativeFunction* m_bound_format { nullptr }; // [[BoundFormat]]
String m_locale; // [[Locale]]
String m_calendar; // [[Calendar]]
String m_numbering_system; // [[NumberingSystem]]
Optional<::Locale::HourCycle> m_hour_cycle; // [[HourCycle]]
String m_time_zone; // [[TimeZone]]
Optional<Style> m_date_style; // [[DateStyle]]
Optional<Style> m_time_style; // [[TimeStyle]]
Vector<::Locale::CalendarRangePattern> m_range_patterns; // [[RangePatterns]]
NativeFunction* m_bound_format { nullptr }; // [[BoundFormat]]
String m_data_locale;
};
@ -168,7 +168,7 @@ struct LocalTime {
}
int weekday { 0 }; // [[Weekday]]
Unicode::Era era {}; // [[Era]]
::Locale::Era era {}; // [[Era]]
i32 year { 0 }; // [[Year]]
Value related_year {}; // [[RelatedYear]]
Value year_name {}; // [[YearName]]
@ -181,10 +181,10 @@ struct LocalTime {
};
ThrowCompletionOr<Object*> to_date_time_options(VM&, Value options_value, OptionRequired, OptionDefaults);
Optional<Unicode::CalendarPattern> date_time_style_format(StringView data_locale, DateTimeFormat& date_time_format);
Optional<Unicode::CalendarPattern> basic_format_matcher(Unicode::CalendarPattern const& options, Vector<Unicode::CalendarPattern> formats);
Optional<Unicode::CalendarPattern> best_fit_format_matcher(Unicode::CalendarPattern const& options, Vector<Unicode::CalendarPattern> formats);
ThrowCompletionOr<Vector<PatternPartition>> format_date_time_pattern(VM&, DateTimeFormat&, Vector<PatternPartition> pattern_parts, double time, Unicode::CalendarPattern const* range_format_options);
Optional<::Locale::CalendarPattern> date_time_style_format(StringView data_locale, DateTimeFormat& date_time_format);
Optional<::Locale::CalendarPattern> basic_format_matcher(::Locale::CalendarPattern const& options, Vector<::Locale::CalendarPattern> formats);
Optional<::Locale::CalendarPattern> best_fit_format_matcher(::Locale::CalendarPattern const& options, Vector<::Locale::CalendarPattern> formats);
ThrowCompletionOr<Vector<PatternPartition>> format_date_time_pattern(VM&, DateTimeFormat&, Vector<PatternPartition> pattern_parts, double time, ::Locale::CalendarPattern const* range_format_options);
ThrowCompletionOr<Vector<PatternPartition>> partition_date_time_pattern(VM&, DateTimeFormat&, double time);
ThrowCompletionOr<String> format_date_time(VM&, DateTimeFormat&, double time);
ThrowCompletionOr<Array*> format_date_time_to_parts(VM&, DateTimeFormat&, double time);
@ -194,7 +194,7 @@ ThrowCompletionOr<Array*> format_date_time_range_to_parts(VM&, DateTimeFormat&,
ThrowCompletionOr<LocalTime> to_local_time(VM&, double time, StringView calendar, StringView time_zone);
template<typename Callback>
ThrowCompletionOr<void> for_each_calendar_field(VM& vm, Unicode::CalendarPattern& pattern, Callback&& callback)
ThrowCompletionOr<void> for_each_calendar_field(VM& vm, ::Locale::CalendarPattern& pattern, Callback&& callback)
{
constexpr auto narrow_short_long = AK::Array { "narrow"sv, "short"sv, "long"sv };
constexpr auto two_digit_numeric = AK::Array { "2-digit"sv, "numeric"sv };