LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-08-15 16:30:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibLocale: Move locale source files to the LibLocale folder

Browse Source 
These are still included in LibUnicode, but this updates their location
and the include paths of other files which include them.
This commit is contained in:
Timothy Flynn 2022-09-02 12:11:30 -04:00 committed by Tim Flynn
parent ff48220dca
commit 43a3471298
Notes: sideshowbarker 2024-07-17 07:30:02 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/43a3471298
Pull-request: https://github.com/SerenityOS/serenity/pull/15096
Reviewed-by: https://github.com/linusg ✅
48 changed files with 145 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Meta/Lagom/CMakeLists.txt
View File

@ -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=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
target_compile_options(LibUnicode PRIVATE -Wno-parentheses-equality)

8
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
View File

@ -24,8 +24,8 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/Stream.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
using StringIndexType = u16;
constexpr auto s_string_index_type = "u16"sv;
@ -1768,11 +1768,11 @@ static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::Buffer
#include <AK/BinarySearch.h>
#include <AK/Optional.h>
#include <AK/StringView.h>
#include <LibLocale/LocaleData.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/DateTimeFormatData.h>
#include <LibLocale/Locale.h>
#include <LibLocale/LocaleData.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
namespace Locale {
)~~~");

4
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
View File

@ -1102,10 +1102,10 @@ static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::Buffer
#include <AK/Span.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/LocaleData.h>
#include <LibUnicode/CurrencyCode.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
namespace Locale {
)~~~");

12
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
View File

@ -27,9 +27,9 @@
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibJS/Runtime/Intl/SingleUnitIdentifiers.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
#include <LibLocale/PluralRules.h>
#include <math.h>
using StringIndexType = u16;
@ -806,11 +806,11 @@ static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::Buffer
#include <AK/Span.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibLocale/Locale.h>
#include <LibLocale/LocaleData.h>
#include <LibLocale/NumberFormat.h>
#include <LibLocale/NumberFormatData.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/PluralRules.h>
namespace Locale {
)~~~");

6
Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp
View File

