beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 17:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibUnicode: Stop generating Block property data

Browse source 
We started generating this data in commit 0505e03, but it was unused.
It's still not used, so let's remove it, rather than bloating the size
of libunicode.so with unused data. If we need it in the future, it's
trivial to add back.

Note we *have* always used the block name data from that commit, and
that is still present here.
This commit is contained in:
Timothy Flynn 2023-07-20 18:26:48 -04:00 committed by Andreas Kling
parent 6de701b5c3
commit c950f88611
Notes: sideshowbarker 2024-07-16 20:51:53 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/c950f88611
Pull-request: https://github.com/SerenityOS/serenity/pull/20202
4 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
View file

@ -156,10 +156,6 @@ struct UnicodeData {
Vector<Alias> script_aliases;
PropList script_extensions;
PropList block_list {
{ "No_Block"sv, {} },
};
Vector<Alias> block_aliases;
Vector<BlockName> block_display_names;
// FIXME: We are not yet doing anything with this data. It will be needed for String.prototype.normalize.
@ -814,7 +810,6 @@ namespace Unicode {
generate_enum("GeneralCategory"sv, {}, unicode_data.general_categories.keys(), unicode_data.general_category_aliases);
generate_enum("Property"sv, {}, unicode_data.prop_list.keys(), unicode_data.prop_aliases);
generate_enum("Script"sv, {}, unicode_data.script_list.keys(), unicode_data.script_aliases);
generate_enum("Block"sv, {}, unicode_data.block_list.keys(), unicode_data.block_aliases);
generate_enum("GraphemeBreakProperty"sv, {}, unicode_data.grapheme_break_props.keys());
generate_enum("WordBreakProperty"sv, {}, unicode_data.word_break_props.keys());
generate_enum("SentenceBreakProperty"sv, {}, unicode_data.sentence_break_props.keys());
@ -1149,7 +1144,6 @@ static constexpr Array<ReadonlySpan<CodePointRange>, @size@> @name@ { {)~~~");
append_prop_list("s_properties"sv, "s_property_{}"sv, unicode_data.prop_list);
append_prop_list("s_scripts"sv, "s_script_{}"sv, unicode_data.script_list);
append_prop_list("s_script_extensions"sv, "s_script_extension_{}"sv, unicode_data.script_extensions);
append_prop_list("s_blocks"sv, "s_block_{}"sv, unicode_data.block_list);
append_prop_list("s_grapheme_break_properties"sv, "s_grapheme_break_property_{}"sv, unicode_data.grapheme_break_props);
append_prop_list("s_word_break_properties"sv, "s_word_break_property_{}"sv, unicode_data.word_break_props);
append_prop_list("s_sentence_break_properties"sv, "s_sentence_break_property_{}"sv, unicode_data.sentence_break_props);
@ -1343,9 +1337,6 @@ bool code_point_has_@enum_snake@(u32 code_point, @enum_title@ @enum_snake@)
append_prop_search("Script"sv, "script_extension"sv, "s_script_extensions"sv);
TRY(append_from_string("Script"sv, "script"sv, unicode_data.script_list, unicode_data.script_aliases));
append_prop_search("Block"sv, "block"sv, "s_blocks"sv);
TRY(append_from_string("Block"sv, "block"sv, unicode_data.block_list, unicode_data.block_aliases));
append_prop_search("GraphemeBreakProperty"sv, "grapheme_break_property"sv, "s_grapheme_break_properties"sv);
append_prop_search("WordBreakProperty"sv, "word_break_property"sv, "s_word_break_properties"sv);
append_prop_search("SentenceBreakProperty"sv, "sentence_break_property"sv, "s_sentence_break_properties"sv);
@ -1564,7 +1555,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(parse_prop_list(*scripts_file, unicode_data.script_list));
TRY(parse_prop_list(*script_extensions_file, unicode_data.script_extensions, true));
TRY(parse_block_display_names(*blocks_file, unicode_data));
TRY(parse_prop_list(*blocks_file, unicode_data.block_list, false, true));
TRY(parse_name_aliases(*name_alias_file, unicode_data));
TRY(parse_prop_list(*grapheme_break_file, unicode_data.grapheme_break_props));
TRY(parse_prop_list(*word_break_file, unicode_data.word_break_props));
@ -1574,7 +1564,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(parse_unicode_data(*unicode_data_file, unicode_data));
TRY(parse_value_alias_list(*prop_value_alias_file, "gc"sv, unicode_data.general_categories.keys(), unicode_data.general_category_aliases));
TRY(parse_value_alias_list(*prop_value_alias_file, "sc"sv, unicode_data.script_list.keys(), unicode_data.script_aliases, false));
TRY(parse_value_alias_list(*prop_value_alias_file, "blk"sv, unicode_data.block_list.keys(), unicode_data.block_aliases, false, true));
TRY(normalize_script_extensions(unicode_data.script_extensions, unicode_data.script_list, unicode_data.script_aliases));
TRY(generate_unicode_data_header(*generated_header_file, unicode_data));

28
Tests/LibUnicode/TestUnicodeCharacterTypes.cpp
View file

@ -727,34 +727,6 @@ TEST_CASE(script)
TEST_CASE(block)
{
auto block = [](StringView name) {
auto block = Unicode::block_from_string(name);
VERIFY(block.has_value());
return *block;
};
auto no_block = block("No_Block"sv);
auto block_nb = block("NB"sv);
EXPECT_EQ(no_block, block_nb);
auto block_basic_latin = block("Basic_Latin"sv);
auto block_ascii = block("ASCII"sv);
EXPECT_EQ(block_basic_latin, block_ascii);
auto block_greek_coptic = block("Greek_And_Coptic"sv);
auto block_greek = block("Greek"sv);
EXPECT_EQ(block_greek_coptic, block_greek);
auto block_variation = block("Variation_Selectors_Supplement"sv);
auto block_vs_sup = block("VS_Sup"sv);
EXPECT_EQ(block_variation, block_vs_sup);
for (u32 code_point = 0x0000; code_point <= 0x007F; ++code_point)
EXPECT(Unicode::code_point_has_block(code_point, block_basic_latin));
for (u32 code_point = 0xE0100; code_point <= 0xE01EF; ++code_point)
EXPECT(Unicode::code_point_has_block(code_point, block_variation));
for (u32 code_point = 0x0000; code_point <= 0x007F; ++code_point)
EXPECT_EQ("Basic Latin"sv, Unicode::code_point_block_display_name(code_point).value());

3
Userland/Libraries/LibUnicode/CharacterTypes.cpp
View file

@ -143,9 +143,6 @@ Optional<Script> __attribute__((weak)) script_from_string(StringView) { return {
bool __attribute__((weak)) code_point_has_script(u32, Script) { return {}; }
bool __attribute__((weak)) code_point_has_script_extension(u32, Script) { return {}; }
Optional<Block> __attribute__((weak)) block_from_string(StringView) { return {}; }
bool __attribute__((weak)) code_point_has_block(u32, Block) { return {}; }
bool __attribute__((weak)) code_point_has_grapheme_break_property(u32, GraphemeBreakProperty) { return {}; }
bool __attribute__((weak)) code_point_has_word_break_property(u32, WordBreakProperty) { return {}; }
bool __attribute__((weak)) code_point_has_sentence_break_property(u32, SentenceBreakProperty) { return {}; }

3
Userland/Libraries/LibUnicode/CharacterTypes.h
View file

@ -57,9 +57,6 @@ Optional<Script> script_from_string(StringView);
bool code_point_has_script(u32 code_point, Script script);
bool code_point_has_script_extension(u32 code_point, Script script);
Optional<Block> block_from_string(StringView);
bool code_point_has_block(u32 code_point, Block block);
bool code_point_has_grapheme_break_property(u32 code_point, GraphemeBreakProperty property);
bool code_point_has_word_break_property(u32 code_point, WordBreakProperty property);
bool code_point_has_sentence_break_property(u32 code_point, SentenceBreakProperty property);