From 43a3471298c429530aaf8c8cf2e2c3563079a9e4 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 2 Sep 2022 12:11:30 -0400 Subject: [PATCH] LibLocale: Move locale source files to the LibLocale folder These are still included in LibUnicode, but this updates their location and the include paths of other files which include them. --- Meta/Lagom/CMakeLists.txt | 3 +- .../LibLocale/GenerateDateTimeFormatData.cpp | 8 +-- .../LibLocale/GenerateLocaleData.cpp | 4 +- .../LibLocale/GenerateNumberFormatData.cpp | 12 ++-- .../LibLocale/GeneratePluralRulesData.cpp | 6 +- .../GenerateRelativeTimeFormatData.cpp | 12 ++-- .../CodeGenerators/LibUnicode/GeneratorUtil.h | 2 +- .../LibUnicode/TestUnicodeDateTimeFormat.cpp | 2 +- Tests/LibUnicode/TestUnicodeLocale.cpp | 2 +- .../ClockSettings/TimeZoneSettingsWidget.cpp | 4 +- .../Libraries/LibJS/Runtime/DatePrototype.cpp | 4 +- .../LibJS/Runtime/Intl/AbstractOperations.cpp | 2 +- .../LibJS/Runtime/Intl/AbstractOperations.h | 2 +- .../Runtime/Intl/CollatorConstructor.cpp | 2 +- .../LibJS/Runtime/Intl/DateTimeFormat.cpp | 4 +- .../LibJS/Runtime/Intl/DateTimeFormat.h | 2 +- .../Intl/DateTimeFormatConstructor.cpp | 4 +- .../Runtime/Intl/DateTimeFormatPrototype.cpp | 2 +- .../LibJS/Runtime/Intl/DisplayNames.h | 2 +- .../Runtime/Intl/DisplayNamesConstructor.cpp | 2 +- .../Runtime/Intl/DisplayNamesPrototype.cpp | 2 +- .../Libraries/LibJS/Runtime/Intl/Intl.cpp | 6 +- .../Libraries/LibJS/Runtime/Intl/ListFormat.h | 2 +- .../Libraries/LibJS/Runtime/Intl/Locale.cpp | 4 +- .../Libraries/LibJS/Runtime/Intl/Locale.h | 2 +- .../LibJS/Runtime/Intl/LocaleConstructor.cpp | 2 +- .../LibJS/Runtime/Intl/LocalePrototype.cpp | 2 +- .../LibJS/Runtime/Intl/NumberFormat.h | 4 +- .../Runtime/Intl/NumberFormatConstructor.cpp | 2 +- .../LibJS/Runtime/Intl/PluralRules.h | 2 +- .../Runtime/Intl/PluralRulesPrototype.cpp | 2 +- .../LibJS/Runtime/Intl/RelativeTimeFormat.h | 4 +- .../Intl/RelativeTimeFormatConstructor.cpp | 2 +- .../LibJS/Runtime/StringPrototype.cpp | 2 +- .../DateTimeFormat.cpp | 6 +- .../DateTimeFormat.h | 2 +- Userland/Libraries/LibLocale/Forward.h | 63 +++++++++++++++++++ .../{LibUnicode => LibLocale}/Locale.cpp | 4 +- .../{LibUnicode => LibLocale}/Locale.h | 2 +- .../NumberFormat.cpp | 4 +- .../{LibUnicode => LibLocale}/NumberFormat.h | 4 +- .../{LibUnicode => LibLocale}/PluralRules.cpp | 2 +- .../{LibUnicode => LibLocale}/PluralRules.h | 2 +- .../RelativeTimeFormat.cpp | 2 +- .../RelativeTimeFormat.h | 4 +- Userland/Libraries/LibUnicode/CMakeLists.txt | 10 +-- .../Libraries/LibUnicode/CharacterTypes.cpp | 2 +- Userland/Libraries/LibUnicode/Forward.h | 54 ---------------- 48 files changed, 145 insertions(+), 135 deletions(-) rename Userland/Libraries/{LibUnicode => LibLocale}/DateTimeFormat.cpp (99%) rename Userland/Libraries/{LibUnicode => LibLocale}/DateTimeFormat.h (99%) create mode 100644 Userland/Libraries/LibLocale/Forward.h rename Userland/Libraries/{LibUnicode => LibLocale}/Locale.cpp (99%) rename Userland/Libraries/{LibUnicode => LibLocale}/Locale.h (99%) rename Userland/Libraries/{LibUnicode => LibLocale}/NumberFormat.cpp (98%) rename Userland/Libraries/{LibUnicode => LibLocale}/NumberFormat.h (96%) rename Userland/Libraries/{LibUnicode => LibLocale}/PluralRules.cpp (96%) rename Userland/Libraries/{LibUnicode => LibLocale}/PluralRules.h (99%) rename Userland/Libraries/{LibUnicode => LibLocale}/RelativeTimeFormat.cpp (97%) rename Userland/Libraries/{LibUnicode => LibLocale}/RelativeTimeFormat.h (92%) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 472ebbf7d83..d330d55ac57 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -504,8 +504,9 @@ if (BUILD_LAGOM) include(unicode_data) include(locale_data) file(GLOB LIBUNICODE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibUnicode/*.cpp") + file(GLOB LIBLOCALE_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibLocale/*.cpp") lagom_lib(Unicode unicode - SOURCES ${LIBUNICODE_SOURCES} ${UNICODE_DATA_SOURCES} ${LOCALE_DATA_SOURCES} + SOURCES ${LIBUNICODE_SOURCES} ${UNICODE_DATA_SOURCES} ${LIBLOCALE_SOURCES} ${LOCALE_DATA_SOURCES} ) target_compile_definitions(LibUnicode PRIVATE ENABLE_UNICODE_DATA=$) target_compile_options(LibUnicode PRIVATE -Wno-parentheses-equality) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp index 860eef598ef..644bbd08182 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp @@ -24,8 +24,8 @@ #include #include #include +#include #include -#include using StringIndexType = u16; constexpr auto s_string_index_type = "u16"sv; @@ -1768,11 +1768,11 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include -#include +#include #include +#include +#include #include -#include -#include namespace Locale { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index 933ff85893d..32f34ac24b2 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1102,10 +1102,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include +#include #include #include -#include -#include namespace Locale { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp index dc935b63429..0451b5c9894 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include using StringIndexType = u16; @@ -806,11 +806,11 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include #include +#include #include -#include -#include -#include +#include namespace Locale { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp index 55213981235..46af3a493dd 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include using StringIndexType = u16; @@ -460,10 +460,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer generator.append(R"~~~( #include +#include #include +#include #include -#include -#include #include namespace Locale { diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp index 736c3952f46..dc2db86d330 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include using StringIndexType = u16; constexpr auto s_string_index_type = "u16"sv; @@ -178,7 +178,7 @@ static ErrorOr generate_unicode_locale_header(Core::Stream::BufferedFile& generator.append(R"~~~( #pragma once -#include +#include namespace Locale { )~~~"); @@ -202,10 +202,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include +#include +#include #include -#include -#include -#include namespace Locale { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h index 75aafd5fa02..d9afa5fcdaa 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include template inline constexpr bool StorageTypeIsList = false; diff --git a/Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp b/Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp index de6c8cd4a78..0ba07fd5462 100644 --- a/Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp +++ b/Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include TEST_CASE(time_zone_name) { diff --git a/Tests/LibUnicode/TestUnicodeLocale.cpp b/Tests/LibUnicode/TestUnicodeLocale.cpp index 954c2501e0e..0e807075e62 100644 --- a/Tests/LibUnicode/TestUnicodeLocale.cpp +++ b/Tests/LibUnicode/TestUnicodeLocale.cpp @@ -6,7 +6,7 @@ #include -#include +#include TEST_CASE(is_unicode_language_subtag) { diff --git a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp index 20617396b72..25722449e0b 100644 --- a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp +++ b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp @@ -17,9 +17,9 @@ #include #include #include +#include +#include #include -#include -#include #include #include #include diff --git a/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp b/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp index f1b9ac2bc59..75a407d626b 100644 --- a/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp @@ -24,9 +24,9 @@ #include #include #include +#include +#include #include -#include -#include namespace JS { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp index e2a8be9e781..34495b0c5e4 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h index a0647ea77f3..326fab3274f 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp index 5baf56d3546..968f78ab976 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp index 168f96ff724..22643b6dc29 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h index 1e82b48cd1b..fffdcdfd211 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp index 6ce652cadf3..8c772d22bfc 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatPrototype.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatPrototype.cpp index 5b55acaa903..4afb1192f60 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatPrototype.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.h b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.h index 99e833637f3..ebe0a55f9c0 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesConstructor.cpp index 4f5cb0d3583..aa4de4ef26f 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesConstructor.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp index 07230e47794..22e4484e7a5 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp index a954621cbe8..6cb12be1147 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/ListFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/ListFormat.h index 6a3d835a9a2..29e44d63e37 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/ListFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/ListFormat.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp b/Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp index 6efede1be70..e62d37ed477 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp @@ -8,9 +8,9 @@ #include #include #include +#include +#include #include -#include -#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Locale.h b/Userland/Libraries/LibJS/Runtime/Intl/Locale.h index 1ebdfa1e4f5..571e1754031 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Locale.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/Locale.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp index 117ee6f7ecb..89c6bf3517a 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/LocalePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Intl/LocalePrototype.cpp index 38c3e26b648..9e57070227d 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/LocalePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/LocalePrototype.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h index 8c7d6a88e21..c6ad87960eb 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp index 5cb4709473f..429ee1a88d1 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h index 7a5751d7107..2259d40620f 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp index db94ebcfa55..f6c948cf8cd 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormat.h index d1431aed45f..4c1615cd2de 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormat.h @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormatConstructor.cpp index c30c7713e44..976db150cf1 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormatConstructor.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace JS::Intl { diff --git a/Userland/Libraries/LibJS/Runtime/StringPrototype.cpp b/Userland/Libraries/LibJS/Runtime/StringPrototype.cpp index 41cf8a6e922..6a2847da6b7 100644 --- a/Userland/Libraries/LibJS/Runtime/StringPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/StringPrototype.cpp @@ -26,8 +26,8 @@ #include #include #include +#include #include -#include #include namespace JS { diff --git a/Userland/Libraries/LibUnicode/DateTimeFormat.cpp b/Userland/Libraries/LibLocale/DateTimeFormat.cpp similarity index 99% rename from Userland/Libraries/LibUnicode/DateTimeFormat.cpp rename to Userland/Libraries/LibLocale/DateTimeFormat.cpp index 95e0b86fd2f..ee01d66fed6 100644 --- a/Userland/Libraries/LibUnicode/DateTimeFormat.cpp +++ b/Userland/Libraries/LibLocale/DateTimeFormat.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/DateTimeFormat.h b/Userland/Libraries/LibLocale/DateTimeFormat.h similarity index 99% rename from Userland/Libraries/LibUnicode/DateTimeFormat.h rename to Userland/Libraries/LibLocale/DateTimeFormat.h index a0a96b0f393..b948eae9a7a 100644 --- a/Userland/Libraries/LibUnicode/DateTimeFormat.h +++ b/Userland/Libraries/LibLocale/DateTimeFormat.h @@ -12,8 +12,8 @@ #include #include #include +#include #include -#include namespace Locale { diff --git a/Userland/Libraries/LibLocale/Forward.h b/Userland/Libraries/LibLocale/Forward.h new file mode 100644 index 00000000000..b503f19feb4 --- /dev/null +++ b/Userland/Libraries/LibLocale/Forward.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021-2022, Tim Flynn + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Locale { + +enum class CalendarFormatType : u8; +enum class CalendarPatternStyle : u8; +enum class CalendarSymbol : u8; +enum class CharacterOrder : u8; +enum class CompactNumberFormatType : u8; +enum class Condition : u8; +enum class Currency : u16; +enum class DateField : u8; +enum class DayPeriod : u8; +enum class Era : u8; +enum class FirstDayRegion : u8; +enum class HourCycle : u8; +enum class HourCycleRegion : u16; +enum class Key : u8; +enum class KeywordCalendar : u8; +enum class KeywordCollation : u8; +enum class KeywordColCaseFirst : u8; +enum class KeywordColNumeric : u8; +enum class KeywordHours : u8; +enum class KeywordNumbers : u8; +enum class Language : u16; +enum class ListPatternType : u8; +enum class Locale : u16; +enum class MinimumDaysRegion : u8; +enum class Month : u8; +enum class NumericSymbol : u8; +enum class PluralCategory : u8; +enum class ScriptTag : u8; +enum class StandardNumberFormatType : u8; +enum class Style : u8; +enum class Territory : u8; +enum class Weekday : u8; +enum class WeekendEndRegion : u8; +enum class WeekendStartRegion : u8; + +struct CalendarFormat; +struct CalendarPattern; +struct CalendarRangePattern; +struct Keyword; +struct LanguageID; +struct ListPatterns; +struct LocaleExtension; +struct LocaleID; +struct NumberFormat; +struct NumberGroupings; +struct OtherExtension; +struct PluralOperands; +struct TransformedExtension; +struct TransformedField; + +} diff --git a/Userland/Libraries/LibUnicode/Locale.cpp b/Userland/Libraries/LibLocale/Locale.cpp similarity index 99% rename from Userland/Libraries/LibUnicode/Locale.cpp rename to Userland/Libraries/LibLocale/Locale.cpp index bad62682da9..474058232a5 100644 --- a/Userland/Libraries/LibUnicode/Locale.cpp +++ b/Userland/Libraries/LibLocale/Locale.cpp @@ -8,9 +8,9 @@ #include #include #include +#include +#include #include -#include -#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/Locale.h b/Userland/Libraries/LibLocale/Locale.h similarity index 99% rename from Userland/Libraries/LibUnicode/Locale.h rename to Userland/Libraries/LibLocale/Locale.h index 451a76acd1e..111275e378d 100644 --- a/Userland/Libraries/LibUnicode/Locale.h +++ b/Userland/Libraries/LibLocale/Locale.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/NumberFormat.cpp b/Userland/Libraries/LibLocale/NumberFormat.cpp similarity index 98% rename from Userland/Libraries/LibUnicode/NumberFormat.cpp rename to Userland/Libraries/LibLocale/NumberFormat.cpp index 8200439db10..39a09c58e54 100644 --- a/Userland/Libraries/LibUnicode/NumberFormat.cpp +++ b/Userland/Libraries/LibLocale/NumberFormat.cpp @@ -6,9 +6,9 @@ #include #include +#include +#include #include -#include -#include #if ENABLE_UNICODE_DATA # include diff --git a/Userland/Libraries/LibUnicode/NumberFormat.h b/Userland/Libraries/LibLocale/NumberFormat.h similarity index 96% rename from Userland/Libraries/LibUnicode/NumberFormat.h rename to Userland/Libraries/LibLocale/NumberFormat.h index a8fdaca649f..baadc3c8dbc 100644 --- a/Userland/Libraries/LibUnicode/NumberFormat.h +++ b/Userland/Libraries/LibLocale/NumberFormat.h @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/PluralRules.cpp b/Userland/Libraries/LibLocale/PluralRules.cpp similarity index 96% rename from Userland/Libraries/LibUnicode/PluralRules.cpp rename to Userland/Libraries/LibLocale/PluralRules.cpp index 11c88e2ac5b..1f56f6cbe7b 100644 --- a/Userland/Libraries/LibUnicode/PluralRules.cpp +++ b/Userland/Libraries/LibLocale/PluralRules.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/PluralRules.h b/Userland/Libraries/LibLocale/PluralRules.h similarity index 99% rename from Userland/Libraries/LibUnicode/PluralRules.h rename to Userland/Libraries/LibLocale/PluralRules.h index 7bfdccc81ed..0f93234b7f8 100644 --- a/Userland/Libraries/LibUnicode/PluralRules.h +++ b/Userland/Libraries/LibLocale/PluralRules.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/RelativeTimeFormat.cpp b/Userland/Libraries/LibLocale/RelativeTimeFormat.cpp similarity index 97% rename from Userland/Libraries/LibUnicode/RelativeTimeFormat.cpp rename to Userland/Libraries/LibLocale/RelativeTimeFormat.cpp index 16a06336ee1..7f5e24d13ec 100644 --- a/Userland/Libraries/LibUnicode/RelativeTimeFormat.cpp +++ b/Userland/Libraries/LibLocale/RelativeTimeFormat.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/RelativeTimeFormat.h b/Userland/Libraries/LibLocale/RelativeTimeFormat.h similarity index 92% rename from Userland/Libraries/LibUnicode/RelativeTimeFormat.h rename to Userland/Libraries/LibLocale/RelativeTimeFormat.h index bc59c184079..1a1914328b1 100644 --- a/Userland/Libraries/LibUnicode/RelativeTimeFormat.h +++ b/Userland/Libraries/LibLocale/RelativeTimeFormat.h @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include namespace Locale { diff --git a/Userland/Libraries/LibUnicode/CMakeLists.txt b/Userland/Libraries/LibUnicode/CMakeLists.txt index 8bafca34ab4..7779a8e06c5 100644 --- a/Userland/Libraries/LibUnicode/CMakeLists.txt +++ b/Userland/Libraries/LibUnicode/CMakeLists.txt @@ -3,11 +3,11 @@ include(${SerenityOS_SOURCE_DIR}/Meta/CMake/unicode_data.cmake) set(SOURCES CharacterTypes.cpp CurrencyCode.cpp - DateTimeFormat.cpp - Locale.cpp - NumberFormat.cpp - PluralRules.cpp - RelativeTimeFormat.cpp + ../LibLocale/DateTimeFormat.cpp + ../LibLocale/Locale.cpp + ../LibLocale/NumberFormat.cpp + ../LibLocale/PluralRules.cpp + ../LibLocale/RelativeTimeFormat.cpp ${UNICODE_DATA_SOURCES} ) diff --git a/Userland/Libraries/LibUnicode/CharacterTypes.cpp b/Userland/Libraries/LibUnicode/CharacterTypes.cpp index 465cdd4abaf..9a77b4b4bef 100644 --- a/Userland/Libraries/LibUnicode/CharacterTypes.cpp +++ b/Userland/Libraries/LibUnicode/CharacterTypes.cpp @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #if ENABLE_UNICODE_DATA # include diff --git a/Userland/Libraries/LibUnicode/Forward.h b/Userland/Libraries/LibUnicode/Forward.h index a228999d48b..c3b08d30886 100644 --- a/Userland/Libraries/LibUnicode/Forward.h +++ b/Userland/Libraries/LibUnicode/Forward.h @@ -22,57 +22,3 @@ struct CurrencyCode; struct SpecialCasing; } - -namespace Locale { - -enum class CalendarFormatType : u8; -enum class CalendarPatternStyle : u8; -enum class CalendarSymbol : u8; -enum class CharacterOrder : u8; -enum class CompactNumberFormatType : u8; -enum class Condition : u8; -enum class Currency : u16; -enum class DateField : u8; -enum class DayPeriod : u8; -enum class Era : u8; -enum class FirstDayRegion : u8; -enum class HourCycle : u8; -enum class HourCycleRegion : u16; -enum class Key : u8; -enum class KeywordCalendar : u8; -enum class KeywordCollation : u8; -enum class KeywordColCaseFirst : u8; -enum class KeywordColNumeric : u8; -enum class KeywordHours : u8; -enum class KeywordNumbers : u8; -enum class Language : u16; -enum class ListPatternType : u8; -enum class Locale : u16; -enum class MinimumDaysRegion : u8; -enum class Month : u8; -enum class NumericSymbol : u8; -enum class PluralCategory : u8; -enum class ScriptTag : u8; -enum class StandardNumberFormatType : u8; -enum class Style : u8; -enum class Territory : u8; -enum class Weekday : u8; -enum class WeekendEndRegion : u8; -enum class WeekendStartRegion : u8; - -struct CalendarFormat; -struct CalendarPattern; -struct CalendarRangePattern; -struct Keyword; -struct LanguageID; -struct ListPatterns; -struct LocaleExtension; -struct LocaleID; -struct NumberFormat; -struct NumberGroupings; -struct OtherExtension; -struct PluralOperands; -struct TransformedExtension; -struct TransformedField; - -}