RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2026-01-12 23:11:00 +00:00
Code Issues Activity Actions

LibUnicode: Convert UnicodeNumberFormat to link with weak symbols

Browse source 
Currently, we load the generated Unicode symbols with dlopen at runtime.
This is unnecessary as of 565a880ce5.

Applications that want Unicode data now link directly against the shared
library holding that data. So the same functionality can be achieved
with weak symbols.
This commit is contained in:
Timothy Flynn 2022-01-04 10:57:00 -05:00 • committed by Linus Groh
parent ffb3ba3079
commit 98709d9be1
4 changed files with 17 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibUnicode/NumberFormat.cpp
View file

@ -8,7 +8,6 @@
#include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/Locale.h>
#include <LibUnicode/NumberFormat.h>
#include <LibUnicode/UnicodeSymbols.h>
#if ENABLE_UNICODE_DATA
# include <LibUnicode/UnicodeData.h>
@ -16,35 +15,11 @@
namespace Unicode {
Optional<StringView> get_number_system_symbol(StringView locale, StringView system, NumericSymbol symbol)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_number_system_symbol(locale, system, symbol);
}
Optional<NumberGroupings> get_number_system_groupings(StringView locale, StringView system)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_number_system_groupings(locale, system);
}
Optional<NumberFormat> get_standard_number_system_format(StringView locale, StringView system, StandardNumberFormatType type)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_standard_number_system_format(locale, system, type);
}
Vector<NumberFormat> get_compact_number_system_formats(StringView locale, StringView system, CompactNumberFormatType type)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_compact_number_system_formats(locale, system, type);
}
Vector<NumberFormat> get_unit_formats(StringView locale, StringView unit, Style style)
{
static auto const& symbols = Detail::Symbols::ensure_loaded();
return symbols.get_unit_formats(locale, unit, style);
}
Optional<StringView> __attribute__((weak)) get_number_system_symbol(StringView, StringView, NumericSymbol) { return {}; }
Optional<NumberGroupings> __attribute__((weak)) get_number_system_groupings(StringView, StringView) { return {}; }
Optional<NumberFormat> __attribute__((weak)) get_standard_number_system_format(StringView, StringView, StandardNumberFormatType) { return {}; }
Vector<NumberFormat> __attribute__((weak)) get_compact_number_system_formats(StringView, StringView, CompactNumberFormatType) { return {}; }
Vector<NumberFormat> __attribute__((weak)) get_unit_formats(StringView, StringView, Style) { return {}; }
Optional<NumberFormat> select_pattern_with_plurality(Vector<NumberFormat> const& formats, double number)
{

7
Userland/Libraries/LibUnicode/UnicodeSymbols.cpp
View file

@ -17,7 +17,6 @@
# include <AK/Function.h>
# include <LibUnicode/DateTimeFormat.h>
# include <LibUnicode/Locale.h>
# include <LibUnicode/NumberFormat.h>
#endif
namespace Unicode::Detail {
@ -112,12 +111,6 @@ Symbols const& Symbols::ensure_loaded()
load_symbol(symbols.add_likely_subtags, "unicode_add_likely_subtags");
load_symbol(symbols.resolve_most_likely_territory, "unicode_resolve_most_likely_territory");
load_symbol(symbols.get_number_system_symbol, "unicode_get_number_system_symbol");
load_symbol(symbols.get_number_system_groupings, "unicode_get_number_system_groupings");
load_symbol(symbols.get_standard_number_system_format, "unicode_get_standard_number_system_format");
load_symbol(symbols.get_compact_number_system_formats, "unicode_get_compact_number_system_formats");
load_symbol(symbols.get_unit_formats, "unicode_get_unit_formats");
load_symbol(symbols.get_regional_hour_cycles, "unicode_get_regional_hour_cycles");
load_symbol(symbols.get_calendar_date_format, "unicode_get_calendar_date_format");
load_symbol(symbols.get_calendar_time_format, "unicode_get_calendar_time_format");

8
Userland/Libraries/LibUnicode/UnicodeSymbols.h
View file

@ -64,14 +64,6 @@ struct Symbols {
Optional<LanguageID> (*add_likely_subtags)(LanguageID const&);
Optional<String> (*resolve_most_likely_territory)(LanguageID const&);
// Loaded from UnicodeNumberFormat.cpp:
Optional<StringView> (*get_number_system_symbol)(StringView, StringView, NumericSymbol);
Optional<NumberGroupings> (*get_number_system_groupings)(StringView, StringView);
Optional<NumberFormat> (*get_standard_number_system_format)(StringView, StringView, StandardNumberFormatType);
Vector<NumberFormat> (*get_compact_number_system_formats)(StringView, StringView, CompactNumberFormatType);
Vector<NumberFormat> (*get_unit_formats)(StringView, StringView, Style);
// Loaded from UnicodeDateTimeFormat.cpp:
Vector<HourCycle> (*get_regional_hour_cycles)(StringView) { nullptr };