@ -17,7 +17,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/PluralRules.h>
using StringIndexType = u16;
@ -460,10 +460,10 @@ static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::Buffer
generator.append(R"~~~(
#include <AK/Array.h>
#include <LibLocale/Locale.h>
#include <LibLocale/LocaleData.h>
#include <LibLocale/PluralRules.h>
#include <LibLocale/PluralRulesData.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/PluralRules.h>
#include <math.h>
namespace Locale {

12
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
View File

@ -17,8 +17,8 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/Stream.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/RelativeTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/RelativeTimeFormat.h>
using StringIndexType = u16;
constexpr auto s_string_index_type = "u16"sv;
@ -178,7 +178,7 @@ static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile&
generator.append(R"~~~(
#pragma once
#include <LibUnicode/Forward.h>
#include <LibLocale/Forward.h>
namespace Locale {
)~~~");
@ -202,10 +202,10 @@ static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::Buffer
#include <AK/Array.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibLocale/Locale.h>
#include <LibLocale/PluralRules.h>
#include <LibLocale/RelativeTimeFormat.h>
#include <LibLocale/RelativeTimeFormatData.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/PluralRules.h>
#include <LibUnicode/RelativeTimeFormat.h>
namespace Locale {
)~~~");

2
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
View File

@ -23,7 +23,7 @@
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
template<class T>
inline constexpr bool StorageTypeIsList = false;

2
Tests/LibUnicode/TestUnicodeDateTimeFormat.cpp
View File

@ -9,7 +9,7 @@
#include <AK/Array.h>
#include <AK/StringView.h>
#include <AK/Time.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibLocale/DateTimeFormat.h>
TEST_CASE(time_zone_name)
{

2
Tests/LibUnicode/TestUnicodeLocale.cpp
View File

@ -6,7 +6,7 @@
#include <LibTest/TestCase.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
TEST_CASE(is_unicode_language_subtag)
{

4
Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp
View File

@ -17,9 +17,9 @@
#include <LibGUI/Painter.h>
#include <LibGUI/Process.h>
#include <LibGfx/Palette.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
#include <math.h>
#include <spawn.h>
#include <unistd.h>

4
Userland/Libraries/LibJS/Runtime/DatePrototype.cpp
View File

@ -24,9 +24,9 @@
#include <LibJS/Runtime/Intl/DateTimeFormatConstructor.h>
#include <LibJS/Runtime/Temporal/Instant.h>
#include <LibJS/Runtime/Value.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
namespace JS {

2
Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp
View File

@ -15,7 +15,7 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/Locale.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.h
View File

@ -15,7 +15,7 @@
#include <LibJS/Runtime/Intl/SingleUnitIdentifiers.h>
#include <LibJS/Runtime/Temporal/AbstractOperations.h>
#include <LibJS/Runtime/Value.h>
#include <LibUnicode/Forward.h>
#include <LibLocale/Forward.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp
View File

@ -10,7 +10,7 @@
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/Collator.h>
#include <LibJS/Runtime/Intl/CollatorConstructor.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

4
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View File

@ -15,8 +15,8 @@
#include <LibJS/Runtime/Intl/NumberFormatConstructor.h>
#include <LibJS/Runtime/NativeFunction.h>
#include <LibJS/Runtime/Utf16String.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
#include <math.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h
View File

@ -15,7 +15,7 @@
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibLocale/DateTimeFormat.h>
namespace JS::Intl {

4
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp
View File

@ -11,8 +11,8 @@
#include <LibJS/Runtime/Intl/DateTimeFormat.h>
#include <LibJS/Runtime/Intl/DateTimeFormatConstructor.h>
#include <LibJS/Runtime/Temporal/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatPrototype.cpp
View File

@ -9,7 +9,7 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/DateTimeFormatFunction.h>
#include <LibJS/Runtime/Intl/DateTimeFormatPrototype.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibLocale/DateTimeFormat.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.h
View File

@ -10,7 +10,7 @@
#include <AK/String.h>
#include <AK/StringView.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesConstructor.cpp
View File

@ -11,7 +11,7 @@
#include <LibJS/Runtime/Intl/DisplayNames.h>
#include <LibJS/Runtime/Intl/DisplayNamesConstructor.h>
#include <LibJS/Runtime/Temporal/AbstractOperations.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/DisplayNamesPrototype.cpp
View File

@ -9,7 +9,7 @@
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/DisplayNames.h>
#include <LibJS/Runtime/Intl/DisplayNamesPrototype.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

6
Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp
View File

@ -20,9 +20,9 @@
#include <LibJS/Runtime/Intl/RelativeTimeFormatConstructor.h>
#include <LibJS/Runtime/Intl/SegmenterConstructor.h>
#include <LibJS/Runtime/Temporal/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/ListFormat.h
View File

@ -13,7 +13,7 @@
#include <AK/Vector.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

4
Userland/Libraries/LibJS/Runtime/Intl/Locale.cpp
View File

@ -8,9 +8,9 @@
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/Locale.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/Locale.h
View File

@ -13,7 +13,7 @@
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/Object.h>
#include <LibJS/Runtime/Value.h>
#include <LibUnicode/Forward.h>
#include <LibLocale/Forward.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp
View File

@ -11,7 +11,7 @@
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/Locale.h>
#include <LibJS/Runtime/Intl/LocaleConstructor.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/LocalePrototype.cpp
View File

@ -9,7 +9,7 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/Locale.h>
#include <LibJS/Runtime/Intl/LocalePrototype.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

4
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.h
View File

@ -12,8 +12,8 @@
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/MathematicalValue.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/NumberFormatConstructor.cpp
View File

@ -9,7 +9,7 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/NumberFormatConstructor.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h
View File

@ -11,7 +11,7 @@
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/Intl/NumberFormat.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/PluralRules.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp
View File

@ -8,7 +8,7 @@
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/PluralRulesPrototype.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/PluralRules.h>
namespace JS::Intl {

4
Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormat.h
View File

@ -12,8 +12,8 @@
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Object.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/RelativeTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/RelativeTimeFormat.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/Intl/RelativeTimeFormatConstructor.cpp
View File

@ -14,7 +14,7 @@
#include <LibJS/Runtime/Intl/PluralRulesConstructor.h>
#include <LibJS/Runtime/Intl/RelativeTimeFormat.h>
#include <LibJS/Runtime/Intl/RelativeTimeFormatConstructor.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Locale.h>
namespace JS::Intl {

2
Userland/Libraries/LibJS/Runtime/StringPrototype.cpp
View File

@ -26,8 +26,8 @@
#include <LibJS/Runtime/StringPrototype.h>
#include <LibJS/Runtime/Utf16String.h>
#include <LibJS/Runtime/Value.h>
#include <LibLocale/Locale.h>
#include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/Locale.h>
#include <string.h>
namespace JS {

6
Userland/Libraries/LibUnicode/DateTimeFormat.cpp → Userland/Libraries/LibLocale/DateTimeFormat.cpp
View File

@ -6,9 +6,9 @@
#include <AK/Array.h>
#include <AK/StringBuilder.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
#include <stdlib.h>
namespace Locale {

2
Userland/Libraries/LibUnicode/DateTimeFormat.h → Userland/Libraries/LibLocale/DateTimeFormat.h
View File

@ -12,8 +12,8 @@
#include <AK/Time.h>
#include <AK/Types.h>
#include <AK/Vector.h>
#include <LibLocale/Forward.h>
#include <LibTimeZone/TimeZone.h>
#include <LibUnicode/Forward.h>
namespace Locale {

63
Userland/Libraries/LibLocale/Forward.h Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (c) 2021-2022, Tim Flynn <trflynn89@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Types.h>
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;
}

4
Userland/Libraries/LibUnicode/Locale.cpp → Userland/Libraries/LibLocale/Locale.cpp
View File

@ -8,9 +8,9 @@
#include <AK/GenericLexer.h>
#include <AK/QuickSort.h>
#include <AK/StringBuilder.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibLocale/Locale.h>
#include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
namespace Locale {

2
Userland/Libraries/LibUnicode/Locale.h → Userland/Libraries/LibLocale/Locale.h
View File

@ -12,7 +12,7 @@
#include <AK/StringView.h>
#include <AK/Variant.h>
#include <AK/Vector.h>
#include <LibUnicode/Forward.h>
#include <LibLocale/Forward.h>
namespace Locale {

4
Userland/Libraries/LibUnicode/NumberFormat.cpp → Userland/Libraries/LibLocale/NumberFormat.cpp
View File

@ -6,9 +6,9 @@
#include <AK/CharacterTypes.h>
#include <AK/Utf8View.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
#include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#if ENABLE_UNICODE_DATA
# include <LibUnicode/UnicodeData.h>

4
Userland/Libraries/LibUnicode/NumberFormat.h → Userland/Libraries/LibLocale/NumberFormat.h
View File

@ -10,8 +10,8 @@
#include <AK/String.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibUnicode/Forward.h>
#include <LibUnicode/PluralRules.h>
#include <LibLocale/Forward.h>
#include <LibLocale/PluralRules.h>
namespace Locale {

2
Userland/Libraries/LibUnicode/PluralRules.cpp → Userland/Libraries/LibLocale/PluralRules.cpp
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibUnicode/PluralRules.h>
#include <LibLocale/PluralRules.h>
namespace Locale {

2
Userland/Libraries/LibUnicode/PluralRules.h → Userland/Libraries/LibLocale/PluralRules.h
View File

@ -9,7 +9,7 @@
#include <AK/Assertions.h>
#include <AK/StringView.h>
#include <AK/Types.h>
#include <LibUnicode/Forward.h>
#include <LibLocale/Forward.h>
namespace Locale {

2
Userland/Libraries/LibUnicode/RelativeTimeFormat.cpp → Userland/Libraries/LibLocale/RelativeTimeFormat.cpp
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibUnicode/RelativeTimeFormat.h>
#include <LibLocale/RelativeTimeFormat.h>
namespace Locale {

4
Userland/Libraries/LibUnicode/RelativeTimeFormat.h → Userland/Libraries/LibLocale/RelativeTimeFormat.h
View File

@ -9,8 +9,8 @@
#include <AK/Optional.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibUnicode/Forward.h>
#include <LibUnicode/Locale.h>
#include <LibLocale/Forward.h>
#include <LibLocale/Locale.h>
namespace Locale {

10
Userland/Libraries/LibUnicode/CMakeLists.txt
View File

@ -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}
)

2
Userland/Libraries/LibUnicode/CharacterTypes.cpp
View File

@ -10,8 +10,8 @@
#include <AK/Types.h>
#include <AK/Utf16View.h>
#include <AK/Utf8View.h>
#include <LibLocale/Locale.h>
#include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/Locale.h>
#if ENABLE_UNICODE_DATA
# include <LibUnicode/UnicodeData.h>

54
Userland/Libraries/LibUnicode/Forward.h
View File

@ -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;
}