From 66d64c7c12648b3f15181eb9d64e55d1a23ade34 Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 17 Nov 2014 11:22:47 +0100 Subject: [PATCH] use nunicode conditional case mapping (lowercase) --- platform/default/string_stdlib.cpp | 21 ++++++++++++--------- test/text_conversions.cpp | 4 +--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/platform/default/string_stdlib.cpp b/platform/default/string_stdlib.cpp index 9639cd7b9..3b89a4504 100644 --- a/platform/default/string_stdlib.cpp +++ b/platform/default/string_stdlib.cpp @@ -31,19 +31,22 @@ std::string uppercase(const std::string& str) std::string lowercase(const std::string& str) { - boost::u8_to_u32_iterator itr(str.begin()); - boost::u8_to_u32_iterator end(str.end()); std::string output; - char buf[5]; - for (; itr!=end; ++itr) + char lo[5]; + char const* itr = str.c_str(); + char const* end = itr + str.length(); + char const* buf = 0; + uint32_t code_point; + for ( ; itr!=end;) { - char const* lo = nu_tolower(*itr); - if (lo != 0) output.append(lo); + + itr = _nu_tolower(itr, end, nu_utf8_read, &code_point, &buf, 0); + if (buf != 0) output.append(buf); else { - std::memset(buf, 0, 5); - nu_utf8_write(*itr, buf); - output.append(buf); + std::memset(lo, 0, 5); + nu_utf8_write(code_point, lo); + output.append(lo); } } return output; diff --git a/test/text_conversions.cpp b/test/text_conversions.cpp index 4f71d6a61..756bc4db1 100644 --- a/test/text_conversions.cpp +++ b/test/text_conversions.cpp @@ -30,8 +30,6 @@ TEST(TextConversions, to_lower) { EXPECT_EQ(std::string("weisskopfseeadler"), platform::lowercase("weiSSkopfseeadler")); // DE EXPECT_EQ(std::string("azərbaycan"), platform::lowercase("AZƏRBAYCAN")); // AZ - - //EXPECT_EQ(std::string("ὀδυσσεύσ"), platform::lowercase("ὈΔΥΣΣΕΎΣ")); // GR - // nunicode can't map last Σ to word-ending ς + EXPECT_EQ(std::string("ὀδυσσεύς"), platform::lowercase("ὈΔΥΣΣΕΎΣ")); // GR }