Changeset 1285

Timestamp:

12/06/23 03:27:30 (13 months ago)

Author:

Maciej Komosinski

Message:

Added toLowerCase/toUpperCase for UTF-8 strings

Location:

cpp/common

Files:

• Convert.cpp (modified) (2 diffs)
• Convert.h (modified) (1 diff)

cpp/common/Convert.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -18 +18 @@
 
 #include <stdio.h>
-
+#include <locale>
+#include <iostream>
+#ifndef IPHONE
+#include <codecvt>
+#endif
 
 int Convert::toInt(string s) { return atoi(s.c_str()); }
+int Convert::toInt_HexIf0x(string s) { return (s.size() > 2 && s[0] == '0' && s[1] == 'x') ? (int)hexToInt(s.substr(2)) : atoi(s.c_str()); }
 float Convert::toFloat(string s) { return (float)atof(s.c_str()); }
 string Convert::toLowerCase(string s) { std::transform(s.begin(), s.end(), s.begin(), ::tolower);  return s; }
 string Convert::toUpperCase(string s) { std::transform(s.begin(), s.end(), s.begin(), ::toupper);  return s; }
+#if !defined IPHONE && !defined MACOS
+static string transformUTF8(string in, wint_t(*fun)(wint_t))
+{
+        static std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+        auto wstr = converter.from_bytes(in);
+        for (auto it = wstr.begin(); it != wstr.end(); it++)
+                *it = fun(*it);
+        return converter.to_bytes(wstr);
+}
+//does not seem to work in iPhone e.g. for Polish-specific letters, or a different locale settings should be used (but pl-PL did not work properly either) - so instead implemented this using NSString function in objc-interface.mm
+string Convert::toLowerCaseUTF8(string s) { return transformUTF8(s, towlower); }
+string Convert::toUpperCaseUTF8(string s) { return transformUTF8(s, towupper); }
+#endif
 char Convert::toLowerCase(char c) { return (char)tolower(c); }
 char Convert::toUpperCase(char c) { return (char)toupper(c); }

cpp/common/Convert.h

@@ -22 +22 @@
 public:
         static int toInt(string s);
+        static int toInt_HexIf0x(string s);
         static float toFloat(string s);
         static string toLowerCase(string s);
         static string toUpperCase(string s);
+        static string toLowerCaseUTF8(string s);
+        static string toUpperCaseUTF8(string s);
         static char toLowerCase(char c);
         static char toUpperCase(char c);