mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-03 16:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibUnicode: Port Intl.PluralRules to UTF-16 strings

Browse source
This commit is contained in:
Timothy Flynn 2025-07-23 15:25:14 -04:00 • committed by Andreas Kling
commit abcb2d42bc
Notes: github-actions[bot] 2025-07-24 08:41:14 +00:00
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibUnicode/ICU.cpp
View file

@ -169,6 +169,11 @@ Utf16String icu_string_to_utf16_string(UChar const* string, i32 length)
return Utf16String::from_utf16_without_validation({ string, static_cast<size_t>(length) }); return Utf16String::from_utf16_without_validation({ string, static_cast<size_t>(length) });
} }
Utf16View icu_string_to_utf16_view(icu::UnicodeString const& string)
{
return { string.getBuffer(), static_cast<size_t>(string.length()) };
}
UCharIterator icu_string_iterator(Utf16View const& string) UCharIterator icu_string_iterator(Utf16View const& string)
{ {
UCharIterator iterator; UCharIterator iterator;

2
Libraries/LibUnicode/ICU.h
View file

@ -116,6 +116,8 @@ String icu_string_to_string(UChar const*, i32 length);
Utf16String icu_string_to_utf16_string(icu::UnicodeString const& string); Utf16String icu_string_to_utf16_string(icu::UnicodeString const& string);
Utf16String icu_string_to_utf16_string(UChar const*, i32 length); Utf16String icu_string_to_utf16_string(UChar const*, i32 length);
Utf16View icu_string_to_utf16_view(icu::UnicodeString const& string);
UCharIterator icu_string_iterator(Utf16View const&); UCharIterator icu_string_iterator(Utf16View const&);
template<typename Filter> template<typename Filter>

6
Libraries/LibUnicode/NumberFormat.cpp
View file

@ -671,7 +671,7 @@ public:
if (icu_failure(status)) if (icu_failure(status))
return PluralCategory::Other; return PluralCategory::Other;
return plural_category_from_string(icu_string_to_string(result)); return plural_category_from_string(icu_string_to_utf16_view(result));
} }
virtual PluralCategory select_plural_range(double start, double end) const override virtual PluralCategory select_plural_range(double start, double end) const override
@ -694,7 +694,7 @@ public:
if (icu_failure(status)) if (icu_failure(status))
return PluralCategory::Other; return PluralCategory::Other;
return plural_category_from_string(icu_string_to_string(result)); return plural_category_from_string(icu_string_to_utf16_view(result));
} }
virtual Vector<PluralCategory> available_plural_categories() const override virtual Vector<PluralCategory> available_plural_categories() const override
@ -710,7 +710,7 @@ public:
while (true) { while (true) {
i32 length = 0; i32 length = 0;
auto const* category = keywords->next(&length, status); auto const* category = keywords->unext(&length, status);
if (icu_failure(status) || category == nullptr) if (icu_failure(status) || category == nullptr)
break; break;

6
Libraries/LibUnicode/PluralRules.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2024, Tim Flynn <trflynn89@serenityos.org> * Copyright (c) 2022-2025, Tim Flynn <trflynn89@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -28,7 +28,7 @@ StringView plural_form_to_string(PluralForm plural_form)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
PluralCategory plural_category_from_string(StringView category) PluralCategory plural_category_from_string(Utf16View const& category)
{ {
if (category == "other"sv) if (category == "other"sv)
return PluralCategory::Other; return PluralCategory::Other;
@ -49,7 +49,7 @@ PluralCategory plural_category_from_string(StringView category)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
StringView plural_category_to_string(PluralCategory category) Utf16View plural_category_to_string(PluralCategory category)
{ {
switch (category) { switch (category) {
case PluralCategory::Other: case PluralCategory::Other:

7
Libraries/LibUnicode/PluralRules.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2024, Tim Flynn <trflynn89@ladybird.org> * Copyright (c) 2022-2025, Tim Flynn <trflynn89@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/StringView.h> #include <AK/StringView.h>
#include <AK/Utf16View.h>
namespace Unicode { namespace Unicode {
@ -30,7 +31,7 @@ enum class PluralCategory {
ExactlyZero, ExactlyZero,
ExactlyOne, ExactlyOne,
}; };
PluralCategory plural_category_from_string(StringView); PluralCategory plural_category_from_string(Utf16View const&);
StringView plural_category_to_string(PluralCategory); Utf16View plural_category_to_string(PluralCategory);
} }