LibUnicode: Replace code point bidirectional classes with ICU

Author: trflynn89

Meta/CMake/unicode_data.cmake

@@ -10,9 +10,6 @@ set(UCD_VERSION_FILE "${UCD_PATH}/version.txt")
 set(UCD_ZIP_URL "https://www.unicode.org/Public/${UCD_VERSION}/ucd/UCD.zip")
 set(UCD_ZIP_PATH "${UCD_PATH}/UCD.zip")
 
-set(UNICODE_DATA_SOURCE "UnicodeData.txt")
-set(UNICODE_DATA_PATH "${UCD_PATH}/${UNICODE_DATA_SOURCE}")
-
 string(REGEX REPLACE "([0-9]+\\.[0-9]+)\\.[0-9]+" "\\1" EMOJI_VERSION "${UCD_VERSION}")
 set(EMOJI_TEST_URL "https://www.unicode.org/Public/emoji/${EMOJI_VERSION}/emoji-test.txt")
 set(EMOJI_TEST_PATH "${UCD_PATH}/emoji-test.txt")
@@ -26,33 +23,19 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD)
 
     if (ENABLE_NETWORK_DOWNLOADS)
         download_file("${UCD_ZIP_URL}" "${UCD_ZIP_PATH}" SHA256 "${UCD_SHA256}")
-        extract_path("${UCD_PATH}" "${UCD_ZIP_PATH}" "${UNICODE_DATA_SOURCE}" "${UNICODE_DATA_PATH}")
-
         download_file("${EMOJI_TEST_URL}" "${EMOJI_TEST_PATH}" SHA256 "${EMOJI_SHA256}")
     else()
         message(STATUS "Skipping download of ${UCD_ZIP_URL}, expecting the archive to have been extracted to ${UCD_ZIP_PATH}")
         message(STATUS "Skipping download of ${EMOJI_TEST_URL}, expecting the file to be at ${EMOJI_TEST_PATH}")
     endif()
 
-
-    set(UNICODE_DATA_HEADER UnicodeData.h)
-    set(UNICODE_DATA_IMPLEMENTATION UnicodeData.cpp)
-
     set(EMOJI_DATA_HEADER EmojiData.h)
     set(EMOJI_DATA_IMPLEMENTATION EmojiData.cpp)
 
     if (SERENITYOS)
         set(EMOJI_INSTALL_ARG -i "${EMOJI_INSTALL_PATH}")
     endif()
 
-    invoke_generator(
-        "UnicodeData"
-        Lagom::GenerateUnicodeData
-        "${UCD_VERSION_FILE}"
-        "${UNICODE_DATA_HEADER}"
-        "${UNICODE_DATA_IMPLEMENTATION}"
-        arguments -u "${UNICODE_DATA_PATH}"
-    )
     invoke_generator(
         "EmojiData"
         Lagom::GenerateEmojiData
@@ -69,8 +52,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD)
     )
 
     set(UNICODE_DATA_SOURCES
-        ${UNICODE_DATA_HEADER}
-        ${UNICODE_DATA_IMPLEMENTATION}
         ${EMOJI_DATA_HEADER}
         ${EMOJI_DATA_IMPLEMENTATION}
     )

Meta/Lagom/Tools/CodeGenerators/LibUnicode/CMakeLists.txt

@@ -1,2 +1 @@
-lagom_tool(GenerateUnicodeData SOURCES GenerateUnicodeData.cpp LIBS LibMain)
 lagom_tool(GenerateEmojiData SOURCES GenerateEmojiData.cpp LIBS LibMain)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org>
+ * Copyright (c) 2021-2024, Tim Flynn <trflynn89@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -307,25 +307,13 @@ TEST_CASE(script_extension)
 
 TEST_CASE(code_point_bidirectional_character_type)
 {
-    auto code_point_bidi_class = [](u32 code_point) {
-        auto bidi_class = Unicode::bidirectional_class(code_point);
-        VERIFY(bidi_class.has_value());
-        return bidi_class.release_value();
-    };
-
-    auto bidi_class_from_string = [](StringView name) {
-        auto result = Unicode::bidirectional_class_from_string(name);
-        VERIFY(result.has_value());
-        return result.release_value();
-    };
-
     // Left-to-right
-    EXPECT_EQ(code_point_bidi_class('A'), bidi_class_from_string("L"sv));
-    EXPECT_EQ(code_point_bidi_class('z'), bidi_class_from_string("L"sv));
+    EXPECT_EQ(Unicode::bidirectional_class('A'), Unicode::BidiClass::LeftToRight);
+    EXPECT_EQ(Unicode::bidirectional_class('z'), Unicode::BidiClass::LeftToRight);
     // European number
-    EXPECT_EQ(code_point_bidi_class('7'), bidi_class_from_string("EN"sv));
+    EXPECT_EQ(Unicode::bidirectional_class('7'), Unicode::BidiClass::EuropeanNumber);
     // Whitespace
-    EXPECT_EQ(code_point_bidi_class(' '), bidi_class_from_string("WS"sv));
+    EXPECT_EQ(Unicode::bidirectional_class(' '), Unicode::BidiClass::WhiteSpaceNeutral);
     // Arabic right-to-left (U+FEB4 ARABIC LETTER SEEN MEDIAL FORM)
-    EXPECT_EQ(code_point_bidi_class(0xFEB4), bidi_class_from_string("AL"sv));
+    EXPECT_EQ(Unicode::bidirectional_class(0xFEB4), Unicode::BidiClass::RightToLeftArabic);
 }