Skip to content

Commit b91af3c

Browse files
trflynn89awesomekling
authored andcommitted
LibUnicode: Remove a few generator tracking fields that are now unused
These were used to generate specialized tables. Now that those tables have been migrated to general 2-stage lookup tables, these fields are all unused.
1 parent 4562119 commit b91af3c

File tree

1 file changed

+2
-30
lines changed

1 file changed

+2
-30
lines changed

Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -128,27 +128,17 @@ struct CodePointTables {
128128
struct UnicodeData {
129129
UniqueStringStorage unique_strings;
130130

131-
u32 code_points_with_non_zero_combining_class { 0 };
132-
133131
u32 code_points_with_decomposition_mapping { 0 };
134132
Vector<u32> decomposition_mappings;
135133
Vector<DeprecatedString> compatibility_tags;
136134

137-
u32 simple_uppercase_mapping_size { 0 };
138-
u32 simple_lowercase_mapping_size { 0 };
139-
u32 simple_titlecase_mapping_size { 0 };
140-
141135
Vector<SpecialCasing> special_casing;
142-
u32 code_points_with_special_casing { 0 };
143136
u32 largest_special_casing_mapping_size { 0 };
144-
u32 largest_special_casing_size { 0 };
145137
Vector<DeprecatedString> conditions;
146138
Vector<DeprecatedString> locales;
147139

148140
Vector<CaseFolding> case_folding;
149-
u32 code_points_with_case_folding { 0 };
150141
u32 largest_case_folding_mapping_size { 0 };
151-
u32 largest_case_folding_size { 0 };
152142
Vector<StringView> statuses;
153143

154144
Vector<CodePointData> code_point_data;
@@ -746,34 +736,18 @@ static ErrorOr<void> parse_unicode_data(Core::InputBufferedFile& file, UnicodeDa
746736
}
747737
}
748738

749-
bool has_special_casing { false };
750739
for (auto const& casing : unicode_data.special_casing) {
751-
if (casing.code_point == data.code_point) {
740+
if (casing.code_point == data.code_point)
752741
data.casing.special_casing_indices.append(casing.index);
753-
has_special_casing = true;
754-
}
755742
}
756743

757-
bool has_case_folding { false };
758744
for (size_t i = 0; i < unicode_data.case_folding.size(); ++i) {
759-
if (auto const& folding = unicode_data.case_folding[i]; folding.code_point == data.code_point) {
745+
if (auto const& folding = unicode_data.case_folding[i]; folding.code_point == data.code_point)
760746
data.casing.case_folding_indices.append(i);
761-
has_case_folding = true;
762-
}
763747
}
764748

765-
unicode_data.code_points_with_non_zero_combining_class += data.casing.canonical_combining_class != 0;
766-
unicode_data.simple_uppercase_mapping_size += data.casing.simple_uppercase_mapping.has_value();
767-
unicode_data.simple_lowercase_mapping_size += data.casing.simple_lowercase_mapping.has_value();
768-
unicode_data.simple_titlecase_mapping_size += data.casing.simple_titlecase_mapping.has_value();
769749
unicode_data.code_points_with_decomposition_mapping += data.decomposition_mapping.has_value();
770750

771-
unicode_data.code_points_with_special_casing += has_special_casing;
772-
unicode_data.largest_special_casing_size = max(unicode_data.largest_special_casing_size, data.casing.special_casing_indices.size());
773-
774-
unicode_data.code_points_with_case_folding += has_case_folding;
775-
unicode_data.largest_case_folding_size = max(unicode_data.largest_case_folding_size, data.casing.case_folding_indices.size());
776-
777751
previous_code_point = data.code_point;
778752
unicode_data.code_point_data.append(move(data));
779753
}
@@ -901,9 +875,7 @@ static ErrorOr<void> generate_unicode_data_implementation(Core::InputBufferedFil
901875
SourceGenerator generator { builder };
902876

903877
generator.set("string_index_type"sv, unicode_data.unique_strings.type_that_fits());
904-
generator.set("largest_special_casing_size", DeprecatedString::number(unicode_data.largest_special_casing_size));
905878
generator.set("special_casing_size", DeprecatedString::number(unicode_data.special_casing.size()));
906-
generator.set("largest_case_folding_size", DeprecatedString::number(unicode_data.largest_case_folding_size));
907879
generator.set("case_folding_size", DeprecatedString::number(unicode_data.case_folding.size()));
908880

909881
TRY(generator.set("CODE_POINT_TABLES_LSB_COUNT", TRY(String::number(CODE_POINT_TABLES_LSB_COUNT))));

0 commit comments

Comments
 (0)