|
@@ -1,5 +1,5 @@
|
|
/*
|
|
/*
|
|
- * Copyright (c) 2022, Tim Flynn <trflynn89@serenityos.org>
|
|
|
|
|
|
+ * Copyright (c) 2022-2024, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
*/
|
|
@@ -11,6 +11,7 @@
|
|
#include <AK/StringView.h>
|
|
#include <AK/StringView.h>
|
|
#include <LibJS/Runtime/Intl/CollatorCompareFunction.h>
|
|
#include <LibJS/Runtime/Intl/CollatorCompareFunction.h>
|
|
#include <LibJS/Runtime/Object.h>
|
|
#include <LibJS/Runtime/Object.h>
|
|
|
|
+#include <LibUnicode/Collator.h>
|
|
|
|
|
|
namespace JS::Intl {
|
|
namespace JS::Intl {
|
|
|
|
|
|
@@ -19,24 +20,6 @@ class Collator final : public Object {
|
|
JS_DECLARE_ALLOCATOR(Collator);
|
|
JS_DECLARE_ALLOCATOR(Collator);
|
|
|
|
|
|
public:
|
|
public:
|
|
- enum class Usage {
|
|
|
|
- Sort,
|
|
|
|
- Search,
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
- enum class Sensitivity {
|
|
|
|
- Base,
|
|
|
|
- Accent,
|
|
|
|
- Case,
|
|
|
|
- Variant,
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
- enum class CaseFirst {
|
|
|
|
- Upper,
|
|
|
|
- Lower,
|
|
|
|
- False,
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
static constexpr auto relevant_extension_keys()
|
|
static constexpr auto relevant_extension_keys()
|
|
{
|
|
{
|
|
// 10.2.3 Internal slots, https://tc39.es/ecma402/#sec-intl-collator-internal-slots
|
|
// 10.2.3 Internal slots, https://tc39.es/ecma402/#sec-intl-collator-internal-slots
|
|
@@ -49,17 +32,17 @@ public:
|
|
String const& locale() const { return m_locale; }
|
|
String const& locale() const { return m_locale; }
|
|
void set_locale(String locale) { m_locale = move(locale); }
|
|
void set_locale(String locale) { m_locale = move(locale); }
|
|
|
|
|
|
- Usage usage() const { return m_usage; }
|
|
|
|
- void set_usage(StringView usage);
|
|
|
|
- StringView usage_string() const;
|
|
|
|
|
|
+ Unicode::Usage usage() const { return m_usage; }
|
|
|
|
+ void set_usage(StringView usage) { m_usage = Unicode::usage_from_string(usage); }
|
|
|
|
+ StringView usage_string() const { return Unicode::usage_to_string(m_usage); }
|
|
|
|
|
|
- Sensitivity sensitivity() const { return m_sensitivity; }
|
|
|
|
- void set_sensitivity(StringView sensitivity);
|
|
|
|
- StringView sensitivity_string() const;
|
|
|
|
|
|
+ Unicode::Sensitivity sensitivity() const { return m_sensitivity; }
|
|
|
|
+ void set_sensitivity(StringView sensitivity) { m_sensitivity = Unicode::sensitivity_from_string(sensitivity); }
|
|
|
|
+ StringView sensitivity_string() const { return Unicode::sensitivity_to_string(m_sensitivity); }
|
|
|
|
|
|
- CaseFirst case_first() const { return m_case_first; }
|
|
|
|
- void set_case_first(StringView case_first);
|
|
|
|
- StringView case_first_string() const;
|
|
|
|
|
|
+ Unicode::CaseFirst case_first() const { return m_case_first; }
|
|
|
|
+ void set_case_first(StringView case_first) { m_case_first = Unicode::case_first_from_string(case_first); }
|
|
|
|
+ StringView case_first_string() const { return Unicode::case_first_to_string(m_case_first); }
|
|
|
|
|
|
String const& collation() const { return m_collation; }
|
|
String const& collation() const { return m_collation; }
|
|
void set_collation(String collation) { m_collation = move(collation); }
|
|
void set_collation(String collation) { m_collation = move(collation); }
|
|
@@ -73,19 +56,25 @@ public:
|
|
CollatorCompareFunction* bound_compare() const { return m_bound_compare; }
|
|
CollatorCompareFunction* bound_compare() const { return m_bound_compare; }
|
|
void set_bound_compare(CollatorCompareFunction* bound_compare) { m_bound_compare = bound_compare; }
|
|
void set_bound_compare(CollatorCompareFunction* bound_compare) { m_bound_compare = bound_compare; }
|
|
|
|
|
|
|
|
+ Unicode::Collator const& collator() const { return *m_collator; }
|
|
|
|
+ void set_collator(NonnullOwnPtr<Unicode::Collator> collator) { m_collator = move(collator); }
|
|
|
|
+
|
|
private:
|
|
private:
|
|
explicit Collator(Object& prototype);
|
|
explicit Collator(Object& prototype);
|
|
|
|
|
|
virtual void visit_edges(Visitor&) override;
|
|
virtual void visit_edges(Visitor&) override;
|
|
|
|
|
|
- String m_locale; // [[Locale]]
|
|
|
|
- Usage m_usage { Usage::Sort }; // [[Usage]]
|
|
|
|
- Sensitivity m_sensitivity { Sensitivity::Variant }; // [[Sensitivity]]
|
|
|
|
- CaseFirst m_case_first { CaseFirst::False }; // [[CaseFirst]]
|
|
|
|
- String m_collation; // [[Collation]]
|
|
|
|
- bool m_ignore_punctuation { false }; // [[IgnorePunctuation]]
|
|
|
|
- bool m_numeric { false }; // [[Numeric]]
|
|
|
|
- GCPtr<CollatorCompareFunction> m_bound_compare; // [[BoundCompare]]
|
|
|
|
|
|
+ String m_locale; // [[Locale]]
|
|
|
|
+ Unicode::Usage m_usage { Unicode::Usage::Sort }; // [[Usage]]
|
|
|
|
+ Unicode::Sensitivity m_sensitivity { Unicode::Sensitivity::Variant }; // [[Sensitivity]]
|
|
|
|
+ Unicode::CaseFirst m_case_first { Unicode::CaseFirst::False }; // [[CaseFirst]]
|
|
|
|
+ String m_collation; // [[Collation]]
|
|
|
|
+ bool m_ignore_punctuation { false }; // [[IgnorePunctuation]]
|
|
|
|
+ bool m_numeric { false }; // [[Numeric]]
|
|
|
|
+ GCPtr<CollatorCompareFunction> m_bound_compare; // [[BoundCompare]]
|
|
|
|
+
|
|
|
|
+ // Non-standard. Stores the ICU collator for the Intl object's collation options.
|
|
|
|
+ OwnPtr<Unicode::Collator> m_collator;
|
|
};
|
|
};
|
|
|
|
|
|
}
|
|
}
|