[core][android][darwin] Move platform specific Collator impls from expression

Platform specific Collator implementations should not be part of an expression APIs.

2 files changed, 25 insertions, 0 deletions

diff --git a/src/core-files.json b/src/core-files.json
index d881e6259d..2f609e92ec 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -178,6 +178,7 @@
         "src/mbgl/style/expression/check_subtype.cpp",
         "src/mbgl/style/expression/coalesce.cpp",
         "src/mbgl/style/expression/coercion.cpp",
+        "src/mbgl/style/expression/collator.cpp",
         "src/mbgl/style/expression/collator_expression.cpp",
         "src/mbgl/style/expression/comparison.cpp",
         "src/mbgl/style/expression/compound_expression.cpp",
diff --git a/src/mbgl/style/expression/collator.cpp b/src/mbgl/style/expression/collator.cpp
new file mode 100644
index 0000000000..185d713150
--- /dev/null
+++ b/src/mbgl/style/expression/collator.cpp
@@ -0,0 +1,24 @@
+#include <mbgl/style/expression/collator.hpp>
+
+namespace mbgl {
+namespace style {
+namespace expression {
+
+Collator::Collator(bool caseSensitive, bool diacriticSensitive, optional<std::string> locale)
+    : collator(platform::Collator(caseSensitive, diacriticSensitive, std::move(locale))) {}
+
+bool Collator::operator==(const Collator& other) const {
+    return collator == other.collator;
+}
+
+int Collator::compare(const std::string& lhs, const std::string& rhs) const {
+    return collator.compare(lhs, rhs);
+}
+
+std::string Collator::resolvedLocale() const {
+    return collator.resolvedLocale();
+}
+
+} // namespace expression
+} // namespace style
+} // namespace mbgl