mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-09-21 00:38:56 +00:00
LibJS+LibLocale: Replace locale character ordering with ICU
This commit is contained in:
Timothy Flynn
Andreas Kling
parent
e487f91388
commit
d17d131224
Notes:
sideshowbarker
2024-07-17 01:00:06 +09:00
Author: https://github.com/trflynn89
Commit: d17d131224
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/110
5 changed files with 13 additions and 104 deletions
|
|
@ -82,35 +82,6 @@ struct AK::Traits<ListPatterns> : public DefaultTraits<ListPatterns> {
|
|||
static unsigned hash(ListPatterns const& p) { return p.hash(); }
|
||||
};
|
||||
|
||||
struct TextLayout {
|
||||
unsigned hash() const
|
||||
{
|
||||
return character_order.hash();
|
||||
}
|
||||
|
||||
bool operator==(TextLayout const& other) const
|
||||
{
|
||||
return character_order == other.character_order;
|
||||
}
|
||||
|
||||
StringView character_order;
|
||||
};
|
||||
|
||||
template<>
|
||||
struct AK::Formatter<TextLayout> : Formatter<FormatString> {
|
||||
ErrorOr<void> format(FormatBuilder& builder, TextLayout const& patterns)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ CharacterOrder::{} }}"sv,
|
||||
format_identifier({}, patterns.character_order));
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct AK::Traits<TextLayout> : public DefaultTraits<TextLayout> {
|
||||
static unsigned hash(TextLayout const& t) { return t.hash(); }
|
||||
};
|
||||
|
||||
using KeywordList = Vector<size_t>;
|
||||
using ListPatternList = Vector<size_t>;
|
||||
|
||||
|
|
@ -128,7 +99,6 @@ struct CLDR {
|
|||
UniqueStorage<KeywordList> unique_keyword_lists;
|
||||
UniqueStorage<ListPatterns> unique_list_patterns;
|
||||
UniqueStorage<ListPatternList> unique_list_pattern_lists;
|
||||
UniqueStorage<TextLayout> unique_text_layouts;
|
||||
|
||||
HashMap<ByteString, LocaleData> locales;
|
||||
Vector<Alias> locale_aliases;
|
||||
|
|
@ -138,7 +108,6 @@ struct CLDR {
|
|||
HashMap<ByteString, ByteString> keyword_names;
|
||||
|
||||
Vector<ByteString> list_pattern_types;
|
||||
Vector<ByteString> character_orders;
|
||||
};
|
||||
|
||||
// Some parsing is expected to fail. For example, the CLDR contains language mappings
|
||||
|
|
@ -282,37 +251,6 @@ static ErrorOr<void> parse_locale_list_patterns(ByteString misc_path, CLDR& cldr
|
|||
return {};
|
||||
}
|
||||
|
||||
static ErrorOr<void> parse_locale_layout(ByteString misc_path, CLDR& cldr, LocaleData& locale)
|
||||
{
|
||||
LexicalPath layout_path(move(misc_path));
|
||||
layout_path = layout_path.append("layout.json"sv);
|
||||
|
||||
auto locale_layout = TRY(read_json_file(layout_path.string()));
|
||||
auto const& main_object = locale_layout.as_object().get_object("main"sv).value();
|
||||
auto const& locale_object = main_object.get_object(layout_path.parent().basename()).value();
|
||||
auto const& layout_object = locale_object.get_object("layout"sv).value();
|
||||
auto const& orientation_object = layout_object.get_object("orientation"sv).value();
|
||||
|
||||
auto text_layout_character_order = [](StringView key) {
|
||||
if (key == "left-to-right"sv)
|
||||
return "ltr"sv;
|
||||
if (key == "right-to-left"sv)
|
||||
return "rtl"sv;
|
||||
VERIFY_NOT_REACHED();
|
||||
};
|
||||
|
||||
auto character_order = orientation_object.get_byte_string("characterOrder"sv).value();
|
||||
|
||||
TextLayout layout {};
|
||||
layout.character_order = text_layout_character_order(character_order);
|
||||
|
||||
if (!cldr.character_orders.contains_slow(layout.character_order))
|
||||
cldr.character_orders.append(layout.character_order);
|
||||
|
||||
locale.text_layout = cldr.unique_text_layouts.ensure(move(layout));
|
||||
return {};
|
||||
}
|
||||
|
||||
static ErrorOr<void> parse_number_system_keywords(ByteString locale_numbers_path, CLDR& cldr, LocaleData& locale)
|
||||
{
|
||||
LexicalPath numbers_path(move(locale_numbers_path));
|
||||
|
|
@ -523,7 +461,6 @@ static ErrorOr<void> parse_all_locales(ByteString bcp47_path, ByteString core_pa
|
|||
|
||||
auto& locale = cldr.locales.ensure(language);
|
||||
TRY(parse_locale_list_patterns(misc_path, cldr, locale));
|
||||
TRY(parse_locale_layout(misc_path, cldr, locale));
|
||||
return IterationDecision::Continue;
|
||||
}));
|
||||
|
||||
|
|
@ -570,7 +507,6 @@ namespace Locale {
|
|||
|
||||
generate_enum(generator, format_identifier, "Locale"sv, "None"sv, locales, cldr.locale_aliases);
|
||||
generate_enum(generator, format_identifier, "ListPatternType"sv, {}, cldr.list_pattern_types);
|
||||
generate_enum(generator, format_identifier, "CharacterOrder"sv, {}, cldr.character_orders);
|
||||
generate_enum(generator, format_identifier, "Key"sv, {}, keywords);
|
||||
|
||||
for (auto& keyword : cldr.keywords) {
|
||||
|
|
@ -627,10 +563,6 @@ struct Patterns {
|
|||
@string_index_type@ end { 0 };
|
||||
@string_index_type@ pair { 0 };
|
||||
};
|
||||
|
||||
struct TextLayout {
|
||||
CharacterOrder character_order;
|
||||
};
|
||||
)~~~");
|
||||
|
||||
generate_available_values(generator, "get_available_calendars"sv, cldr.keywords.find("ca"sv)->value, cldr.keyword_aliases.find("ca"sv)->value,
|
||||
|
|
@ -677,7 +609,6 @@ ReadonlySpan<StringView> get_available_keyword_values(StringView key)
|
|||
cldr.unique_keyword_lists.generate(generator, string_index_type, "s_keyword_lists"sv);
|
||||
cldr.unique_list_patterns.generate(generator, "Patterns"sv, "s_list_patterns"sv, 10);
|
||||
cldr.unique_list_pattern_lists.generate(generator, cldr.unique_list_patterns.type_that_fits(), "s_list_pattern_lists"sv);
|
||||
cldr.unique_text_layouts.generate(generator, "TextLayout"sv, "s_text_layouts"sv, 30);
|
||||
|
||||
auto append_mapping = [&](auto const& keys, auto const& map, auto type, auto name, auto mapping_getter) {
|
||||
generator.set("type", type);
|
||||
|
|
@ -708,7 +639,6 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
append_mapping(locales, cldr.locales, cldr.unique_keyword_lists.type_that_fits(), "s_collation_numeric_keywords"sv, [&](auto const& locale) { return locale.collation_numeric_keywords; });
|
||||
append_mapping(locales, cldr.locales, cldr.unique_keyword_lists.type_that_fits(), "s_number_system_keywords"sv, [&](auto const& locale) { return locale.number_system_keywords; });
|
||||
append_mapping(locales, cldr.locales, cldr.unique_list_pattern_lists.type_that_fits(), "s_locale_list_patterns"sv, [&](auto const& locale) { return locale.list_patterns; });
|
||||
append_mapping(locales, cldr.locales, cldr.unique_text_layouts.type_that_fits(), "s_locale_text_layouts"sv, [&](auto const& locale) { return locale.text_layout; });
|
||||
|
||||
auto append_from_string = [&](StringView enum_title, StringView enum_snake, auto const& values, Vector<Alias> const& aliases = {}) -> ErrorOr<void> {
|
||||
HashValueMap<ByteString> hashes;
|
||||
|
|
@ -740,9 +670,6 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
|
||||
TRY(append_from_string("ListPatternType"sv, "list_pattern_type"sv, cldr.list_pattern_types));
|
||||
|
||||
TRY(append_from_string("CharacterOrder"sv, "character_order"sv, cldr.character_orders));
|
||||
generate_value_to_string(generator, "{}_to_string"sv, "CharacterOrder"sv, "character_order"sv, format_identifier, cldr.character_orders);
|
||||
|
||||
generator.append(R"~~~(
|
||||
static ReadonlySpan<@string_index_type@> find_keyword_indices(StringView locale, StringView key)
|
||||
{
|
||||
|
|
@ -869,25 +796,6 @@ Optional<ListPatterns> get_locale_list_patterns(StringView locale, StringView li
|
|||
return {};
|
||||
}
|
||||
|
||||
static Optional<TextLayout> text_layout_for_locale(StringView locale)
|
||||
{
|
||||
auto locale_value = locale_from_string(locale);
|
||||
if (!locale_value.has_value())
|
||||
return {};
|
||||
|
||||
auto locale_index = to_underlying(*locale_value) - 1; // Subtract 1 because 0 == Locale::None.
|
||||
|
||||
auto text_layouts_index = s_locale_text_layouts.at(locale_index);
|
||||
return s_text_layouts.at(text_layouts_index);
|
||||
}
|
||||
|
||||
Optional<CharacterOrder> character_order_for_locale(StringView locale)
|
||||
{
|
||||
if (auto text_layout = text_layout_for_locale(locale); text_layout.has_value())
|
||||
return text_layout->character_order;
|
||||
return {};
|
||||
}
|
||||
|
||||
}
|
||||
)~~~");
|
||||
|
||||
|
|
|
|||
|
|
@ -160,10 +160,8 @@ StringView character_direction_of_locale(Locale const& locale_object)
|
|||
VERIFY(::Locale::parse_unicode_locale_id(locale).has_value());
|
||||
|
||||
// 3. If the default general ordering of characters (characterOrder) within a line in locale is right-to-left, return "rtl".
|
||||
// NOTE: LibUnicode handles both LTR and RTL character orders in this call, not just RTL. We then fallback to LTR
|
||||
// below if LibUnicode doesn't conclusively know the character order for this locale.
|
||||
if (auto character_order = ::Locale::character_order_for_locale(locale); character_order.has_value())
|
||||
return ::Locale::character_order_to_string(*character_order);
|
||||
if (::Locale::is_locale_character_ordering_right_to_left(locale))
|
||||
return "rtl"sv;
|
||||
|
||||
// 4. Return "ltr".
|
||||
return "ltr"sv;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ namespace Locale {
|
|||
enum class CalendarFormatType : u8;
|
||||
enum class CalendarPatternStyle : u8;
|
||||
enum class CalendarSymbol : u8;
|
||||
enum class CharacterOrder : u8;
|
||||
enum class CompactNumberFormatType : u8;
|
||||
enum class DayPeriod : u8;
|
||||
enum class Era : u8;
|
||||
|
|
|
|||
|
|
@ -597,9 +597,6 @@ Vector<String> available_currencies()
|
|||
}
|
||||
|
||||
Optional<ListPatterns> __attribute__((weak)) get_locale_list_patterns(StringView, StringView, Style) { return {}; }
|
||||
Optional<CharacterOrder> __attribute__((weak)) character_order_from_string(StringView) { return {}; }
|
||||
StringView __attribute__((weak)) character_order_to_string(CharacterOrder) { return {}; }
|
||||
Optional<CharacterOrder> __attribute__((weak)) character_order_for_locale(StringView) { return {}; }
|
||||
|
||||
static void apply_extensions_to_locale(icu::Locale& locale, icu::Locale const& locale_with_extensions)
|
||||
{
|
||||
|
|
@ -670,6 +667,15 @@ Optional<String> remove_likely_subtags(StringView locale)
|
|||
return MUST(result.to_string());
|
||||
}
|
||||
|
||||
bool is_locale_character_ordering_right_to_left(StringView locale)
|
||||
{
|
||||
auto locale_data = LocaleData::for_locale(locale);
|
||||
if (!locale_data.has_value())
|
||||
return false; // Default to left-to-right
|
||||
|
||||
return static_cast<bool>(locale_data->locale().isRightToLeft());
|
||||
}
|
||||
|
||||
String LanguageID::to_string() const
|
||||
{
|
||||
StringBuilder builder;
|
||||
|
|
|
|||
|
|
@ -173,11 +173,9 @@ Optional<StringView> get_preferred_keyword_value_for_locale(StringView locale, S
|
|||
|
||||
Optional<ListPatterns> get_locale_list_patterns(StringView locale, StringView type, Style style);
|
||||
|
||||
Optional<CharacterOrder> character_order_from_string(StringView character_order);
|
||||
StringView character_order_to_string(CharacterOrder character_order);
|
||||
Optional<CharacterOrder> character_order_for_locale(StringView locale);
|
||||
|
||||
Optional<String> add_likely_subtags(StringView);
|
||||
Optional<String> remove_likely_subtags(StringView);
|
||||
|
||||
bool is_locale_character_ordering_right_to_left(StringView locale);
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue