shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Covert ICU API usage from C++ to C linkages.

Browse Source
This commit is contained in:
Robin E. R. Davies
2024-11-25 23:11:46 -05:00
parent ed25018dd0
commit 4291175a7c
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Locale.cpp
+21 -23
View File
@@ -18,25 +18,22 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "pch.h" #include "pch.h"
#include "Locale.hpp" #include "Locale.hpp"
#define U_SHOW_CPLUSPLUS_API 0
#include <stdlib.h> #include <stdlib.h>
#include "Lv2Log.hpp" #include "Lv2Log.hpp"
#include <unicode/utypes.h> #include <unicode/utypes.h>
#include <unicode/ucol.h> #include <unicode/ucol.h>
#include <unicode/unistr.h> #include <unicode/unistr.h>
#include <unicode/sortkey.h>
#include <stdexcept> #include <stdexcept>
#include "ss.hpp" #include "ss.hpp"
#include <mutex> #include <mutex>
// Must be UNICODE. Should reflect system locale. (.e.g en-US.UTF8, de-de.UTF8)
// This is correct for libstdc++; most probably not correct for Windows or CLANG. :-(
using namespace pipedal; using namespace pipedal;
std::string getCurrentLocale() { std::string getCurrentLocale() {
std::string locale = setlocale(LC_ALL, nullptr); std::string locale = setlocale(LC_ALL, nullptr);
if (locale.empty() || locale == "C") { if (locale.empty() || locale == "C") {
@@ -69,33 +66,34 @@ std::string getCurrentLocale() {
} }
Collator::~Collator() { Collator::~Collator() {
} }
class LocaleImpl; class LocaleImpl;
class CollatorImpl : public Collator { class CollatorImpl : public Collator {
public: public:
CollatorImpl(std::shared_ptr<LocaleImpl> LocaleImpl,icu::Locale &locale); CollatorImpl(std::shared_ptr<LocaleImpl> localeImpl, const char* localeStr);
~CollatorImpl(); ~CollatorImpl();
virtual int Compare(const std::string &left, const std::string&right); virtual int Compare(const std::string &left, const std::string&right);
private: private:
icu::Collator* collator = nullptr; UCollator* collator = nullptr;
std::shared_ptr<LocaleImpl> localeImpl; std::shared_ptr<LocaleImpl> localeImpl;
}; };
CollatorImpl::~CollatorImpl() CollatorImpl::~CollatorImpl()
{ {
delete collator; if (collator) {
ucol_close(collator);
}
localeImpl = nullptr; localeImpl = nullptr;
} }
CollatorImpl::CollatorImpl(std::shared_ptr<LocaleImpl> localeImpl, icu::Locale &locale)
:localeImpl(localeImpl) CollatorImpl::CollatorImpl(std::shared_ptr<LocaleImpl> localeImpl, const char* localeStr)
: localeImpl(localeImpl)
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
collator = ucol_open(localeStr, &status);
this->collator = icu::Collator::createInstance(locale, status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
throw std::runtime_error(SS("Failed to create collator: " << u_errorName(status))); throw std::runtime_error(SS("Failed to create collator: " << u_errorName(status)));
@@ -103,8 +101,12 @@ CollatorImpl::CollatorImpl(std::shared_ptr<LocaleImpl> localeImpl, icu::Locale &
} }
int CollatorImpl::Compare(const std::string &left, const std::string&right) { int CollatorImpl::Compare(const std::string &left, const std::string&right) {
return collator->compare(left.c_str(),right.c_str()); UErrorCode status = U_ZERO_ERROR;
return ucol_strcoll(collator,
reinterpret_cast<const UChar*>(left.c_str()), left.length(),
reinterpret_cast<const UChar*>(right.c_str()), right.length());
} }
Locale::ptr g_instance; Locale::ptr g_instance;
class LocaleImpl: public Locale, public std::enable_shared_from_this<LocaleImpl> { class LocaleImpl: public Locale, public std::enable_shared_from_this<LocaleImpl> {
@@ -113,32 +115,30 @@ public:
virtual const std::string &CurrentLocale() const ; virtual const std::string &CurrentLocale() const ;
virtual Collator::ptr GetCollator(); virtual Collator::ptr GetCollator();
private: private:
std::unique_ptr<icu::Locale> locale;
std::string currentLocale; std::string currentLocale;
}; };
LocaleImpl::LocaleImpl() LocaleImpl::LocaleImpl()
{ {
currentLocale = getCurrentLocale(); currentLocale = getCurrentLocale();
locale = std::make_unique<icu::Locale>(currentLocale.c_str());
} }
const std::string &LocaleImpl::CurrentLocale() const const std::string &LocaleImpl::CurrentLocale() const
{ {
return currentLocale; return currentLocale;
} }
Collator::ptr LocaleImpl::GetCollator(){ Collator::ptr LocaleImpl::GetCollator(){
auto pThis = shared_from_this(); auto pThis = shared_from_this();
return std::shared_ptr<Collator>(new CollatorImpl(pThis,*locale)); return std::shared_ptr<Collator>(new CollatorImpl(pThis, currentLocale.c_str()));
} }
static std::mutex createMutex; static std::mutex createMutex;
Locale::~Locale() Locale::~Locale()
{ {
} }
Locale::ptr Locale::g_instance; Locale::ptr Locale::g_instance;
Locale::ptr Locale::GetInstance() Locale::ptr Locale::GetInstance()
@@ -151,6 +151,4 @@ Locale::ptr Locale::GetInstance()
} }
g_instance = std::make_shared<LocaleImpl>(); g_instance = std::make_shared<LocaleImpl>();
return g_instance; return g_instance;
} }