mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:57:35 +00:00
Everywhere: Add sv suffix to strings relying on StringView(char const*)
Each of these strings would previously rely on StringView's char const* constructor overload, which would call __builtin_strlen on the string. Since we now have operator ""sv, we can replace these with much simpler versions. This opens the door to being able to remove StringView(char const*). No functional changes.
This commit is contained in:
sin-ack
Andreas Kling
parent
e5f09ea170
commit
3f3f45580a
762 changed files with 8315 additions and 8316 deletions
|
|
@ -146,8 +146,8 @@ struct UnicodeData {
|
|||
|
||||
static String sanitize_entry(String const& entry)
|
||||
{
|
||||
auto sanitized = entry.replace("-", "_", ReplaceMode::All);
|
||||
sanitized = sanitized.replace(" ", "_", ReplaceMode::All);
|
||||
auto sanitized = entry.replace("-"sv, "_"sv, ReplaceMode::All);
|
||||
sanitized = sanitized.replace(" "sv, "_"sv, ReplaceMode::All);
|
||||
|
||||
StringBuilder builder;
|
||||
bool next_is_upper = true;
|
||||
|
|
@ -229,7 +229,7 @@ static ErrorOr<void> parse_special_casing(Core::Stream::BufferedFile& file, Unic
|
|||
|
||||
if (!casing.locale.is_empty())
|
||||
casing.locale = String::formatted("{:c}{}", to_ascii_uppercase(casing.locale[0]), casing.locale.substring_view(1));
|
||||
casing.condition = casing.condition.replace("_", "", ReplaceMode::All);
|
||||
casing.condition = casing.condition.replace("_"sv, ""sv, ReplaceMode::All);
|
||||
|
||||
if (!casing.condition.is_empty() && !unicode_data.conditions.contains_slow(casing.condition))
|
||||
unicode_data.conditions.append(casing.condition);
|
||||
|
|
@ -570,7 +570,7 @@ static ErrorOr<void> parse_unicode_data(Core::Stream::BufferedFile& file, Unicod
|
|||
if (!assigned_code_point_range_start.has_value())
|
||||
assigned_code_point_range_start = data.code_point;
|
||||
|
||||
if (data.name.starts_with("<"sv) && data.name.ends_with(", First>")) {
|
||||
if (data.name.starts_with("<"sv) && data.name.ends_with(", First>"sv)) {
|
||||
VERIFY(!code_point_range_start.has_value() && assigned_code_point_range_start.has_value());
|
||||
code_point_range_start = data.code_point;
|
||||
|
||||
|
|
@ -578,7 +578,7 @@ static ErrorOr<void> parse_unicode_data(Core::Stream::BufferedFile& file, Unicod
|
|||
|
||||
assigned_code_points.append({ *assigned_code_point_range_start, previous_code_point });
|
||||
assigned_code_point_range_start.clear();
|
||||
} else if (data.name.starts_with("<"sv) && data.name.ends_with(", Last>")) {
|
||||
} else if (data.name.starts_with("<"sv) && data.name.ends_with(", Last>"sv)) {
|
||||
VERIFY(code_point_range_start.has_value());
|
||||
|
||||
CodePointRange code_point_range { *code_point_range_start, data.code_point };
|
||||
|
|
@ -739,7 +739,7 @@ namespace Unicode {
|
|||
bool first = true;
|
||||
generator.append(", {");
|
||||
for (auto const& item : list) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::formatted(format, item));
|
||||
first = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ struct AK::Formatter<CalendarPattern> : Formatter<FormatString> {
|
|||
};
|
||||
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}"sv,
|
||||
pattern.skeleton_index,
|
||||
pattern.pattern_index,
|
||||
pattern.pattern12_index,
|
||||
|
|
@ -212,7 +212,7 @@ struct AK::Formatter<CalendarRangePattern> : Formatter<FormatString> {
|
|||
};
|
||||
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}"sv,
|
||||
pattern.skeleton_index,
|
||||
field_to_i8(pattern.field),
|
||||
pattern.start_range,
|
||||
|
|
@ -265,7 +265,7 @@ struct AK::Formatter<CalendarFormat> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, CalendarFormat const& pattern)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {} }}"sv,
|
||||
pattern.full_format,
|
||||
pattern.long_format,
|
||||
pattern.medium_format,
|
||||
|
|
@ -305,7 +305,7 @@ struct AK::Formatter<CalendarSymbols> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, CalendarSymbols const& symbols)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {} }}",
|
||||
"{{ {}, {}, {} }}"sv,
|
||||
symbols.narrow_symbols,
|
||||
symbols.short_symbols,
|
||||
symbols.long_symbols);
|
||||
|
|
@ -364,7 +364,7 @@ struct AK::Formatter<Calendar> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, Calendar const& calendar)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {} }}"sv,
|
||||
calendar.date_formats,
|
||||
calendar.time_formats,
|
||||
calendar.date_time_formats,
|
||||
|
|
@ -418,7 +418,7 @@ struct AK::Formatter<TimeZoneNames> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, TimeZoneNames const& time_zone)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {} }}"sv,
|
||||
time_zone.short_standard_name,
|
||||
time_zone.long_standard_name,
|
||||
time_zone.short_daylight_name,
|
||||
|
|
@ -469,7 +469,7 @@ template<>
|
|||
struct AK::Formatter<TimeZoneFormat> : Formatter<FormatString> {
|
||||
ErrorOr<void> format(FormatBuilder& builder, TimeZoneFormat const& time_zone_format)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder, "{{ {}, {}, {}, {}, {}, {} }}",
|
||||
return Formatter<FormatString>::format(builder, "{{ {}, {}, {}, {}, {}, {} }}"sv,
|
||||
time_zone_format.symbol_ahead_sign,
|
||||
time_zone_format.symbol_ahead_separator,
|
||||
time_zone_format.symbol_behind_sign,
|
||||
|
|
@ -510,7 +510,7 @@ struct AK::Formatter<DayPeriod> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, DayPeriod const& day_period)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {} }}",
|
||||
"{{ {}, {}, {} }}"sv,
|
||||
static_cast<u8>(day_period.day_period),
|
||||
day_period.begin,
|
||||
day_period.end);
|
||||
|
|
@ -825,7 +825,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Era
|
||||
if (all_of(segment, is_char('G'))) {
|
||||
builder.append("{era}");
|
||||
builder.append("{era}"sv);
|
||||
|
||||
if (segment.length() <= 3)
|
||||
format.era = CalendarPatternStyle::Short;
|
||||
|
|
@ -837,7 +837,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Year
|
||||
else if (all_of(segment, is_any_of("yYuUr"sv))) {
|
||||
builder.append("{year}");
|
||||
builder.append("{year}"sv);
|
||||
|
||||
if (segment.length() == 2)
|
||||
format.year = CalendarPatternStyle::TwoDigit;
|
||||
|
|
@ -853,7 +853,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Month
|
||||
else if (all_of(segment, is_any_of("ML"sv))) {
|
||||
builder.append("{month}");
|
||||
builder.append("{month}"sv);
|
||||
|
||||
if (segment.length() == 1)
|
||||
format.month = CalendarPatternStyle::Numeric;
|
||||
|
|
@ -878,20 +878,20 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Day
|
||||
else if (all_of(segment, is_char('d'))) {
|
||||
builder.append("{day}");
|
||||
builder.append("{day}"sv);
|
||||
|
||||
if (segment.length() == 1)
|
||||
format.day = CalendarPatternStyle::Numeric;
|
||||
else
|
||||
format.day = CalendarPatternStyle::TwoDigit;
|
||||
} else if (all_of(segment, is_any_of("DFg"sv))) {
|
||||
builder.append("{day}");
|
||||
builder.append("{day}"sv);
|
||||
format.day = CalendarPatternStyle::Numeric;
|
||||
}
|
||||
|
||||
// Weekday
|
||||
else if (all_of(segment, is_char('E'))) {
|
||||
builder.append("{weekday}");
|
||||
builder.append("{weekday}"sv);
|
||||
|
||||
if (segment.length() == 4)
|
||||
format.weekday = CalendarPatternStyle::Long;
|
||||
|
|
@ -900,7 +900,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
else
|
||||
format.weekday = CalendarPatternStyle::Short;
|
||||
} else if (all_of(segment, is_any_of("ec"sv))) {
|
||||
builder.append("{weekday}");
|
||||
builder.append("{weekday}"sv);
|
||||
|
||||
// TR-35 defines "e", "c", and "cc" as as numeric, and "ee" as 2-digit, but those
|
||||
// pattern styles are not supported by Intl.DateTimeFormat.
|
||||
|
|
@ -917,10 +917,10 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Period
|
||||
else if (all_of(segment, is_any_of("ab"sv))) {
|
||||
builder.append("{ampm}");
|
||||
builder.append("{ampm}"sv);
|
||||
hour12 = true;
|
||||
} else if (all_of(segment, is_char('B'))) {
|
||||
builder.append("{dayPeriod}");
|
||||
builder.append("{dayPeriod}"sv);
|
||||
hour12 = true;
|
||||
|
||||
if (segment.length() == 4)
|
||||
|
|
@ -933,7 +933,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Hour
|
||||
else if (all_of(segment, is_any_of("hHKk"sv))) {
|
||||
builder.append("{hour}");
|
||||
builder.append("{hour}"sv);
|
||||
|
||||
if ((segment[0] == 'h') || (segment[0] == 'K'))
|
||||
hour12 = true;
|
||||
|
|
@ -949,7 +949,7 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Minute
|
||||
else if (all_of(segment, is_char('m'))) {
|
||||
builder.append("{minute}");
|
||||
builder.append("{minute}"sv);
|
||||
|
||||
if (segment.length() == 1)
|
||||
format.minute = CalendarPatternStyle::Numeric;
|
||||
|
|
@ -959,14 +959,14 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Second
|
||||
else if (all_of(segment, is_char('s'))) {
|
||||
builder.append("{second}");
|
||||
builder.append("{second}"sv);
|
||||
|
||||
if (segment.length() == 1)
|
||||
format.second = CalendarPatternStyle::Numeric;
|
||||
else
|
||||
format.second = CalendarPatternStyle::TwoDigit;
|
||||
} else if (all_of(segment, is_char('S'))) {
|
||||
builder.append("{fractionalSecondDigits}");
|
||||
builder.append("{fractionalSecondDigits}"sv);
|
||||
|
||||
VERIFY(segment.length() <= 3);
|
||||
format.fractional_second_digits = static_cast<u8>(segment.length());
|
||||
|
|
@ -977,21 +977,21 @@ static Optional<CalendarPattern> parse_date_time_pattern_raw(String pattern, Str
|
|||
|
||||
// Zone
|
||||
else if (all_of(segment, is_any_of("zV"sv))) {
|
||||
builder.append("{timeZoneName}");
|
||||
builder.append("{timeZoneName}"sv);
|
||||
|
||||
if (segment.length() < 4)
|
||||
format.time_zone_name = CalendarPatternStyle::Short;
|
||||
else
|
||||
format.time_zone_name = CalendarPatternStyle::Long;
|
||||
} else if (all_of(segment, is_any_of("ZOXx"sv))) {
|
||||
builder.append("{timeZoneName}");
|
||||
builder.append("{timeZoneName}"sv);
|
||||
|
||||
if (segment.length() < 4)
|
||||
format.time_zone_name = CalendarPatternStyle::ShortOffset;
|
||||
else
|
||||
format.time_zone_name = CalendarPatternStyle::LongOffset;
|
||||
} else if (all_of(segment, is_char('v'))) {
|
||||
builder.append("{timeZoneName}");
|
||||
builder.append("{timeZoneName}"sv);
|
||||
|
||||
if (segment.length() < 4)
|
||||
format.time_zone_name = CalendarPatternStyle::ShortGeneric;
|
||||
|
|
@ -1166,7 +1166,7 @@ static void generate_missing_patterns(Calendar& calendar, CalendarPatternList& f
|
|||
auto time_pattern = locale_data.unique_strings.get(time_format);
|
||||
auto date_pattern = locale_data.unique_strings.get(date_format);
|
||||
|
||||
auto new_pattern = pattern.replace("{0}", time_pattern, ReplaceMode::FirstOnly).replace("{1}", date_pattern, ReplaceMode::FirstOnly);
|
||||
auto new_pattern = pattern.replace("{0}"sv, time_pattern, ReplaceMode::FirstOnly).replace("{1}"sv, date_pattern, ReplaceMode::FirstOnly);
|
||||
return locale_data.unique_strings.ensure(move(new_pattern));
|
||||
};
|
||||
|
||||
|
|
@ -1958,7 +1958,7 @@ static constexpr Array<@calendar_index_type@, @size@> @name@ { {)~~~");
|
|||
for (auto const& calendar_key : locale_data.calendars) {
|
||||
auto calendar = calendars.find(calendar_key)->value;
|
||||
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(calendar));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -1979,7 +1979,7 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
auto const& value = map.find(key)->value;
|
||||
auto mapping = mapping_getter(value);
|
||||
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(mapping));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -1990,7 +1990,7 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
auto locales = locale_data.locales.keys();
|
||||
quick_sort(locales);
|
||||
|
||||
generate_mapping(generator, locale_data.locales, s_calendar_index_type, "s_locale_calendars"sv, "s_calendars_{}", format_identifier, [&](auto const& name, auto const& value) { append_calendars(name, value.calendars); });
|
||||
generate_mapping(generator, locale_data.locales, s_calendar_index_type, "s_locale_calendars"sv, "s_calendars_{}"sv, format_identifier, [&](auto const& name, auto const& value) { append_calendars(name, value.calendars); });
|
||||
append_mapping(locales, locale_data.locales, s_time_zone_index_type, "s_locale_time_zones"sv, [](auto const& locale) { return locale.time_zones; });
|
||||
append_mapping(locales, locale_data.locales, s_time_zone_format_index_type, "s_locale_time_zone_formats"sv, [](auto const& locale) { return locale.time_zone_formats; });
|
||||
append_mapping(locales, locale_data.locales, s_day_period_index_type, "s_locale_day_periods"sv, [](auto const& locale) { return locale.day_periods; });
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ struct AK::Formatter<DisplayPattern> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, DisplayPattern const& patterns)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {} }}",
|
||||
"{{ {}, {} }}"sv,
|
||||
patterns.locale_pattern,
|
||||
patterns.locale_separator);
|
||||
}
|
||||
|
|
@ -135,7 +135,7 @@ struct AK::Formatter<ListPatterns> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, ListPatterns const& patterns)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ ListPatternType::{}, Style::{}, {}, {}, {}, {} }}",
|
||||
"{{ ListPatternType::{}, Style::{}, {}, {}, {}, {} }}"sv,
|
||||
format_identifier({}, patterns.type),
|
||||
format_identifier({}, patterns.style),
|
||||
patterns.start,
|
||||
|
|
@ -169,7 +169,7 @@ struct AK::Formatter<TextLayout> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, TextLayout const& patterns)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ CharacterOrder::{} }}",
|
||||
"{{ CharacterOrder::{} }}"sv,
|
||||
format_identifier({}, patterns.character_order));
|
||||
}
|
||||
};
|
||||
|
|
@ -425,7 +425,7 @@ static ErrorOr<void> parse_unicode_extension_keywords(String bcp47_path, Unicode
|
|||
if (!desired_keywords.span().contains_slow(key))
|
||||
return;
|
||||
|
||||
auto const& name = value.as_object().get("_alias");
|
||||
auto const& name = value.as_object().get("_alias"sv);
|
||||
locale_data.keyword_names.set(key, name.as_string());
|
||||
|
||||
auto& keywords = locale_data.keywords.ensure(key);
|
||||
|
|
@ -1156,7 +1156,7 @@ struct TextLayout {
|
|||
bool first = true;
|
||||
generator.append(", {");
|
||||
for (auto const& item : list) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(item));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -1176,7 +1176,7 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
auto const& value = map.find(key)->value;
|
||||
auto mapping = mapping_getter(value);
|
||||
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(mapping));
|
||||
first = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ struct AK::Formatter<NumberFormat> : Formatter<FormatString> {
|
|||
identifier_indices.join(", "sv, format.identifier_indices);
|
||||
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {}, {{ {} }} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {}, {{ {} }} }}"sv,
|
||||
format.magnitude,
|
||||
format.exponent,
|
||||
to_underlying(format.plurality),
|
||||
|
|
@ -173,7 +173,7 @@ struct AK::Formatter<NumberSystem> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, NumberSystem const& system)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {} }}"sv,
|
||||
system.symbols,
|
||||
system.primary_grouping_size,
|
||||
system.secondary_grouping_size,
|
||||
|
|
@ -223,7 +223,7 @@ struct AK::Formatter<Unit> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, Unit const& system)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ {}, {}, {}, {} }}",
|
||||
"{{ {}, {}, {}, {} }}"sv,
|
||||
system.unit,
|
||||
system.long_formats,
|
||||
system.short_formats,
|
||||
|
|
@ -868,7 +868,7 @@ static constexpr Array<u8, @size@> s_minimum_grouping_digits { { )~~~");
|
|||
|
||||
bool first = true;
|
||||
for (auto const& locale : locales) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(locale_data.locales.find(locale)->value.minimum_grouping_digits));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -884,7 +884,7 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
|
||||
bool first = true;
|
||||
for (auto const& item : map) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
if constexpr (requires { item.value; })
|
||||
generator.append(String::number(item.value));
|
||||
else
|
||||
|
|
@ -895,9 +895,9 @@ static constexpr Array<@type@, @size@> @name@ { {)~~~");
|
|||
generator.append(" } };");
|
||||
};
|
||||
|
||||
generate_mapping(generator, locale_data.number_system_digits, "u32"sv, "s_number_systems_digits"sv, "s_number_systems_digits_{}", nullptr, [&](auto const& name, auto const& value) { append_map(name, "u32"sv, value); });
|
||||
generate_mapping(generator, locale_data.locales, s_number_system_index_type, "s_locale_number_systems"sv, "s_number_systems_{}", nullptr, [&](auto const& name, auto const& value) { append_map(name, s_number_system_index_type, value.number_systems); });
|
||||
generate_mapping(generator, locale_data.locales, s_unit_index_type, "s_locale_units"sv, "s_units_{}", nullptr, [&](auto const& name, auto const& value) { append_map(name, s_unit_index_type, value.units); });
|
||||
generate_mapping(generator, locale_data.number_system_digits, "u32"sv, "s_number_systems_digits"sv, "s_number_systems_digits_{}"sv, nullptr, [&](auto const& name, auto const& value) { append_map(name, "u32"sv, value); });
|
||||
generate_mapping(generator, locale_data.locales, s_number_system_index_type, "s_locale_number_systems"sv, "s_number_systems_{}"sv, nullptr, [&](auto const& name, auto const& value) { append_map(name, s_number_system_index_type, value.number_systems); });
|
||||
generate_mapping(generator, locale_data.locales, s_unit_index_type, "s_locale_units"sv, "s_units_{}"sv, nullptr, [&](auto const& name, auto const& value) { append_map(name, s_unit_index_type, value.units); });
|
||||
|
||||
generator.append(R"~~~(
|
||||
static Optional<NumberSystem> keyword_to_number_system(KeywordNumbers keyword)
|
||||
|
|
|
|||
|
|
@ -591,13 +591,13 @@ static constexpr Array<PluralCategory, @size@> @name@ { { PluralCategory::Other)
|
|||
append_lookup_table("PluralCategoryFunction"sv, "ordinal"sv, "default_category"sv, [](auto& rules, auto form) -> Conditions& { return rules.rules_for_form(form); });
|
||||
append_lookup_table("PluralRangeFunction"sv, "range"sv, "default_range"sv, [](auto& rules, auto) -> Ranges& { return rules.plural_ranges; });
|
||||
|
||||
generate_mapping(generator, locales, "PluralCategory"sv, "s_cardinal_categories"sv, "s_cardinal_categories_{}", format_identifier,
|
||||
generate_mapping(generator, locales, "PluralCategory"sv, "s_cardinal_categories"sv, "s_cardinal_categories_{}"sv, format_identifier,
|
||||
[&](auto const& name, auto const& locale) {
|
||||
auto& rules = locale_data.locales.find(locale)->value;
|
||||
append_categories(name, rules.rules_for_form("cardinal"sv));
|
||||
});
|
||||
|
||||
generate_mapping(generator, locales, "PluralCategory"sv, "s_ordinal_categories"sv, "s_ordinal_categories_{}", format_identifier,
|
||||
generate_mapping(generator, locales, "PluralCategory"sv, "s_ordinal_categories"sv, "s_ordinal_categories_{}"sv, format_identifier,
|
||||
[&](auto const& name, auto const& locale) {
|
||||
auto& rules = locale_data.locales.find(locale)->value;
|
||||
append_categories(name, rules.rules_for_form("ordinal"sv));
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ struct AK::Formatter<RelativeTimeFormat> : Formatter<FormatString> {
|
|||
ErrorOr<void> format(FormatBuilder& builder, RelativeTimeFormat const& format)
|
||||
{
|
||||
return Formatter<FormatString>::format(builder,
|
||||
"{{ TimeUnit::{}, Style::{}, PluralCategory::{}, {}, {} }}",
|
||||
"{{ TimeUnit::{}, Style::{}, PluralCategory::{}, {}, {} }}"sv,
|
||||
format.time_unit,
|
||||
format.style,
|
||||
format.plurality,
|
||||
|
|
@ -242,7 +242,7 @@ static constexpr Array<@relative_time_format_index_type@, @size@> @name@ { {)~~~
|
|||
|
||||
bool first = true;
|
||||
for (auto index : list) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::number(index));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -250,7 +250,7 @@ static constexpr Array<@relative_time_format_index_type@, @size@> @name@ { {)~~~
|
|||
generator.append(" } };");
|
||||
};
|
||||
|
||||
generate_mapping(generator, locale_data.locales, s_relative_time_format_index_type, "s_locale_relative_time_formats"sv, "s_number_systems_digits_{}", nullptr, [&](auto const& name, auto const& value) { append_list(name, value.time_units); });
|
||||
generate_mapping(generator, locale_data.locales, s_relative_time_format_index_type, "s_locale_relative_time_formats"sv, "s_number_systems_digits_{}"sv, nullptr, [&](auto const& name, auto const& value) { append_list(name, value.time_units); });
|
||||
|
||||
generator.append(R"~~~(
|
||||
Vector<RelativeTimeFormat> get_relative_time_format_patterns(StringView locale, TimeUnit time_unit, StringView tense_or_number, Style style)
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ static constexpr Array<@type@, @size@> @name@@index@ { {)~~~");
|
|||
|
||||
bool first = true;
|
||||
for (auto const& value : list) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
generator.append(String::formatted("{}", value));
|
||||
first = false;
|
||||
}
|
||||
|
|
@ -538,7 +538,7 @@ Span<StringView const> @name@()
|
|||
|
||||
bool first = true;
|
||||
for (auto const& value : values) {
|
||||
generator.append(first ? " " : ", ");
|
||||
generator.append(first ? " "sv : ", "sv);
|
||||
first = false;
|
||||
|
||||
if (auto it = aliases.find_if([&](auto const& alias) { return alias.alias == value; }); it != aliases.end())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue