diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeLocale.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeLocale.cpp index 20fd806cc4..93d2cd5263 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeLocale.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeLocale.cpp @@ -42,6 +42,7 @@ struct UnicodeLocaleData { HashMap script_aliases; HashMap variant_aliases; HashMap subdivision_aliases; + HashMap complex_mappings; }; static void write_to_file_if_different(Core::File& file, StringView contents) @@ -72,10 +73,14 @@ static void parse_core_aliases(String core_supplemental_path, UnicodeLocaleData& auto const& metadata_object = supplemental_object.as_object().get("metadata"sv); auto const& alias_object = metadata_object.as_object().get("alias"sv); - auto append_aliases = [](auto& alias_object, auto& alias_map) { + auto append_aliases = [&](auto& alias_object, auto& alias_map) { alias_object.as_object().for_each_member([&](auto const& key, JsonValue const& value) { auto alias = value.as_object().get("_replacement"sv).as_string(); - alias_map.set(key, move(alias)); + + if (key.contains('-')) + locale_data.complex_mappings.set(key, move(alias)); + else + alias_map.set(key, move(alias)); }); }; @@ -343,6 +348,8 @@ Optional currency_from_string(StringView const& currency); Optional resolve_variant_alias(StringView const& variant); Optional resolve_subdivision_alias(StringView const& subdivision); +void resolve_complex_language_aliases(Unicode::LanguageID& language_id); + } } @@ -362,6 +369,7 @@ static void generate_unicode_locale_implementation(Core::File& file, UnicodeLoca #include #include #include +#include #include namespace Unicode { @@ -448,6 +456,54 @@ static constexpr Array, @size@> @name@ { { append_mapping("s_scripts"sv, "s_scripts_{}", locale_data.scripts, [](auto const& value) { return value.scripts; }); append_mapping("s_currencies"sv, "s_currencies_{}", locale_data.currencies, [](auto const& value) { return value.currencies; }); + generator.append(R"~~~( +struct LanguageMapping { + Unicode::LanguageID key; + Unicode::LanguageID alias; +}; +)~~~"); + + auto append_complex_mapping = [&](StringView name, auto const& mappings) { + generator.set("name"sv, name); + generator.append(R"~~~( +static auto const& ensure_@name@_map() +{ + static Vector @name@_map; + + auto append_mapping = [&](StringView key, StringView alias) { + if (auto key_value = Unicode::parse_unicode_language_id(key); key_value.has_value()) { + if (auto alias_value = Unicode::parse_unicode_language_id(alias); alias_value.has_value()) + @name@_map.append({ key_value.release_value(), alias_value.release_value() }); + } + }; +)~~~"); + + auto keys = mappings.keys(); + quick_sort(keys, [](auto const& lhs, auto const& rhs) { + // Sort the keys such that "und" language tags are at the end, as those are less specific. + if (lhs.starts_with("und"sv) && !rhs.starts_with("und"sv)) + return false; + if (!lhs.starts_with("und"sv) && rhs.starts_with("und"sv)) + return true; + return lhs < rhs; + }); + + for (auto const& key : keys) { + generator.set("key"sv, key); + generator.set("alias"sv, mappings.get(key).value()); + generator.append(R"~~~( + append_mapping("@key@"sv, "@alias@"sv);)~~~"); + } + + generator.append(R"~~~( + + return @name@_map; +} +)~~~"); + }; + + append_complex_mapping("complex_alias"sv, locale_data.complex_mappings); + generator.append(R"~~~( namespace Detail { )~~~"); @@ -513,14 +569,24 @@ Optional<@enum_title@> @enum_snake@_from_string(StringView const& @enum_snake@) generator.append(R"~~~( Optional resolve_@enum_snake@_alias(StringView const& @enum_snake@) { - static HashMap @enum_snake@_aliases { {)~~~"); + static HashMap @enum_snake@_aliases { { + )~~~"); + + constexpr size_t max_values_per_row = 10; + size_t values_in_current_row = 0; for (auto const& alias : aliases) { + if (values_in_current_row++ > 0) + generator.append(" "); + generator.set("key"sv, alias.key); generator.set("alias"sv, alias.value); + generator.append("{ \"@key@\"sv, \"@alias@\"sv },"); - generator.append(R"~~~( - { "@key@"sv, "@alias@"sv },)~~~"); + if (values_in_current_row == max_values_per_row) { + generator.append("\n "); + values_in_current_row = 0; + } } generator.append(R"~~~( @@ -554,6 +620,35 @@ Optional resolve_@enum_snake@_alias(StringView const& @enum_snake@) append_alias_search("subdivision"sv, locale_data.subdivision_aliases); generator.append(R"~~~( +void resolve_complex_language_aliases(Unicode::LanguageID& language_id) +{ + static auto const& complex_alias_map = ensure_complex_alias_map(); + + for (auto const& map : complex_alias_map) { + if ((map.key.language != language_id.language) && (map.key.language != "und"sv)) + continue; + if (map.key.script.has_value() && (map.key.script != language_id.script)) + continue; + if (map.key.region.has_value() && (map.key.region != language_id.region)) + continue; + if (!map.key.variants.is_empty() && (map.key.variants != language_id.variants)) + continue; + + auto alias = map.alias; + if (alias.language == "und"sv) + alias.language = move(language_id.language); + if (!map.key.script.has_value() && !alias.script.has_value()) + alias.script = move(language_id.script); + if (!map.key.region.has_value() && !alias.region.has_value()) + alias.region = move(language_id.region); + if (map.key.variants.is_empty() && alias.variants.is_empty()) + alias.variants = move(language_id.variants); + + language_id = move(alias); + break; + } +} + } } diff --git a/Userland/Libraries/LibUnicode/Forward.h b/Userland/Libraries/LibUnicode/Forward.h index 2e9e19c43d..56796ee6ea 100644 --- a/Userland/Libraries/LibUnicode/Forward.h +++ b/Userland/Libraries/LibUnicode/Forward.h @@ -19,6 +19,7 @@ enum class Script : u8; enum class Territory : u8; enum class WordBreakProperty : u8; +struct LanguageID; struct SpecialCasing; struct UnicodeData;