mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:17:36 +00:00
AK+Everywhere: Rename JsonObject::get() to ::get_deprecated()
This is a preparatory step to making `get()` return `ErrorOr`.
This commit is contained in:
parent
efe4329f9f
commit
1dd6b7f5b7
76 changed files with 671 additions and 671 deletions
|
@ -572,8 +572,8 @@ static ErrorOr<void> parse_hour_cycles(DeprecatedString core_path, CLDR& cldr)
|
|||
time_data_path = time_data_path.append("timeData.json"sv);
|
||||
|
||||
auto time_data = TRY(read_json_file(time_data_path.string()));
|
||||
auto const& supplemental_object = time_data.as_object().get("supplemental"sv);
|
||||
auto const& time_data_object = supplemental_object.as_object().get("timeData"sv);
|
||||
auto const& supplemental_object = time_data.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& time_data_object = supplemental_object.as_object().get_deprecated("timeData"sv);
|
||||
|
||||
auto parse_hour_cycle = [](StringView hour_cycle) -> Optional<Locale::HourCycle> {
|
||||
if (hour_cycle == "h"sv)
|
||||
|
@ -588,7 +588,7 @@ static ErrorOr<void> parse_hour_cycles(DeprecatedString core_path, CLDR& cldr)
|
|||
};
|
||||
|
||||
time_data_object.as_object().for_each_member([&](auto const& key, JsonValue const& value) {
|
||||
auto allowed_hour_cycles_string = value.as_object().get("_allowed"sv).as_string();
|
||||
auto allowed_hour_cycles_string = value.as_object().get_deprecated("_allowed"sv).as_string();
|
||||
auto allowed_hour_cycles = allowed_hour_cycles_string.split_view(' ');
|
||||
|
||||
Vector<Locale::HourCycle> hour_cycles;
|
||||
|
@ -616,8 +616,8 @@ static ErrorOr<void> parse_week_data(DeprecatedString core_path, CLDR& cldr)
|
|||
week_data_path = week_data_path.append("weekData.json"sv);
|
||||
|
||||
auto week_data = TRY(read_json_file(week_data_path.string()));
|
||||
auto const& supplemental_object = week_data.as_object().get("supplemental"sv);
|
||||
auto const& week_data_object = supplemental_object.as_object().get("weekData"sv);
|
||||
auto const& supplemental_object = week_data.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& week_data_object = supplemental_object.as_object().get_deprecated("weekData"sv);
|
||||
|
||||
auto parse_weekday = [](StringView day) -> Locale::Weekday {
|
||||
if (day == "sun"sv)
|
||||
|
@ -647,10 +647,10 @@ static ErrorOr<void> parse_week_data(DeprecatedString core_path, CLDR& cldr)
|
|||
weekday_regions.append(region);
|
||||
};
|
||||
|
||||
auto const& minimum_days_object = week_data_object.as_object().get("minDays"sv);
|
||||
auto const& first_day_object = week_data_object.as_object().get("firstDay"sv);
|
||||
auto const& weekend_start_object = week_data_object.as_object().get("weekendStart"sv);
|
||||
auto const& weekend_end_object = week_data_object.as_object().get("weekendEnd"sv);
|
||||
auto const& minimum_days_object = week_data_object.as_object().get_deprecated("minDays"sv);
|
||||
auto const& first_day_object = week_data_object.as_object().get_deprecated("firstDay"sv);
|
||||
auto const& weekend_start_object = week_data_object.as_object().get_deprecated("weekendStart"sv);
|
||||
auto const& weekend_end_object = week_data_object.as_object().get_deprecated("weekendEnd"sv);
|
||||
|
||||
minimum_days_object.as_object().for_each_member([&](auto const& region, auto const& value) {
|
||||
auto minimum_days = value.as_string().template to_uint<u8>();
|
||||
|
@ -681,14 +681,14 @@ static ErrorOr<void> parse_meta_zones(DeprecatedString core_path, CLDR& cldr)
|
|||
meta_zone_path = meta_zone_path.append("metaZones.json"sv);
|
||||
|
||||
auto meta_zone = TRY(read_json_file(meta_zone_path.string()));
|
||||
auto const& supplemental_object = meta_zone.as_object().get("supplemental"sv);
|
||||
auto const& meta_zone_object = supplemental_object.as_object().get("metaZones"sv);
|
||||
auto const& meta_zone_array = meta_zone_object.as_object().get("metazones"sv);
|
||||
auto const& supplemental_object = meta_zone.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& meta_zone_object = supplemental_object.as_object().get_deprecated("metaZones"sv);
|
||||
auto const& meta_zone_array = meta_zone_object.as_object().get_deprecated("metazones"sv);
|
||||
|
||||
meta_zone_array.as_array().for_each([&](JsonValue const& value) {
|
||||
auto const& mapping = value.as_object().get("mapZone"sv);
|
||||
auto const& meta_zone = mapping.as_object().get("_other"sv);
|
||||
auto const& golden_zone = mapping.as_object().get("_type"sv);
|
||||
auto const& mapping = value.as_object().get_deprecated("mapZone"sv);
|
||||
auto const& meta_zone = mapping.as_object().get_deprecated("_other"sv);
|
||||
auto const& golden_zone = mapping.as_object().get_deprecated("_type"sv);
|
||||
|
||||
if (auto time_zone = TimeZone::time_zone_from_string(golden_zone.as_string()); time_zone.has_value()) {
|
||||
auto& golden_zones = cldr.meta_zones.ensure(meta_zone.as_string());
|
||||
|
@ -1263,9 +1263,9 @@ static void parse_calendar_symbols(Calendar& calendar, JsonObject const& calenda
|
|||
};
|
||||
|
||||
auto parse_era_symbols = [&](auto const& symbols_object) {
|
||||
auto const& narrow_symbols = symbols_object.get("eraNarrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get("eraAbbr"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get("eraNames"sv).as_object();
|
||||
auto const& narrow_symbols = symbols_object.get_deprecated("eraNarrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get_deprecated("eraAbbr"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get_deprecated("eraNames"sv).as_object();
|
||||
auto symbol_lists = create_symbol_lists(2);
|
||||
|
||||
auto append_symbol = [&](auto& symbols, auto const& key, auto symbol) {
|
||||
|
@ -1287,9 +1287,9 @@ static void parse_calendar_symbols(Calendar& calendar, JsonObject const& calenda
|
|||
};
|
||||
|
||||
auto parse_month_symbols = [&](auto const& symbols_object) {
|
||||
auto const& narrow_symbols = symbols_object.get("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get("wide"sv).as_object();
|
||||
auto const& narrow_symbols = symbols_object.get_deprecated("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get_deprecated("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get_deprecated("wide"sv).as_object();
|
||||
auto symbol_lists = create_symbol_lists(12);
|
||||
|
||||
auto append_symbol = [&](auto& symbols, auto const& key, auto symbol) {
|
||||
|
@ -1311,9 +1311,9 @@ static void parse_calendar_symbols(Calendar& calendar, JsonObject const& calenda
|
|||
};
|
||||
|
||||
auto parse_weekday_symbols = [&](auto const& symbols_object) {
|
||||
auto const& narrow_symbols = symbols_object.get("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get("wide"sv).as_object();
|
||||
auto const& narrow_symbols = symbols_object.get_deprecated("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get_deprecated("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get_deprecated("wide"sv).as_object();
|
||||
auto symbol_lists = create_symbol_lists(7);
|
||||
|
||||
auto append_symbol = [&](auto& symbols, auto const& key, auto symbol) {
|
||||
|
@ -1347,9 +1347,9 @@ static void parse_calendar_symbols(Calendar& calendar, JsonObject const& calenda
|
|||
};
|
||||
|
||||
auto parse_day_period_symbols = [&](auto const& symbols_object) {
|
||||
auto const& narrow_symbols = symbols_object.get("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get("wide"sv).as_object();
|
||||
auto const& narrow_symbols = symbols_object.get_deprecated("narrow"sv).as_object();
|
||||
auto const& short_symbols = symbols_object.get_deprecated("abbreviated"sv).as_object();
|
||||
auto const& long_symbols = symbols_object.get_deprecated("wide"sv).as_object();
|
||||
auto symbol_lists = create_symbol_lists(11);
|
||||
|
||||
auto append_symbol = [&](auto& symbols, auto const& key, auto symbol) {
|
||||
|
@ -1370,10 +1370,10 @@ static void parse_calendar_symbols(Calendar& calendar, JsonObject const& calenda
|
|||
store_symbol_lists(Locale::CalendarSymbol::DayPeriod, move(symbol_lists));
|
||||
};
|
||||
|
||||
parse_era_symbols(calendar_object.get("eras"sv).as_object());
|
||||
parse_month_symbols(calendar_object.get("months"sv).as_object().get("format"sv).as_object());
|
||||
parse_weekday_symbols(calendar_object.get("days"sv).as_object().get("format"sv).as_object());
|
||||
parse_day_period_symbols(calendar_object.get("dayPeriods"sv).as_object().get("format"sv).as_object());
|
||||
parse_era_symbols(calendar_object.get_deprecated("eras"sv).as_object());
|
||||
parse_month_symbols(calendar_object.get_deprecated("months"sv).as_object().get_deprecated("format"sv).as_object());
|
||||
parse_weekday_symbols(calendar_object.get_deprecated("days"sv).as_object().get_deprecated("format"sv).as_object());
|
||||
parse_day_period_symbols(calendar_object.get_deprecated("dayPeriods"sv).as_object().get_deprecated("format"sv).as_object());
|
||||
|
||||
calendar.symbols = cldr.unique_calendar_symbols_lists.ensure(move(symbols_list));
|
||||
}
|
||||
|
@ -1385,15 +1385,15 @@ static ErrorOr<void> parse_calendars(DeprecatedString locale_calendars_path, CLD
|
|||
return {};
|
||||
|
||||
auto calendars = TRY(read_json_file(calendars_path.string()));
|
||||
auto const& main_object = calendars.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(calendars_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get("dates"sv);
|
||||
auto const& calendars_object = dates_object.as_object().get("calendars"sv);
|
||||
auto const& main_object = calendars.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(calendars_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get_deprecated("dates"sv);
|
||||
auto const& calendars_object = dates_object.as_object().get_deprecated("calendars"sv);
|
||||
|
||||
auto parse_patterns = [&](auto const& patterns_object, auto const& skeletons_object, Vector<CalendarPattern>* patterns) {
|
||||
auto parse_pattern = [&](auto name) {
|
||||
auto format = patterns_object.get(name);
|
||||
auto skeleton = skeletons_object.get(name);
|
||||
auto format = patterns_object.get_deprecated(name);
|
||||
auto skeleton = skeletons_object.get_deprecated(name);
|
||||
|
||||
auto format_index = parse_date_time_pattern(format.as_string(), skeleton.as_string_or(DeprecatedString::empty()), cldr).value();
|
||||
|
||||
|
@ -1427,19 +1427,19 @@ static ErrorOr<void> parse_calendars(DeprecatedString locale_calendars_path, CLD
|
|||
Vector<CalendarPattern> date_formats;
|
||||
Vector<CalendarPattern> time_formats;
|
||||
|
||||
auto const& date_formats_object = value.as_object().get("dateFormats"sv);
|
||||
auto const& date_skeletons_object = value.as_object().get("dateSkeletons"sv);
|
||||
auto const& date_formats_object = value.as_object().get_deprecated("dateFormats"sv);
|
||||
auto const& date_skeletons_object = value.as_object().get_deprecated("dateSkeletons"sv);
|
||||
calendar.date_formats = parse_patterns(date_formats_object.as_object(), date_skeletons_object.as_object(), &date_formats);
|
||||
|
||||
auto const& time_formats_object = value.as_object().get("timeFormats"sv);
|
||||
auto const& time_skeletons_object = value.as_object().get("timeSkeletons"sv);
|
||||
auto const& time_formats_object = value.as_object().get_deprecated("timeFormats"sv);
|
||||
auto const& time_skeletons_object = value.as_object().get_deprecated("timeSkeletons"sv);
|
||||
calendar.time_formats = parse_patterns(time_formats_object.as_object(), time_skeletons_object.as_object(), &time_formats);
|
||||
|
||||
auto const& standard_date_time_formats_object = value.as_object().get("dateTimeFormats-atTime"sv).as_object().get("standard"sv);
|
||||
auto const& standard_date_time_formats_object = value.as_object().get_deprecated("dateTimeFormats-atTime"sv).as_object().get_deprecated("standard"sv);
|
||||
calendar.date_time_formats = parse_patterns(standard_date_time_formats_object.as_object(), JsonObject {}, nullptr);
|
||||
|
||||
auto const& date_time_formats_object = value.as_object().get("dateTimeFormats"sv);
|
||||
auto const& available_formats_object = date_time_formats_object.as_object().get("availableFormats"sv);
|
||||
auto const& date_time_formats_object = value.as_object().get_deprecated("dateTimeFormats"sv);
|
||||
auto const& available_formats_object = date_time_formats_object.as_object().get_deprecated("availableFormats"sv);
|
||||
available_formats_object.as_object().for_each_member([&](auto const& skeleton, JsonValue const& pattern) {
|
||||
auto pattern_index = parse_date_time_pattern(pattern.as_string(), skeleton, cldr);
|
||||
if (!pattern_index.has_value())
|
||||
|
@ -1455,7 +1455,7 @@ static ErrorOr<void> parse_calendars(DeprecatedString locale_calendars_path, CLD
|
|||
available_formats.append(*pattern_index);
|
||||
});
|
||||
|
||||
auto const& interval_formats_object = date_time_formats_object.as_object().get("intervalFormats"sv);
|
||||
auto const& interval_formats_object = date_time_formats_object.as_object().get_deprecated("intervalFormats"sv);
|
||||
parse_interval_patterns(calendar, interval_formats_object.as_object(), cldr);
|
||||
|
||||
generate_default_patterns(available_formats, cldr);
|
||||
|
@ -1475,24 +1475,24 @@ static ErrorOr<void> parse_time_zone_names(DeprecatedString locale_time_zone_nam
|
|||
time_zone_names_path = time_zone_names_path.append("timeZoneNames.json"sv);
|
||||
|
||||
auto time_zone_names = TRY(read_json_file(time_zone_names_path.string()));
|
||||
auto const& main_object = time_zone_names.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(time_zone_names_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get("dates"sv);
|
||||
auto const& time_zone_names_object = dates_object.as_object().get("timeZoneNames"sv);
|
||||
auto const& meta_zone_object = time_zone_names_object.as_object().get("metazone"sv);
|
||||
auto const& hour_format_string = time_zone_names_object.as_object().get("hourFormat"sv);
|
||||
auto const& gmt_format_string = time_zone_names_object.as_object().get("gmtFormat"sv);
|
||||
auto const& gmt_zero_format_string = time_zone_names_object.as_object().get("gmtZeroFormat"sv);
|
||||
auto const& main_object = time_zone_names.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(time_zone_names_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get_deprecated("dates"sv);
|
||||
auto const& time_zone_names_object = dates_object.as_object().get_deprecated("timeZoneNames"sv);
|
||||
auto const& meta_zone_object = time_zone_names_object.as_object().get_deprecated("metazone"sv);
|
||||
auto const& hour_format_string = time_zone_names_object.as_object().get_deprecated("hourFormat"sv);
|
||||
auto const& gmt_format_string = time_zone_names_object.as_object().get_deprecated("gmtFormat"sv);
|
||||
auto const& gmt_zero_format_string = time_zone_names_object.as_object().get_deprecated("gmtZeroFormat"sv);
|
||||
|
||||
if (meta_zone_object.is_null())
|
||||
return {};
|
||||
|
||||
auto parse_name = [&](StringView type, JsonObject const& meta_zone_object, StringView key) -> Optional<size_t> {
|
||||
auto const& names = meta_zone_object.get(type);
|
||||
auto const& names = meta_zone_object.get_deprecated(type);
|
||||
if (!names.is_object())
|
||||
return {};
|
||||
|
||||
auto const& name = names.as_object().get(key);
|
||||
auto const& name = names.as_object().get_deprecated(key);
|
||||
if (name.is_string())
|
||||
return cldr.unique_strings.ensure(name.as_string());
|
||||
|
||||
|
@ -1567,9 +1567,9 @@ static ErrorOr<void> parse_time_zone_names(DeprecatedString locale_time_zone_nam
|
|||
});
|
||||
|
||||
// The long and short names for UTC are not under the "timeZoneNames/metazone" object, but are under "timeZoneNames/zone/Etc".
|
||||
auto const& zone_object = time_zone_names_object.as_object().get("zone"sv);
|
||||
auto const& etc_object = zone_object.as_object().get("Etc"sv);
|
||||
auto const& utc_object = etc_object.as_object().get("UTC"sv);
|
||||
auto const& zone_object = time_zone_names_object.as_object().get_deprecated("zone"sv);
|
||||
auto const& etc_object = zone_object.as_object().get_deprecated("Etc"sv);
|
||||
auto const& utc_object = etc_object.as_object().get_deprecated("UTC"sv);
|
||||
parse_time_zone("UTC"sv, utc_object.as_object());
|
||||
|
||||
locale.time_zones = cldr.unique_time_zone_lists.ensure(move(time_zones));
|
||||
|
@ -1586,8 +1586,8 @@ static ErrorOr<void> parse_day_periods(DeprecatedString core_path, CLDR& cldr)
|
|||
day_periods_path = day_periods_path.append("dayPeriods.json"sv);
|
||||
|
||||
auto locale_day_periods = TRY(read_json_file(day_periods_path.string()));
|
||||
auto const& supplemental_object = locale_day_periods.as_object().get("supplemental"sv);
|
||||
auto const& day_periods_object = supplemental_object.as_object().get("dayPeriodRuleSet"sv);
|
||||
auto const& supplemental_object = locale_day_periods.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& day_periods_object = supplemental_object.as_object().get_deprecated("dayPeriodRuleSet"sv);
|
||||
|
||||
auto parse_hour = [](auto const& time) {
|
||||
auto hour_end_index = time.find(':').value();
|
||||
|
@ -1608,8 +1608,8 @@ static ErrorOr<void> parse_day_periods(DeprecatedString core_path, CLDR& cldr)
|
|||
if (!day_period.has_value())
|
||||
return {};
|
||||
|
||||
auto begin = parse_hour(ranges.get("_from"sv).as_string());
|
||||
auto end = parse_hour(ranges.get("_before"sv).as_string());
|
||||
auto begin = parse_hour(ranges.get_deprecated("_from"sv).as_string());
|
||||
auto end = parse_hour(ranges.get_deprecated("_before"sv).as_string());
|
||||
|
||||
return DayPeriod { *day_period, begin, end };
|
||||
};
|
||||
|
|
|
@ -254,13 +254,13 @@ static ErrorOr<void> parse_core_aliases(DeprecatedString core_supplemental_path,
|
|||
core_aliases_path = core_aliases_path.append("aliases.json"sv);
|
||||
|
||||
auto core_aliases = TRY(read_json_file(core_aliases_path.string()));
|
||||
auto const& supplemental_object = core_aliases.as_object().get("supplemental"sv);
|
||||
auto const& metadata_object = supplemental_object.as_object().get("metadata"sv);
|
||||
auto const& alias_object = metadata_object.as_object().get("alias"sv);
|
||||
auto const& supplemental_object = core_aliases.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& metadata_object = supplemental_object.as_object().get_deprecated("metadata"sv);
|
||||
auto const& alias_object = metadata_object.as_object().get_deprecated("alias"sv);
|
||||
|
||||
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();
|
||||
auto alias = value.as_object().get_deprecated("_replacement"sv).as_string();
|
||||
|
||||
if (key.contains('-')) {
|
||||
auto mapping = TRY_OR_DISCARD(parse_language_mapping(cldr, key, alias));
|
||||
|
@ -273,11 +273,11 @@ static ErrorOr<void> parse_core_aliases(DeprecatedString core_supplemental_path,
|
|||
});
|
||||
};
|
||||
|
||||
append_aliases(alias_object.as_object().get("languageAlias"sv), cldr.language_aliases);
|
||||
append_aliases(alias_object.as_object().get("territoryAlias"sv), cldr.territory_aliases);
|
||||
append_aliases(alias_object.as_object().get("scriptAlias"sv), cldr.script_aliases);
|
||||
append_aliases(alias_object.as_object().get("variantAlias"sv), cldr.variant_aliases);
|
||||
append_aliases(alias_object.as_object().get("subdivisionAlias"sv), cldr.subdivision_aliases);
|
||||
append_aliases(alias_object.as_object().get_deprecated("languageAlias"sv), cldr.language_aliases);
|
||||
append_aliases(alias_object.as_object().get_deprecated("territoryAlias"sv), cldr.territory_aliases);
|
||||
append_aliases(alias_object.as_object().get_deprecated("scriptAlias"sv), cldr.script_aliases);
|
||||
append_aliases(alias_object.as_object().get_deprecated("variantAlias"sv), cldr.variant_aliases);
|
||||
append_aliases(alias_object.as_object().get_deprecated("subdivisionAlias"sv), cldr.subdivision_aliases);
|
||||
|
||||
return {};
|
||||
}
|
||||
|
@ -288,8 +288,8 @@ static ErrorOr<void> parse_likely_subtags(DeprecatedString core_supplemental_pat
|
|||
likely_subtags_path = likely_subtags_path.append("likelySubtags.json"sv);
|
||||
|
||||
auto likely_subtags = TRY(read_json_file(likely_subtags_path.string()));
|
||||
auto const& supplemental_object = likely_subtags.as_object().get("supplemental"sv);
|
||||
auto const& likely_subtags_object = supplemental_object.as_object().get("likelySubtags"sv);
|
||||
auto const& supplemental_object = likely_subtags.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& likely_subtags_object = supplemental_object.as_object().get_deprecated("likelySubtags"sv);
|
||||
|
||||
likely_subtags_object.as_object().for_each_member([&](auto const& key, JsonValue const& value) {
|
||||
auto mapping = TRY_OR_DISCARD(parse_language_mapping(cldr, key, value.as_string()));
|
||||
|
@ -307,13 +307,13 @@ static ErrorOr<void> parse_identity(DeprecatedString locale_path, CLDR& cldr, Lo
|
|||
languages_path = languages_path.append("languages.json"sv);
|
||||
|
||||
auto languages = TRY(read_json_file(languages_path.string()));
|
||||
auto const& main_object = languages.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(languages_path.parent().basename());
|
||||
auto const& identity_object = locale_object.as_object().get("identity"sv);
|
||||
auto const& language_string = identity_object.as_object().get("language"sv);
|
||||
auto const& territory_string = identity_object.as_object().get("territory"sv);
|
||||
auto const& script_string = identity_object.as_object().get("script"sv);
|
||||
auto const& variant_string = identity_object.as_object().get("variant"sv);
|
||||
auto const& main_object = languages.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(languages_path.parent().basename());
|
||||
auto const& identity_object = locale_object.as_object().get_deprecated("identity"sv);
|
||||
auto const& language_string = identity_object.as_object().get_deprecated("language"sv);
|
||||
auto const& territory_string = identity_object.as_object().get_deprecated("territory"sv);
|
||||
auto const& script_string = identity_object.as_object().get_deprecated("script"sv);
|
||||
auto const& variant_string = identity_object.as_object().get_deprecated("variant"sv);
|
||||
|
||||
locale.language = language_string.as_string();
|
||||
|
||||
|
@ -344,12 +344,12 @@ static ErrorOr<void> parse_locale_display_patterns(DeprecatedString locale_path,
|
|||
locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv);
|
||||
|
||||
auto locale_display_names = TRY(read_json_file(locale_display_names_path.string()));
|
||||
auto const& main_object = locale_display_names.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(locale_display_names_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& locale_display_patterns_object = locale_display_names_object.as_object().get("localeDisplayPattern"sv);
|
||||
auto const& locale_pattern = locale_display_patterns_object.as_object().get("localePattern"sv);
|
||||
auto const& locale_separator = locale_display_patterns_object.as_object().get("localeSeparator"sv);
|
||||
auto const& main_object = locale_display_names.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(locale_display_names_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& locale_display_patterns_object = locale_display_names_object.as_object().get_deprecated("localeDisplayPattern"sv);
|
||||
auto const& locale_pattern = locale_display_patterns_object.as_object().get_deprecated("localePattern"sv);
|
||||
auto const& locale_separator = locale_display_patterns_object.as_object().get_deprecated("localeSeparator"sv);
|
||||
|
||||
DisplayPattern patterns {};
|
||||
patterns.locale_pattern = cldr.unique_strings.ensure(locale_pattern.as_string());
|
||||
|
@ -365,10 +365,10 @@ static ErrorOr<void> preprocess_languages(DeprecatedString locale_path, CLDR& cl
|
|||
languages_path = languages_path.append("languages.json"sv);
|
||||
|
||||
auto locale_languages = TRY(read_json_file(languages_path.string()));
|
||||
auto const& main_object = locale_languages.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(languages_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& languages_object = locale_display_names_object.as_object().get("languages"sv);
|
||||
auto const& main_object = locale_languages.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(languages_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& languages_object = locale_display_names_object.as_object().get_deprecated("languages"sv);
|
||||
|
||||
languages_object.as_object().for_each_member([&](auto const& key, auto const&) {
|
||||
if (!key.contains("-alt-"sv) && !cldr.languages.contains_slow(key))
|
||||
|
@ -383,8 +383,8 @@ static ErrorOr<void> parse_unicode_extension_keywords(DeprecatedString bcp47_pat
|
|||
constexpr auto desired_keywords = Array { "ca"sv, "co"sv, "hc"sv, "kf"sv, "kn"sv, "nu"sv };
|
||||
auto keywords = TRY(read_json_file(bcp47_path));
|
||||
|
||||
auto const& keyword_object = keywords.as_object().get("keyword"sv);
|
||||
auto const& unicode_object = keyword_object.as_object().get("u"sv);
|
||||
auto const& keyword_object = keywords.as_object().get_deprecated("keyword"sv);
|
||||
auto const& unicode_object = keyword_object.as_object().get_deprecated("u"sv);
|
||||
if (unicode_object.is_null())
|
||||
return {};
|
||||
|
||||
|
@ -392,7 +392,7 @@ static ErrorOr<void> parse_unicode_extension_keywords(DeprecatedString bcp47_pat
|
|||
if (!desired_keywords.span().contains_slow(key))
|
||||
return;
|
||||
|
||||
auto const& name = value.as_object().get("_alias"sv);
|
||||
auto const& name = value.as_object().get_deprecated("_alias"sv);
|
||||
cldr.keyword_names.set(key, name.as_string());
|
||||
|
||||
auto& keywords = cldr.keywords.ensure(key);
|
||||
|
@ -414,12 +414,12 @@ static ErrorOr<void> parse_unicode_extension_keywords(DeprecatedString bcp47_pat
|
|||
if (key == "nu"sv && keyword.is_one_of("finance"sv, "native"sv, "traditio"sv))
|
||||
return;
|
||||
|
||||
if (auto const& preferred = properties.as_object().get("_preferred"sv); preferred.is_string()) {
|
||||
if (auto const& preferred = properties.as_object().get_deprecated("_preferred"sv); preferred.is_string()) {
|
||||
cldr.keyword_aliases.ensure(key).append({ preferred.as_string(), keyword });
|
||||
return;
|
||||
}
|
||||
|
||||
if (auto const& alias = properties.as_object().get("_alias"sv); alias.is_string())
|
||||
if (auto const& alias = properties.as_object().get_deprecated("_alias"sv); alias.is_string())
|
||||
cldr.keyword_aliases.ensure(key).append({ keyword, alias.as_string() });
|
||||
|
||||
keywords.append(keyword);
|
||||
|
@ -448,10 +448,10 @@ static ErrorOr<void> parse_locale_languages(DeprecatedString locale_path, CLDR&
|
|||
languages_path = languages_path.append("languages.json"sv);
|
||||
|
||||
auto locale_languages = TRY(read_json_file(languages_path.string()));
|
||||
auto const& main_object = locale_languages.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(languages_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& languages_object = locale_display_names_object.as_object().get("languages"sv);
|
||||
auto const& main_object = locale_languages.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(languages_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& languages_object = locale_display_names_object.as_object().get_deprecated("languages"sv);
|
||||
|
||||
LanguageList languages;
|
||||
languages.resize(cldr.languages.size());
|
||||
|
@ -474,10 +474,10 @@ static ErrorOr<void> parse_locale_territories(DeprecatedString locale_path, CLDR
|
|||
territories_path = territories_path.append("territories.json"sv);
|
||||
|
||||
auto locale_territories = TRY(read_json_file(territories_path.string()));
|
||||
auto const& main_object = locale_territories.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(territories_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& territories_object = locale_display_names_object.as_object().get("territories"sv);
|
||||
auto const& main_object = locale_territories.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(territories_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& territories_object = locale_display_names_object.as_object().get_deprecated("territories"sv);
|
||||
|
||||
TerritoryList territories;
|
||||
territories.resize(cldr.territories.size());
|
||||
|
@ -497,10 +497,10 @@ static ErrorOr<void> parse_locale_scripts(DeprecatedString locale_path, CLDR& cl
|
|||
scripts_path = scripts_path.append("scripts.json"sv);
|
||||
|
||||
auto locale_scripts = TRY(read_json_file(scripts_path.string()));
|
||||
auto const& main_object = locale_scripts.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(scripts_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& scripts_object = locale_display_names_object.as_object().get("scripts"sv);
|
||||
auto const& main_object = locale_scripts.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(scripts_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& scripts_object = locale_display_names_object.as_object().get_deprecated("scripts"sv);
|
||||
|
||||
ScriptList scripts;
|
||||
scripts.resize(cldr.scripts.size());
|
||||
|
@ -520,9 +520,9 @@ static ErrorOr<void> parse_locale_list_patterns(DeprecatedString misc_path, CLDR
|
|||
list_patterns_path = list_patterns_path.append("listPatterns.json"sv);
|
||||
|
||||
auto locale_list_patterns = TRY(read_json_file(list_patterns_path.string()));
|
||||
auto const& main_object = locale_list_patterns.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(list_patterns_path.parent().basename());
|
||||
auto const& list_patterns_object = locale_object.as_object().get("listPatterns"sv);
|
||||
auto const& main_object = locale_list_patterns.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(list_patterns_path.parent().basename());
|
||||
auto const& list_patterns_object = locale_object.as_object().get_deprecated("listPatterns"sv);
|
||||
|
||||
auto list_pattern_type = [](StringView key) {
|
||||
if (key.contains("type-standard"sv))
|
||||
|
@ -549,10 +549,10 @@ static ErrorOr<void> parse_locale_list_patterns(DeprecatedString misc_path, CLDR
|
|||
auto type = list_pattern_type(key);
|
||||
auto style = list_pattern_style(key);
|
||||
|
||||
auto start = cldr.unique_strings.ensure(value.as_object().get("start"sv).as_string());
|
||||
auto middle = cldr.unique_strings.ensure(value.as_object().get("middle"sv).as_string());
|
||||
auto end = cldr.unique_strings.ensure(value.as_object().get("end"sv).as_string());
|
||||
auto pair = cldr.unique_strings.ensure(value.as_object().get("2"sv).as_string());
|
||||
auto start = cldr.unique_strings.ensure(value.as_object().get_deprecated("start"sv).as_string());
|
||||
auto middle = cldr.unique_strings.ensure(value.as_object().get_deprecated("middle"sv).as_string());
|
||||
auto end = cldr.unique_strings.ensure(value.as_object().get_deprecated("end"sv).as_string());
|
||||
auto pair = cldr.unique_strings.ensure(value.as_object().get_deprecated("2"sv).as_string());
|
||||
|
||||
if (!cldr.list_pattern_types.contains_slow(type))
|
||||
cldr.list_pattern_types.append(type);
|
||||
|
@ -571,10 +571,10 @@ static ErrorOr<void> parse_locale_layout(DeprecatedString misc_path, CLDR& cldr,
|
|||
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("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(layout_path.parent().basename());
|
||||
auto const& layout_object = locale_object.as_object().get("layout"sv);
|
||||
auto const& orientation_object = layout_object.as_object().get("orientation"sv);
|
||||
auto const& main_object = locale_layout.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(layout_path.parent().basename());
|
||||
auto const& layout_object = locale_object.as_object().get_deprecated("layout"sv);
|
||||
auto const& orientation_object = layout_object.as_object().get_deprecated("orientation"sv);
|
||||
|
||||
auto text_layout_character_order = [](StringView key) {
|
||||
if (key == "left-to-right"sv)
|
||||
|
@ -584,7 +584,7 @@ static ErrorOr<void> parse_locale_layout(DeprecatedString misc_path, CLDR& cldr,
|
|||
VERIFY_NOT_REACHED();
|
||||
};
|
||||
|
||||
auto const& character_order_string = orientation_object.as_object().get("characterOrder"sv);
|
||||
auto const& character_order_string = orientation_object.as_object().get_deprecated("characterOrder"sv);
|
||||
auto const& character_order = character_order_string.as_string();
|
||||
|
||||
TextLayout layout {};
|
||||
|
@ -603,10 +603,10 @@ static ErrorOr<void> parse_locale_currencies(DeprecatedString numbers_path, CLDR
|
|||
currencies_path = currencies_path.append("currencies.json"sv);
|
||||
|
||||
auto locale_currencies = TRY(read_json_file(currencies_path.string()));
|
||||
auto const& main_object = locale_currencies.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(currencies_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get("numbers"sv);
|
||||
auto const& currencies_object = locale_numbers_object.as_object().get("currencies"sv);
|
||||
auto const& main_object = locale_currencies.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(currencies_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get_deprecated("numbers"sv);
|
||||
auto const& currencies_object = locale_numbers_object.as_object().get_deprecated("currencies"sv);
|
||||
|
||||
currencies_object.as_object().for_each_member([&](auto const& key, JsonValue const&) {
|
||||
if (!cldr.currencies.contains_slow(key))
|
||||
|
@ -626,10 +626,10 @@ static ErrorOr<void> parse_locale_currencies(DeprecatedString numbers_path, CLDR
|
|||
numeric_currencies.resize(cldr.currencies.size());
|
||||
|
||||
currencies_object.as_object().for_each_member([&](auto const& key, JsonValue const& value) {
|
||||
auto const& long_name = value.as_object().get("displayName"sv);
|
||||
auto const& short_name = value.as_object().get("symbol"sv);
|
||||
auto const& narrow_name = value.as_object().get("symbol-alt-narrow"sv);
|
||||
auto const& numeric_name = value.as_object().get("displayName-count-other"sv);
|
||||
auto const& long_name = value.as_object().get_deprecated("displayName"sv);
|
||||
auto const& short_name = value.as_object().get_deprecated("symbol"sv);
|
||||
auto const& narrow_name = value.as_object().get_deprecated("symbol-alt-narrow"sv);
|
||||
auto const& numeric_name = value.as_object().get_deprecated("displayName-count-other"sv);
|
||||
|
||||
auto index = cldr.currencies.find_first_index(key).value();
|
||||
long_currencies[index] = cldr.unique_strings.ensure(long_name.as_string());
|
||||
|
@ -651,11 +651,11 @@ static ErrorOr<void> parse_locale_calendars(DeprecatedString locale_path, CLDR&
|
|||
locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv);
|
||||
|
||||
auto locale_display_names = TRY(read_json_file(locale_display_names_path.string()));
|
||||
auto const& main_object = locale_display_names.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(locale_display_names_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get("localeDisplayNames"sv);
|
||||
auto const& types_object = locale_display_names_object.as_object().get("types"sv);
|
||||
auto const& calendar_object = types_object.as_object().get("calendar"sv);
|
||||
auto const& main_object = locale_display_names.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(locale_display_names_path.parent().basename());
|
||||
auto const& locale_display_names_object = locale_object.as_object().get_deprecated("localeDisplayNames"sv);
|
||||
auto const& types_object = locale_display_names_object.as_object().get_deprecated("types"sv);
|
||||
auto const& calendar_object = types_object.as_object().get_deprecated("calendar"sv);
|
||||
|
||||
auto const& supported_calendars = cldr.keywords.find("ca"sv)->value;
|
||||
|
||||
|
@ -682,10 +682,10 @@ static ErrorOr<void> parse_locale_date_fields(DeprecatedString dates_path, CLDR&
|
|||
date_fields_path = date_fields_path.append("dateFields.json"sv);
|
||||
|
||||
auto locale_date_fields = TRY(read_json_file(date_fields_path.string()));
|
||||
auto const& main_object = locale_date_fields.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(date_fields_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get("dates"sv);
|
||||
auto const& fields_object = dates_object.as_object().get("fields"sv);
|
||||
auto const& main_object = locale_date_fields.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(date_fields_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get_deprecated("dates"sv);
|
||||
auto const& fields_object = dates_object.as_object().get_deprecated("fields"sv);
|
||||
|
||||
auto is_sanctioned_field = [](StringView field) {
|
||||
// This is a copy of the units sanctioned for use within ECMA-402, with names adjusted for the names used by the CLDR.
|
||||
|
@ -716,9 +716,9 @@ static ErrorOr<void> parse_locale_date_fields(DeprecatedString dates_path, CLDR&
|
|||
if (!is_sanctioned_field(key))
|
||||
return;
|
||||
|
||||
auto const& long_name = value.as_object().get("displayName"sv);
|
||||
auto const& short_name = fields_object.as_object().get(DeprecatedString::formatted("{}-short", key)).as_object().get("displayName"sv);
|
||||
auto const& narrow_name = fields_object.as_object().get(DeprecatedString::formatted("{}-narrow", key)).as_object().get("displayName"sv);
|
||||
auto const& long_name = value.as_object().get_deprecated("displayName"sv);
|
||||
auto const& short_name = fields_object.as_object().get_deprecated(DeprecatedString::formatted("{}-short", key)).as_object().get_deprecated("displayName"sv);
|
||||
auto const& narrow_name = fields_object.as_object().get_deprecated(DeprecatedString::formatted("{}-narrow", key)).as_object().get_deprecated("displayName"sv);
|
||||
|
||||
auto index = cldr.date_fields.find_first_index(key).value();
|
||||
long_date_fields[index] = cldr.unique_strings.ensure(long_name.as_string());
|
||||
|
@ -738,11 +738,11 @@ static ErrorOr<void> parse_number_system_keywords(DeprecatedString locale_number
|
|||
numbers_path = numbers_path.append("numbers.json"sv);
|
||||
|
||||
auto numbers = TRY(read_json_file(numbers_path.string()));
|
||||
auto const& main_object = numbers.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(numbers_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get("numbers"sv);
|
||||
auto const& default_numbering_system_object = locale_numbers_object.as_object().get("defaultNumberingSystem"sv);
|
||||
auto const& other_numbering_systems_object = locale_numbers_object.as_object().get("otherNumberingSystems"sv);
|
||||
auto const& main_object = numbers.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(numbers_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get_deprecated("numbers"sv);
|
||||
auto const& default_numbering_system_object = locale_numbers_object.as_object().get_deprecated("defaultNumberingSystem"sv);
|
||||
auto const& other_numbering_systems_object = locale_numbers_object.as_object().get_deprecated("otherNumberingSystems"sv);
|
||||
|
||||
KeywordList keywords {};
|
||||
|
||||
|
@ -784,10 +784,10 @@ static ErrorOr<void> parse_calendar_keywords(DeprecatedString locale_dates_path,
|
|||
continue;
|
||||
|
||||
auto calendars = TRY(read_json_file(calendars_path.string()));
|
||||
auto const& main_object = calendars.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(calendars_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get("dates"sv);
|
||||
auto const& calendars_object = dates_object.as_object().get("calendars"sv);
|
||||
auto const& main_object = calendars.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(calendars_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get_deprecated("dates"sv);
|
||||
auto const& calendars_object = dates_object.as_object().get_deprecated("calendars"sv);
|
||||
|
||||
calendars_object.as_object().for_each_member([&](auto calendar_name, JsonValue const&) {
|
||||
// The generic calendar is not a supported Unicode calendar key, so skip it:
|
||||
|
@ -842,7 +842,7 @@ static ErrorOr<void> parse_default_content_locales(DeprecatedString core_path, C
|
|||
default_content_path = default_content_path.append("defaultContent.json"sv);
|
||||
|
||||
auto default_content = TRY(read_json_file(default_content_path.string()));
|
||||
auto const& default_content_array = default_content.as_object().get("defaultContent"sv);
|
||||
auto const& default_content_array = default_content.as_object().get_deprecated("defaultContent"sv);
|
||||
|
||||
default_content_array.as_array().for_each([&](JsonValue const& value) {
|
||||
auto locale = value.as_string();
|
||||
|
|
|
@ -245,15 +245,15 @@ static ErrorOr<void> parse_number_system_digits(DeprecatedString core_supplement
|
|||
number_systems_path = number_systems_path.append("numberingSystems.json"sv);
|
||||
|
||||
auto number_systems = TRY(read_json_file(number_systems_path.string()));
|
||||
auto const& supplemental_object = number_systems.as_object().get("supplemental"sv);
|
||||
auto const& number_systems_object = supplemental_object.as_object().get("numberingSystems"sv);
|
||||
auto const& supplemental_object = number_systems.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& number_systems_object = supplemental_object.as_object().get_deprecated("numberingSystems"sv);
|
||||
|
||||
number_systems_object.as_object().for_each_member([&](auto const& number_system, auto const& digits_object) {
|
||||
auto type = digits_object.as_object().get("_type"sv).as_string();
|
||||
auto type = digits_object.as_object().get_deprecated("_type"sv).as_string();
|
||||
if (type != "numeric"sv)
|
||||
return;
|
||||
|
||||
auto digits = digits_object.as_object().get("_digits"sv).as_string();
|
||||
auto digits = digits_object.as_object().get_deprecated("_digits"sv).as_string();
|
||||
|
||||
Utf8View utf8_digits { digits };
|
||||
VERIFY(utf8_digits.length() == 10);
|
||||
|
@ -415,10 +415,10 @@ static ErrorOr<void> parse_number_systems(DeprecatedString locale_numbers_path,
|
|||
numbers_path = numbers_path.append("numbers.json"sv);
|
||||
|
||||
auto numbers = TRY(read_json_file(numbers_path.string()));
|
||||
auto const& main_object = numbers.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(numbers_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get("numbers"sv);
|
||||
auto const& minimum_grouping_digits = locale_numbers_object.as_object().get("minimumGroupingDigits"sv);
|
||||
auto const& main_object = numbers.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(numbers_path.parent().basename());
|
||||
auto const& locale_numbers_object = locale_object.as_object().get_deprecated("numbers"sv);
|
||||
auto const& minimum_grouping_digits = locale_numbers_object.as_object().get_deprecated("minimumGroupingDigits"sv);
|
||||
|
||||
Vector<Optional<NumberSystem>> number_systems;
|
||||
number_systems.resize(cldr.number_systems.size());
|
||||
|
@ -523,8 +523,8 @@ static ErrorOr<void> parse_number_systems(DeprecatedString locale_numbers_path,
|
|||
// The range separator does not appear in the symbols list, we have to extract it from
|
||||
// the range pattern.
|
||||
auto misc_patterns_key = DeprecatedString::formatted("{}{}", misc_patterns_prefix, system);
|
||||
auto misc_patterns = locale_numbers_object.as_object().get(misc_patterns_key);
|
||||
auto range_separator = misc_patterns.as_object().get("range"sv).as_string();
|
||||
auto misc_patterns = locale_numbers_object.as_object().get_deprecated(misc_patterns_key);
|
||||
auto range_separator = misc_patterns.as_object().get_deprecated("range"sv).as_string();
|
||||
|
||||
auto begin_index = range_separator.find("{0}"sv).value() + "{0}"sv.length();
|
||||
auto end_index = range_separator.find("{1}"sv).value();
|
||||
|
@ -541,41 +541,41 @@ static ErrorOr<void> parse_number_systems(DeprecatedString locale_numbers_path,
|
|||
auto system = key.substring(decimal_formats_prefix.length());
|
||||
auto& number_system = ensure_number_system(system);
|
||||
|
||||
auto format_object = value.as_object().get("standard"sv);
|
||||
auto format_object = value.as_object().get_deprecated("standard"sv);
|
||||
parse_number_pattern(format_object.as_string().split(';'), cldr, NumberFormatType::Standard, number_system.decimal_format, &number_system);
|
||||
|
||||
auto const& long_format = value.as_object().get("long"sv).as_object().get("decimalFormat"sv);
|
||||
auto const& long_format = value.as_object().get_deprecated("long"sv).as_object().get_deprecated("decimalFormat"sv);
|
||||
number_system.decimal_long_formats = parse_number_format(long_format.as_object());
|
||||
|
||||
auto const& short_format = value.as_object().get("short"sv).as_object().get("decimalFormat"sv);
|
||||
auto const& short_format = value.as_object().get_deprecated("short"sv).as_object().get_deprecated("decimalFormat"sv);
|
||||
number_system.decimal_short_formats = parse_number_format(short_format.as_object());
|
||||
} else if (key.starts_with(currency_formats_prefix)) {
|
||||
auto system = key.substring(currency_formats_prefix.length());
|
||||
auto& number_system = ensure_number_system(system);
|
||||
|
||||
auto format_object = value.as_object().get("standard"sv);
|
||||
auto format_object = value.as_object().get_deprecated("standard"sv);
|
||||
parse_number_pattern(format_object.as_string().split(';'), cldr, NumberFormatType::Standard, number_system.currency_format);
|
||||
|
||||
format_object = value.as_object().get("accounting"sv);
|
||||
format_object = value.as_object().get_deprecated("accounting"sv);
|
||||
parse_number_pattern(format_object.as_string().split(';'), cldr, NumberFormatType::Standard, number_system.accounting_format);
|
||||
|
||||
number_system.currency_unit_formats = parse_number_format(value.as_object());
|
||||
|
||||
if (value.as_object().has("short"sv)) {
|
||||
auto const& short_format = value.as_object().get("short"sv).as_object().get("standard"sv);
|
||||
auto const& short_format = value.as_object().get_deprecated("short"sv).as_object().get_deprecated("standard"sv);
|
||||
number_system.currency_short_formats = parse_number_format(short_format.as_object());
|
||||
}
|
||||
} else if (key.starts_with(percent_formats_prefix)) {
|
||||
auto system = key.substring(percent_formats_prefix.length());
|
||||
auto& number_system = ensure_number_system(system);
|
||||
|
||||
auto format_object = value.as_object().get("standard"sv);
|
||||
auto format_object = value.as_object().get_deprecated("standard"sv);
|
||||
parse_number_pattern(format_object.as_string().split(';'), cldr, NumberFormatType::Standard, number_system.percent_format);
|
||||
} else if (key.starts_with(scientific_formats_prefix)) {
|
||||
auto system = key.substring(scientific_formats_prefix.length());
|
||||
auto& number_system = ensure_number_system(system);
|
||||
|
||||
auto format_object = value.as_object().get("standard"sv);
|
||||
auto format_object = value.as_object().get_deprecated("standard"sv);
|
||||
parse_number_pattern(format_object.as_string().split(';'), cldr, NumberFormatType::Standard, number_system.scientific_format);
|
||||
}
|
||||
});
|
||||
|
@ -600,12 +600,12 @@ static ErrorOr<void> parse_units(DeprecatedString locale_units_path, CLDR& cldr,
|
|||
units_path = units_path.append("units.json"sv);
|
||||
|
||||
auto locale_units = TRY(read_json_file(units_path.string()));
|
||||
auto const& main_object = locale_units.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(units_path.parent().basename());
|
||||
auto const& locale_units_object = locale_object.as_object().get("units"sv);
|
||||
auto const& long_object = locale_units_object.as_object().get("long"sv);
|
||||
auto const& short_object = locale_units_object.as_object().get("short"sv);
|
||||
auto const& narrow_object = locale_units_object.as_object().get("narrow"sv);
|
||||
auto const& main_object = locale_units.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(units_path.parent().basename());
|
||||
auto const& locale_units_object = locale_object.as_object().get_deprecated("units"sv);
|
||||
auto const& long_object = locale_units_object.as_object().get_deprecated("long"sv);
|
||||
auto const& short_object = locale_units_object.as_object().get_deprecated("short"sv);
|
||||
auto const& narrow_object = locale_units_object.as_object().get_deprecated("narrow"sv);
|
||||
|
||||
HashMap<DeprecatedString, Unit> units;
|
||||
|
||||
|
|
|
@ -330,7 +330,7 @@ static ErrorOr<void> parse_plural_rules(DeprecatedString core_supplemental_path,
|
|||
plurals_path = plurals_path.append(file_name);
|
||||
|
||||
auto plurals = TRY(read_json_file(plurals_path.string()));
|
||||
auto const& supplemental_object = plurals.as_object().get("supplemental"sv);
|
||||
auto const& supplemental_object = plurals.as_object().get_deprecated("supplemental"sv);
|
||||
|
||||
supplemental_object.as_object().for_each_member([&](auto const& key, auto const& plurals_object) {
|
||||
if (!key.starts_with(form_prefix))
|
||||
|
@ -365,8 +365,8 @@ static ErrorOr<void> parse_plural_ranges(DeprecatedString core_supplemental_path
|
|||
plural_ranges_path = plural_ranges_path.append("pluralRanges.json"sv);
|
||||
|
||||
auto plural_ranges = TRY(read_json_file(plural_ranges_path.string()));
|
||||
auto const& supplemental_object = plural_ranges.as_object().get("supplemental"sv);
|
||||
auto const& plurals_object = supplemental_object.as_object().get("plurals"sv);
|
||||
auto const& supplemental_object = plural_ranges.as_object().get_deprecated("supplemental"sv);
|
||||
auto const& plurals_object = supplemental_object.as_object().get_deprecated("plurals"sv);
|
||||
|
||||
plurals_object.as_object().for_each_member([&](auto const& loc, auto const& ranges_object) {
|
||||
auto locale = cldr.locales.get(loc);
|
||||
|
|
|
@ -83,10 +83,10 @@ static ErrorOr<void> parse_date_fields(DeprecatedString locale_dates_path, CLDR&
|
|||
date_fields_path = date_fields_path.append("dateFields.json"sv);
|
||||
|
||||
auto date_fields = TRY(read_json_file(date_fields_path.string()));
|
||||
auto const& main_object = date_fields.as_object().get("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get(date_fields_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get("dates"sv);
|
||||
auto const& fields_object = dates_object.as_object().get("fields"sv);
|
||||
auto const& main_object = date_fields.as_object().get_deprecated("main"sv);
|
||||
auto const& locale_object = main_object.as_object().get_deprecated(date_fields_path.parent().basename());
|
||||
auto const& dates_object = locale_object.as_object().get_deprecated("dates"sv);
|
||||
auto const& fields_object = dates_object.as_object().get_deprecated("fields"sv);
|
||||
|
||||
auto is_sanctioned_unit = [](auto unit) {
|
||||
// This is a copy of the time units sanctioned for use within ECMA-402.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue