From 7d9b6b41c3700eae1f5356ec701e0c51b7efb211 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sat, 8 Jan 2022 08:26:04 -0500 Subject: [PATCH] LibTimeZone: Remove accidental pluralization of generator variable names --- .../LibTimeZone/GenerateTimeZoneData.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp index f96b3e752ab..593a9811b77 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp @@ -37,8 +37,8 @@ struct TimeZone { struct TimeZoneData { HashMap> time_zones; - Vector time_zones_names; - Vector time_zones_aliases; + Vector time_zone_names; + Vector time_zone_aliases; }; static Time parse_time(StringView segment) @@ -109,8 +109,8 @@ static Vector& parse_zone(StringView zone_line, TimeZoneData& time_zon auto& time_zones = time_zone_data.time_zones.ensure(name); time_zones.append(move(time_zone)); - if (!time_zone_data.time_zones_names.contains_slow(name)) - time_zone_data.time_zones_names.append(name); + if (!time_zone_data.time_zone_names.contains_slow(name)) + time_zone_data.time_zone_names.append(name); return time_zones; } @@ -138,7 +138,7 @@ static void parse_link(StringView link_line, TimeZoneData& time_zone_data) auto target = segments[1]; auto alias = segments[2]; - time_zone_data.time_zones_aliases.append({ target, alias }); + time_zone_data.time_zone_aliases.append({ target, alias }); } static ErrorOr parse_time_zones(StringView time_zone_path, TimeZoneData& time_zone_data) @@ -206,7 +206,7 @@ static void generate_time_zone_data_header(Core::File& file, TimeZoneData& time_ namespace TimeZone { )~~~"); - generate_enum(generator, format_identifier, "TimeZone"sv, {}, time_zone_data.time_zones_names, time_zone_data.time_zones_aliases); + generate_enum(generator, format_identifier, "TimeZone"sv, {}, time_zone_data.time_zone_names, time_zone_data.time_zone_aliases); generator.append(R"~~~( } @@ -243,7 +243,7 @@ namespace TimeZone { generate_value_from_string(generator, "{}_from_string"sv, enum_title, enum_snake, move(hashes)); }; - append_from_string("TimeZone"sv, "time_zone"sv, time_zone_data.time_zones_names, time_zone_data.time_zones_aliases); + append_from_string("TimeZone"sv, "time_zone"sv, time_zone_data.time_zone_names, time_zone_data.time_zone_aliases); generator.append(R"~~~( }