RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:48:12 +00:00
Code Issues Activity Actions

LibUnicode: Convert UnicodeDateTimeFormat to link with weak symbols

Browse source
This commit is contained in:
Timothy Flynn 2022-01-04 11:29:42 -05:00 • committed by Linus Groh
parent 98709d9be1
commit ba4cdf34f8
6 changed files with 85 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp
View file

@ -1598,7 +1598,7 @@ static void generate_unicode_locale_implementation(Core::File& file, UnicodeLoca
#include <LibUnicode/Locale.h> #include <LibUnicode/Locale.h>
#include <LibUnicode/UnicodeDateTimeFormat.h> #include <LibUnicode/UnicodeDateTimeFormat.h>
namespace Unicode::Detail { namespace Unicode {
)~~~"); )~~~");
locale_data.unique_strings.generate(generator); locale_data.unique_strings.generate(generator);
@ -1608,32 +1608,32 @@ template <typename SourceType, typename TargetType>
static void convert_calendar_fields(SourceType const& source, TargetType& target) static void convert_calendar_fields(SourceType const& source, TargetType& target)
{ {
if (source.era != -1) if (source.era != -1)
target.era = static_cast<Unicode::CalendarPatternStyle>(source.era); target.era = static_cast<CalendarPatternStyle>(source.era);
if (source.year != -1) if (source.year != -1)
target.year = static_cast<Unicode::CalendarPatternStyle>(source.year); target.year = static_cast<CalendarPatternStyle>(source.year);
if (source.month != -1) if (source.month != -1)
target.month = static_cast<Unicode::CalendarPatternStyle>(source.month); target.month = static_cast<CalendarPatternStyle>(source.month);
if (source.weekday != -1) if (source.weekday != -1)
target.weekday = static_cast<Unicode::CalendarPatternStyle>(source.weekday); target.weekday = static_cast<CalendarPatternStyle>(source.weekday);
if (source.day != -1) if (source.day != -1)
target.day = static_cast<Unicode::CalendarPatternStyle>(source.day); target.day = static_cast<CalendarPatternStyle>(source.day);
if (source.day_period != -1) if (source.day_period != -1)
target.day_period = static_cast<Unicode::CalendarPatternStyle>(source.day_period); target.day_period = static_cast<CalendarPatternStyle>(source.day_period);
if (source.hour != -1) if (source.hour != -1)
target.hour = static_cast<Unicode::CalendarPatternStyle>(source.hour); target.hour = static_cast<CalendarPatternStyle>(source.hour);
if (source.minute != -1) if (source.minute != -1)
target.minute = static_cast<Unicode::CalendarPatternStyle>(source.minute); target.minute = static_cast<CalendarPatternStyle>(source.minute);
if (source.second != -1) if (source.second != -1)
target.second = static_cast<Unicode::CalendarPatternStyle>(source.second); target.second = static_cast<CalendarPatternStyle>(source.second);
if (source.fractional_second_digits != -1) if (source.fractional_second_digits != -1)
target.fractional_second_digits = static_cast<u8>(source.fractional_second_digits); target.fractional_second_digits = static_cast<u8>(source.fractional_second_digits);
if (source.time_zone_name != -1) if (source.time_zone_name != -1)
target.time_zone_name = static_cast<Unicode::CalendarPatternStyle>(source.time_zone_name); target.time_zone_name = static_cast<CalendarPatternStyle>(source.time_zone_name);
} }
struct CalendarPattern { struct CalendarPatternImpl {
Unicode::CalendarPattern to_unicode_calendar_pattern() const { CalendarPattern to_unicode_calendar_pattern() const {
Unicode::CalendarPattern calendar_pattern {}; CalendarPattern calendar_pattern {};
calendar_pattern.skeleton = s_string_list[skeleton]; calendar_pattern.skeleton = s_string_list[skeleton];
calendar_pattern.pattern = s_string_list[pattern]; calendar_pattern.pattern = s_string_list[pattern];
@ -1661,12 +1661,12 @@ struct CalendarPattern {
i8 time_zone_name { -1 }; i8 time_zone_name { -1 };
}; };
struct CalendarRangePattern { struct CalendarRangePatternImpl {
Unicode::CalendarRangePattern to_unicode_calendar_range_pattern() const { CalendarRangePattern to_unicode_calendar_range_pattern() const {
Unicode::CalendarRangePattern calendar_range_pattern {}; CalendarRangePattern calendar_range_pattern {};
if (field != -1) if (field != -1)
calendar_range_pattern.field = static_cast<Unicode::CalendarRangePattern::Field>(field); calendar_range_pattern.field = static_cast<CalendarRangePattern::Field>(field);
calendar_range_pattern.start_range = s_string_list[start_range]; calendar_range_pattern.start_range = s_string_list[start_range];
calendar_range_pattern.separator = s_string_list[separator]; calendar_range_pattern.separator = s_string_list[separator];
calendar_range_pattern.end_range = s_string_list[end_range]; calendar_range_pattern.end_range = s_string_list[end_range];
@ -1695,15 +1695,15 @@ struct CalendarRangePattern {
}; };
)~~~"); )~~~");
locale_data.unique_patterns.generate(generator, "CalendarPattern"sv, "s_calendar_patterns"sv, 10); locale_data.unique_patterns.generate(generator, "CalendarPatternImpl"sv, "s_calendar_patterns"sv, 10);
locale_data.unique_pattern_lists.generate(generator, s_calendar_pattern_index_type, "s_calendar_pattern_lists"sv); locale_data.unique_pattern_lists.generate(generator, s_calendar_pattern_index_type, "s_calendar_pattern_lists"sv);
locale_data.unique_range_patterns.generate(generator, "CalendarRangePattern"sv, "s_calendar_range_patterns"sv, 10); locale_data.unique_range_patterns.generate(generator, "CalendarRangePatternImpl"sv, "s_calendar_range_patterns"sv, 10);
locale_data.unique_range_pattern_lists.generate(generator, s_calendar_range_pattern_index_type, "s_calendar_range_pattern_lists"sv); locale_data.unique_range_pattern_lists.generate(generator, s_calendar_range_pattern_index_type, "s_calendar_range_pattern_lists"sv);
generator.append(R"~~~( generator.append(R"~~~(
struct CalendarFormat { struct CalendarFormatImpl {
Unicode::CalendarFormat to_unicode_calendar_format() const { CalendarFormat to_unicode_calendar_format() const {
Unicode::CalendarFormat calendar_format {}; CalendarFormat calendar_format {};
calendar_format.full_format = s_calendar_patterns[full_format].to_unicode_calendar_pattern(); calendar_format.full_format = s_calendar_patterns[full_format].to_unicode_calendar_pattern();
calendar_format.long_format = s_calendar_patterns[long_format].to_unicode_calendar_pattern(); calendar_format.long_format = s_calendar_patterns[long_format].to_unicode_calendar_pattern();
@ -1754,7 +1754,7 @@ struct DayPeriodData {
}; };
)~~~"); )~~~");
locale_data.unique_formats.generate(generator, "CalendarFormat"sv, "s_calendar_formats"sv, 10); locale_data.unique_formats.generate(generator, "CalendarFormatImpl"sv, "s_calendar_formats"sv, 10);
locale_data.unique_symbol_lists.generate(generator, s_string_index_type, "s_symbol_lists"sv); locale_data.unique_symbol_lists.generate(generator, s_string_index_type, "s_symbol_lists"sv);
locale_data.unique_calendar_symbols.generate(generator, "CalendarSymbols"sv, "s_calendar_symbols"sv, 10); locale_data.unique_calendar_symbols.generate(generator, "CalendarSymbols"sv, "s_calendar_symbols"sv, 10);
locale_data.unique_calendar_symbols_lists.generate(generator, s_calendar_symbols_index_type, "s_calendar_symbol_lists"sv); locale_data.unique_calendar_symbols_lists.generate(generator, s_calendar_symbols_index_type, "s_calendar_symbol_lists"sv);
@ -1833,8 +1833,7 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
append_from_string("TimeZone"sv, "time_zone"sv, locale_data.time_zones); append_from_string("TimeZone"sv, "time_zone"sv, locale_data.time_zones);
generator.append(R"~~~( generator.append(R"~~~(
Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView region) asm("unicode_get_regional_hour_cycles"); Vector<HourCycle> get_regional_hour_cycles(StringView region)
Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView region)
{ {
auto region_value = hour_cycle_region_from_string(region); auto region_value = hour_cycle_region_from_string(region);
if (!region_value.has_value()) if (!region_value.has_value())
@ -1845,11 +1844,11 @@ Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView region)
auto regional_hour_cycles_index = s_hour_cycles.at(region_index); auto regional_hour_cycles_index = s_hour_cycles.at(region_index);
auto const& regional_hour_cycles = s_hour_cycle_lists.at(regional_hour_cycles_index); auto const& regional_hour_cycles = s_hour_cycle_lists.at(regional_hour_cycles_index);
Vector<Unicode::HourCycle> hour_cycles; Vector<HourCycle> hour_cycles;
hour_cycles.ensure_capacity(regional_hour_cycles.size()); hour_cycles.ensure_capacity(regional_hour_cycles.size());
for (auto hour_cycle : regional_hour_cycles) for (auto hour_cycle : regional_hour_cycles)
hour_cycles.unchecked_append(static_cast<Unicode::HourCycle>(hour_cycle)); hour_cycles.unchecked_append(static_cast<HourCycle>(hour_cycle));
return hour_cycles; return hour_cycles;
} }
@ -1873,8 +1872,7 @@ static CalendarData const* find_calendar_data(StringView locale, StringView cale
return &s_calendars[calendar_index]; return &s_calendars[calendar_index];
} }
Optional<Unicode::CalendarFormat> get_calendar_date_format(StringView locale, StringView calendar) asm("unicode_get_calendar_date_format"); Optional<CalendarFormat> get_calendar_date_format(StringView locale, StringView calendar)
Optional<Unicode::CalendarFormat> get_calendar_date_format(StringView locale, StringView calendar)
{ {
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& formats = s_calendar_formats.at(data->date_formats); auto const& formats = s_calendar_formats.at(data->date_formats);
@ -1883,8 +1881,7 @@ Optional<Unicode::CalendarFormat> get_calendar_date_format(StringView locale, St
return {}; return {};
} }
Optional<Unicode::CalendarFormat> get_calendar_time_format(StringView locale, StringView calendar) asm("unicode_get_calendar_time_format"); Optional<CalendarFormat> get_calendar_time_format(StringView locale, StringView calendar)
Optional<Unicode::CalendarFormat> get_calendar_time_format(StringView locale, StringView calendar)
{ {
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& formats = s_calendar_formats.at(data->time_formats); auto const& formats = s_calendar_formats.at(data->time_formats);
@ -1893,8 +1890,7 @@ Optional<Unicode::CalendarFormat> get_calendar_time_format(StringView locale, St
return {}; return {};
} }
Optional<Unicode::CalendarFormat> get_calendar_date_time_format(StringView locale, StringView calendar) asm("unicode_get_calendar_date_time_format"); Optional<CalendarFormat> get_calendar_date_time_format(StringView locale, StringView calendar)
Optional<Unicode::CalendarFormat> get_calendar_date_time_format(StringView locale, StringView calendar)
{ {
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& formats = s_calendar_formats.at(data->date_time_formats); auto const& formats = s_calendar_formats.at(data->date_time_formats);
@ -1903,10 +1899,9 @@ Optional<Unicode::CalendarFormat> get_calendar_date_time_format(StringView local
return {}; return {};
} }
Vector<Unicode::CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar) asm("unicode_get_calendar_available_formats"); Vector<CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar)
Vector<Unicode::CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar)
{ {
Vector<Unicode::CalendarPattern> result {}; Vector<CalendarPattern> result {};
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& available_formats = s_calendar_pattern_lists.at(data->available_formats); auto const& available_formats = s_calendar_pattern_lists.at(data->available_formats);
@ -1919,8 +1914,7 @@ Vector<Unicode::CalendarPattern> get_calendar_available_formats(StringView local
return result; return result;
} }
Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar) asm("unicode_get_calendar_default_range_format"); Optional<CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar)
Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar)
{ {
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& pattern = s_calendar_range_patterns[data->default_range_format]; auto const& pattern = s_calendar_range_patterns[data->default_range_format];
@ -1930,10 +1924,9 @@ Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(String
return {}; return {};
} }
Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton) asm("unicode_get_calendar_range_formats"); Vector<CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton)
Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton)
{ {
Vector<Unicode::CalendarRangePattern> result {}; Vector<CalendarRangePattern> result {};
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& range_formats = s_calendar_range_pattern_lists.at(data->range_formats); auto const& range_formats = s_calendar_range_pattern_lists.at(data->range_formats);
@ -1949,10 +1942,9 @@ Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView loca
return result; return result;
} }
Vector<Unicode::CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton) asm("unicode_get_calendar_range12_formats"); Vector<CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton)
Vector<Unicode::CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton)
{ {
Vector<Unicode::CalendarRangePattern> result {}; Vector<CalendarRangePattern> result {};
if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) { if (auto const* data = find_calendar_data(locale, calendar); data != nullptr) {
auto const& range12_formats = s_calendar_range_pattern_lists.at(data->range12_formats); auto const& range12_formats = s_calendar_range_pattern_lists.at(data->range12_formats);
@ -1999,7 +1991,6 @@ static Span<@string_index_type@ const> find_calendar_symbols(StringView locale,
return {}; return {};
} }
Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Era value) asm("unicode_get_calendar_era_symbol");
Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Era value) Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Era value)
{ {
auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Era, style); auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Era, style);
@ -2010,7 +2001,6 @@ Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calen
return {}; return {};
} }
Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Month value) asm("unicode_get_calendar_month_symbol");
Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Month value) Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Month value)
{ {
auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Month, style); auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Month, style);
@ -2021,7 +2011,6 @@ Optional<StringView> get_calendar_month_symbol(StringView locale, StringView cal
return {}; return {};
} }
Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Weekday value) asm("unicode_get_calendar_weekday_symbol");
Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Weekday value) Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Weekday value)
{ {
auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Weekday, style); auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::Weekday, style);
@ -2032,7 +2021,6 @@ Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView c
return {}; return {};
} }
Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, DayPeriod value) asm("unicode_get_calendar_day_period_symbol");
Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, DayPeriod value) Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, DayPeriod value)
{ {
auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::DayPeriod, style); auto symbols = find_calendar_symbols(locale, calendar, CalendarSymbol::DayPeriod, style);
@ -2043,7 +2031,6 @@ Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringVie
return {}; return {};
} }
Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour) asm("unicode_get_calendar_day_period_symbol_for_hour");
Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour) Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour)
{ {
auto locale_value = locale_from_string(locale); auto locale_value = locale_from_string(locale);
@ -2059,16 +2046,16 @@ Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale,
auto const& day_period = s_day_periods[day_period_index]; auto const& day_period = s_day_periods[day_period_index];
if ((day_period.begin <= hour) && (hour < day_period.end)) { if ((day_period.begin <= hour) && (hour < day_period.end)) {
auto period = static_cast<Unicode::DayPeriod>(day_period.day_period); auto period = static_cast<DayPeriod>(day_period.day_period);
return Detail::get_calendar_day_period_symbol(locale, calendar, style, period); return get_calendar_day_period_symbol(locale, calendar, style, period);
} }
} }
// Fallback to fixed periods if the locale does not have flexible day periods. // Fallback to fixed periods if the locale does not have flexible day periods.
// TR-35 states that the meaning of AM and PM does not change with locale. // TR-35 states that the meaning of AM and PM does not change with locale.
if (hour < 12) if (hour < 12)
return Detail::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::AM); return get_calendar_day_period_symbol(locale, calendar, style, DayPeriod::AM);
return Detail::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::PM); return get_calendar_day_period_symbol(locale, calendar, style, DayPeriod::PM);
} }
static TimeZoneFormat const* find_time_zone_formats(StringView locale) static TimeZoneFormat const* find_time_zone_formats(StringView locale)
@ -2103,7 +2090,6 @@ static TimeZoneData const* find_time_zone_data(StringView locale, StringView tim
return &s_time_zones[time_zone_index]; return &s_time_zones[time_zone_index];
} }
Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style) asm("unicode_get_time_zone_name");
Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style) Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style)
{ {
// FIXME: This becomes more complicated when time zones other than UTC are supported. We will need to know the GMT offset // FIXME: This becomes more complicated when time zones other than UTC are supported. We will need to know the GMT offset

101
Userland/Libraries/LibUnicode/DateTimeFormat.cpp
View file

@ -8,7 +8,6 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibUnicode/DateTimeFormat.h> #include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h> #include <LibUnicode/Locale.h>
#include <LibUnicode/UnicodeSymbols.h>
namespace Unicode { namespace Unicode {
@ -90,15 +89,18 @@ StringView calendar_pattern_style_to_string(CalendarPatternStyle style)
} }
} }
// https://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table Optional<Calendar> __attribute__((weak)) calendar_from_string(StringView) { return {}; }
Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView locale) Optional<HourCycleRegion> __attribute__((weak)) hour_cycle_region_from_string(StringView) { return {}; }
{ Optional<TimeZone> __attribute__((weak)) time_zone_from_string(StringView) { return {}; }
static auto const& symbols = Detail::Symbols::ensure_loaded(); Vector<HourCycle> __attribute__((weak)) get_regional_hour_cycles(StringView) { return {}; }
if (auto hour_cycles = symbols.get_regional_hour_cycles(locale); !hour_cycles.is_empty()) // https://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
Vector<Unicode::HourCycle> get_locale_hour_cycles(StringView locale)
{
if (auto hour_cycles = get_regional_hour_cycles(locale); !hour_cycles.is_empty())
return hour_cycles; return hour_cycles;
auto return_default_hour_cycles = [&]() { return symbols.get_regional_hour_cycles("001"sv); }; auto return_default_hour_cycles = [&]() { return get_regional_hour_cycles("001"sv); };
auto language = parse_unicode_language_id(locale); auto language = parse_unicode_language_id(locale);
if (!language.has_value()) if (!language.has_value())
@ -109,7 +111,7 @@ Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView locale)
if (!language.has_value() || !language->region.has_value()) if (!language.has_value() || !language->region.has_value())
return return_default_hour_cycles(); return return_default_hour_cycles();
if (auto hour_cycles = symbols.get_regional_hour_cycles(*language->region); !hour_cycles.is_empty()) if (auto hour_cycles = get_regional_hour_cycles(*language->region); !hour_cycles.is_empty())
return hour_cycles; return hour_cycles;
return return_default_hour_cycles(); return return_default_hour_cycles();
@ -117,7 +119,7 @@ Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView locale)
Optional<Unicode::HourCycle> get_default_regional_hour_cycle(StringView locale) Optional<Unicode::HourCycle> get_default_regional_hour_cycle(StringView locale)
{ {
if (auto hour_cycles = get_regional_hour_cycles(locale); !hour_cycles.is_empty()) if (auto hour_cycles = get_locale_hour_cycles(locale); !hour_cycles.is_empty())
return hour_cycles.first(); return hour_cycles.first();
return {}; return {};
} }
@ -163,80 +165,33 @@ String combine_skeletons(StringView first, StringView second)
return builder.build(); return builder.build();
} }
Optional<CalendarFormat> __attribute__((weak)) get_calendar_date_format(StringView, StringView) { return {}; }
Optional<CalendarFormat> __attribute__((weak)) get_calendar_time_format(StringView, StringView) { return {}; }
Optional<CalendarFormat> __attribute__((weak)) get_calendar_date_time_format(StringView, StringView) { return {}; }
Optional<CalendarFormat> get_calendar_format(StringView locale, StringView calendar, CalendarFormatType type) Optional<CalendarFormat> get_calendar_format(StringView locale, StringView calendar, CalendarFormatType type)
{ {
static auto const& symbols = Detail::Symbols::ensure_loaded();
switch (type) { switch (type) {
case CalendarFormatType::Date: case CalendarFormatType::Date:
return symbols.get_calendar_date_format(locale, calendar); return get_calendar_date_format(locale, calendar);
case CalendarFormatType::Time: case CalendarFormatType::Time:
return symbols.get_calendar_time_format(locale, calendar); return get_calendar_time_format(locale, calendar);
case CalendarFormatType::DateTime: case CalendarFormatType::DateTime:
return symbols.get_calendar_date_time_format(locale, calendar); return get_calendar_date_time_format(locale, calendar);
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
} }
Vector<CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar) Vector<CalendarPattern> __attribute__((weak)) get_calendar_available_formats(StringView, StringView) { return {}; }
{ Optional<CalendarRangePattern> __attribute__((weak)) get_calendar_default_range_format(StringView, StringView) { return {}; }
static auto const& symbols = Detail::Symbols::ensure_loaded(); Vector<CalendarRangePattern> __attribute__((weak)) get_calendar_range_formats(StringView, StringView, StringView) { return {}; }
return symbols.get_calendar_available_formats(locale, calendar); Vector<CalendarRangePattern> __attribute__((weak)) get_calendar_range12_formats(StringView, StringView, StringView) { return {}; }
} Optional<StringView> __attribute__((weak)) get_calendar_era_symbol(StringView, StringView, CalendarPatternStyle, Era) { return {}; }
Optional<StringView> __attribute__((weak)) get_calendar_month_symbol(StringView, StringView, CalendarPatternStyle, Month) { return {}; }
Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar) Optional<StringView> __attribute__((weak)) get_calendar_weekday_symbol(StringView, StringView, CalendarPatternStyle, Weekday) { return {}; }
{ Optional<StringView> __attribute__((weak)) get_calendar_day_period_symbol(StringView, StringView, CalendarPatternStyle, DayPeriod) { return {}; }
static auto const& symbols = Detail::Symbols::ensure_loaded(); Optional<StringView> __attribute__((weak)) get_calendar_day_period_symbol_for_hour(StringView, StringView, CalendarPatternStyle, u8) { return {}; }
return symbols.get_calendar_default_range_format(locale, calendar); Optional<StringView> __attribute__((weak)) get_time_zone_name(StringView, StringView, CalendarPatternStyle) { return {}; }
}
Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_range_formats(locale, calendar, skeleton);
}
Vector<Unicode::CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_range12_formats(locale, calendar, skeleton);
}
Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Era value)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_era_symbol(locale, calendar, style, value);
}
Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Month value)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_month_symbol(locale, calendar, style, value);
}
Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Weekday value)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_weekday_symbol(locale, calendar, style, value);
}
Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::DayPeriod value)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_day_period_symbol(locale, calendar, style, value);
}
Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_calendar_day_period_symbol_for_hour(locale, calendar, style, hour);
}
Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_time_zone_name(locale, time_zone, style);
}
} }

16
Userland/Libraries/LibUnicode/DateTimeFormat.h
View file

@ -168,21 +168,35 @@ enum class CalendarSymbol : u8 {
HourCycle hour_cycle_from_string(StringView hour_cycle); HourCycle hour_cycle_from_string(StringView hour_cycle);
StringView hour_cycle_to_string(HourCycle hour_cycle); StringView hour_cycle_to_string(HourCycle hour_cycle);
CalendarPatternStyle calendar_pattern_style_from_string(StringView style); CalendarPatternStyle calendar_pattern_style_from_string(StringView style);
StringView calendar_pattern_style_to_string(CalendarPatternStyle style); StringView calendar_pattern_style_to_string(CalendarPatternStyle style);
Vector<Unicode::HourCycle> get_regional_hour_cycles(StringView locale);
Optional<Calendar> calendar_from_string(StringView calendar);
Optional<HourCycleRegion> hour_cycle_region_from_string(StringView hour_cycle_region);
Optional<TimeZone> time_zone_from_string(StringView time_zone);
Vector<HourCycle> get_regional_hour_cycles(StringView region);
Vector<Unicode::HourCycle> get_locale_hour_cycles(StringView locale);
Optional<Unicode::HourCycle> get_default_regional_hour_cycle(StringView locale); Optional<Unicode::HourCycle> get_default_regional_hour_cycle(StringView locale);
String combine_skeletons(StringView first, StringView second); String combine_skeletons(StringView first, StringView second);
Optional<CalendarFormat> get_calendar_date_format(StringView locale, StringView calendar);
Optional<CalendarFormat> get_calendar_time_format(StringView locale, StringView calendar);
Optional<CalendarFormat> get_calendar_date_time_format(StringView locale, StringView calendar);
Optional<CalendarFormat> get_calendar_format(StringView locale, StringView calendar, CalendarFormatType type); Optional<CalendarFormat> get_calendar_format(StringView locale, StringView calendar, CalendarFormatType type);
Vector<CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar); Vector<CalendarPattern> get_calendar_available_formats(StringView locale, StringView calendar);
Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar); Optional<Unicode::CalendarRangePattern> get_calendar_default_range_format(StringView locale, StringView calendar);
Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton); Vector<Unicode::CalendarRangePattern> get_calendar_range_formats(StringView locale, StringView calendar, StringView skeleton);
Vector<Unicode::CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton); Vector<Unicode::CalendarRangePattern> get_calendar_range12_formats(StringView locale, StringView calendar, StringView skeleton);
Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Era value); Optional<StringView> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Era value);
Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Month value); Optional<StringView> get_calendar_month_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Month value);
Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Weekday value); Optional<StringView> get_calendar_weekday_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::Weekday value);
Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::DayPeriod value); Optional<StringView> get_calendar_day_period_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Unicode::DayPeriod value);
Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour); Optional<StringView> get_calendar_day_period_symbol_for_hour(StringView locale, StringView calendar, CalendarPatternStyle style, u8 hour);
Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style); Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, CalendarPatternStyle style);
} }

2
Userland/Libraries/LibUnicode/Locale.cpp
View file

@ -789,7 +789,7 @@ Optional<StringView> get_locale_currency_mapping(StringView locale, StringView c
Vector<StringView> get_locale_key_mapping(StringView locale, StringView keyword) Vector<StringView> get_locale_key_mapping(StringView locale, StringView keyword)
{ {
if (keyword == "hc"sv) { if (keyword == "hc"sv) {
auto hour_cycles = get_regional_hour_cycles(locale); auto hour_cycles = get_locale_hour_cycles(locale);
Vector<StringView> values; Vector<StringView> values;
values.ensure_capacity(hour_cycles.size()); values.ensure_capacity(hour_cycles.size());

16
Userland/Libraries/LibUnicode/UnicodeSymbols.cpp
View file

@ -15,7 +15,6 @@
# endif # endif
#else #else
# include <AK/Function.h> # include <AK/Function.h>
# include <LibUnicode/DateTimeFormat.h>
# include <LibUnicode/Locale.h> # include <LibUnicode/Locale.h>
#endif #endif
@ -111,21 +110,6 @@ Symbols const& Symbols::ensure_loaded()
load_symbol(symbols.add_likely_subtags, "unicode_add_likely_subtags"); load_symbol(symbols.add_likely_subtags, "unicode_add_likely_subtags");
load_symbol(symbols.resolve_most_likely_territory, "unicode_resolve_most_likely_territory"); load_symbol(symbols.resolve_most_likely_territory, "unicode_resolve_most_likely_territory");
load_symbol(symbols.get_regional_hour_cycles, "unicode_get_regional_hour_cycles");
load_symbol(symbols.get_calendar_date_format, "unicode_get_calendar_date_format");
load_symbol(symbols.get_calendar_time_format, "unicode_get_calendar_time_format");
load_symbol(symbols.get_calendar_date_time_format, "unicode_get_calendar_date_time_format");
load_symbol(symbols.get_calendar_available_formats, "unicode_get_calendar_available_formats");
load_symbol(symbols.get_calendar_default_range_format, "unicode_get_calendar_default_range_format");
load_symbol(symbols.get_calendar_range_formats, "unicode_get_calendar_range_formats");
load_symbol(symbols.get_calendar_range12_formats, "unicode_get_calendar_range12_formats");
load_symbol(symbols.get_calendar_era_symbol, "unicode_get_calendar_era_symbol");
load_symbol(symbols.get_calendar_month_symbol, "unicode_get_calendar_month_symbol");
load_symbol(symbols.get_calendar_weekday_symbol, "unicode_get_calendar_weekday_symbol");
load_symbol(symbols.get_calendar_day_period_symbol, "unicode_get_calendar_day_period_symbol");
load_symbol(symbols.get_calendar_day_period_symbol_for_hour, "unicode_get_calendar_day_period_symbol_for_hour");
load_symbol(symbols.get_time_zone_name, "unicode_get_time_zone_name");
initialized = true; initialized = true;
return symbols; return symbols;
} }

21
Userland/Libraries/LibUnicode/UnicodeSymbols.h
View file

@ -64,27 +64,6 @@ struct Symbols {
Optional<LanguageID> (*add_likely_subtags)(LanguageID const&); Optional<LanguageID> (*add_likely_subtags)(LanguageID const&);
Optional<String> (*resolve_most_likely_territory)(LanguageID const&); Optional<String> (*resolve_most_likely_territory)(LanguageID const&);
// Loaded from UnicodeDateTimeFormat.cpp:
Vector<HourCycle> (*get_regional_hour_cycles)(StringView) { nullptr };
Optional<CalendarFormat> (*get_calendar_date_format)(StringView, StringView) { nullptr };
Optional<CalendarFormat> (*get_calendar_time_format)(StringView, StringView) { nullptr };
Optional<CalendarFormat> (*get_calendar_date_time_format)(StringView, StringView) { nullptr };
Vector<CalendarPattern> (*get_calendar_available_formats)(StringView, StringView) { nullptr };
Optional<CalendarRangePattern> (*get_calendar_default_range_format)(StringView, StringView) { nullptr };
Vector<CalendarRangePattern> (*get_calendar_range_formats)(StringView, StringView, StringView) { nullptr };
Vector<CalendarRangePattern> (*get_calendar_range12_formats)(StringView, StringView, StringView) { nullptr };
Optional<StringView> (*get_calendar_era_symbol)(StringView, StringView, CalendarPatternStyle, Era) { nullptr };
Optional<StringView> (*get_calendar_month_symbol)(StringView, StringView, CalendarPatternStyle, Month) { nullptr };
Optional<StringView> (*get_calendar_weekday_symbol)(StringView, StringView, CalendarPatternStyle, Weekday) { nullptr };
Optional<StringView> (*get_calendar_day_period_symbol)(StringView, StringView, CalendarPatternStyle, DayPeriod) { nullptr };
Optional<StringView> (*get_calendar_day_period_symbol_for_hour)(StringView, StringView, CalendarPatternStyle, u8) { nullptr };
Optional<StringView> (*get_time_zone_name)(StringView, StringView, CalendarPatternStyle) { nullptr };
private: private:
Symbols() = default; Symbols() = default;
}; };