try

3 files changed, 148 insertions, 178 deletions

diff --git a/core/src/xmake/string/case.c b/core/src/xmake/string/case.c
deleted file mode 100644
index 498c32fcc..000000000
--- a/core/src/xmake/string/case.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*!A cross-platform build utility based on Lua
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright (C) 2015-present, Xmake Open Source Community.
- *
- * @author      luadebug, ruki
- * @file        case.c
- *
- */
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * trace
- */
-#define TB_TRACE_MODULE_NAME "case"
-#define TB_TRACE_MODULE_DEBUG (0)
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * includes
- */
-#include "prefix.h"
-#if defined(TB_CONFIG_OS_LINUX) || defined(TB_CONFIG_OS_BSD) || defined(TB_CONFIG_OS_SOLARIS)
-#   include <locale.h>
-#   include <wctype.h>
-#endif
-
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * private implementation
- */
-
-
-/* Unicode case conversion using wide characters
- * Returns tb_true on success, tb_false on failure
- */
-static tb_bool_t xm_string_case_unicode(lua_State* lua, tb_char_t const* str, tb_size_t size, tb_bool_t lower) {
-    tb_bool_t   ok = tb_false;
-    tb_size_t   wn = size + 1;
-    tb_wchar_t* wb = tb_nalloc_type(wn, tb_wchar_t);
-
-    if (!wb) {
-        return tb_false;
-    }
-
-    // Convert input UTF-8 to Wide Char
-    wn = tb_mbstowcs(wb, str, wn);
-    if (wn == (tb_size_t)-1) {
-        tb_free(wb);
-        return tb_false;
-    }
-
-    // Perform Case Conversion
-#if defined(TB_CONFIG_OS_LINUX) || defined(TB_CONFIG_OS_BSD) || defined(TB_CONFIG_OS_SOLARIS)
-    locale_t loc = newlocale(LC_ALL_MASK, "C.UTF-8", (locale_t)0);
-    if (!loc) loc = newlocale(LC_ALL_MASK, "en_US.UTF-8", (locale_t)0);
-    if (!loc) loc = newlocale(LC_ALL_MASK, "C.utf8", (locale_t)0);
-    if (!loc) loc = newlocale(LC_ALL_MASK, "en_US.utf8", (locale_t)0);
-    if (loc) {
-        locale_t old = uselocale(loc);
-        tb_wchar_t* p = wb;
-        while (*p) {
-            *p = lower ? towlower(*p) : towupper(*p);
-            p++;
-        }
-        uselocale(old);
-        freelocale(loc);
-    } else {
-        if (lower) tb_wcslwr(wb);
-        else tb_wcsupr(wb);
-    }
-#else
-    if (lower) tb_wcslwr(wb);
-    else tb_wcsupr(wb);
-#endif
-
-    // Convert Wide Char back to UTF-8
-    tb_size_t   un = (wn + 1) * 4;
-    tb_char_t*  ub = (tb_char_t*)tb_malloc_bytes(un);
-    if (ub) {
-        tb_size_t n = tb_wcstombs(ub, wb, un);
-        if (n != (tb_size_t)-1) {
-            lua_pushlstring(lua, ub, n);
-            ok = tb_true;
-        }
-        tb_free(ub);
-    }
-
-    tb_free(wb);
-    return ok;
-}
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * helper
- */
-static tb_int_t xm_string_case(lua_State* lua, tb_bool_t lower) {
-
-    // check
-    tb_assert_and_check_return_val(lua, 0);
-
-    // get the string
-    size_t           size = 0;
-    tb_char_t const* str  = luaL_checklstring(lua, 1, &size);
-    tb_check_return_val(str, 0);
-
-    // empty?
-    if (!size) {
-        lua_pushstring(lua, "");
-        return 1;
-    }
-
-    // allocate buffer for optimistic ascii conversion
-    tb_char_t* buf = (tb_char_t*)tb_malloc_bytes(size);
-    if (!buf) return 0;
-
-    tb_size_t i;
-    for (i = 0; i < size; i++) {
-        // Stop at first non-ascii char
-        if ((tb_byte_t)str[i] >= 0x80) break;
-
-        // convert ascii
-        tb_byte_t c = (tb_byte_t)str[i];
-        if (lower) {
-            buf[i] = (tb_char_t)tb_tolower(c);
-        } else {
-            buf[i] = (tb_char_t)tb_toupper(c);
-        }
-    }
-
-    // all ascii?
-    if (i == size) {
-        lua_pushlstring(lua, buf, size);
-        tb_free(buf);
-        return 1;
-    }
-
-    // push the converted ascii prefix
-    if (i > 0) {
-        lua_pushlstring(lua, buf, i);
-    }
-    tb_free(buf);
-
-    // convert the remaining unicode suffix
-    if (xm_string_case_unicode(lua, str + i, size - i, lower)) {
-        // concat prefix and suffix: prefix (if any) + suffix
-        if (i > 0) {
-            lua_concat(lua, 2);
-        }
-        return 1;
-    }
-
-    // failed? return original string
-    if (i > 0) {
-        lua_pop(lua, 1); 
-    }
-    lua_pushlstring(lua, str, size);
-    return 1;
-}
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * implementation
- */
-tb_int_t xm_string_lower(lua_State* lua) {
-    return xm_string_case(lua, tb_true);
-}
-
-tb_int_t xm_string_upper(lua_State* lua) {
-    return xm_string_case(lua, tb_false);
-}
diff --git a/core/src/xmake/string/lower.c b/core/src/xmake/string/lower.c
new file mode 100644
index 000000000..6d9648079
--- /dev/null
+++ b/core/src/xmake/string/lower.c
@@ -0,0 +1,74 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright (C) 2015-present, Xmake Open Source Community.
+ *
+ * @author      ruki
+ * @file        lower.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+
+/* string.lower
+ *
+ * @param str       the string
+ *
+ * @code
+ *      local result = string.lower(str)
+ * @endcode
+ */
+tb_int_t xm_string_lower(lua_State *lua) {
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // get string
+    size_t           size = 0;
+    tb_char_t const* cstr = luaL_checklstring(lua, 1, &size);
+    tb_check_return_val(cstr, 0);
+
+    // empty?
+    if (!size) {
+        lua_pushstring(lua, "");
+        return 1;
+    }
+
+    // copy string to buffer
+    tb_char_t* buffer = tb_malloc_bytes(size + 1);
+    if (buffer) {
+        tb_memcpy(buffer, cstr, size);
+        buffer[size] = '\0';
+
+        // to lower
+        tb_long_t real_size = tb_charset_utf8_tolower(buffer, size);
+        
+        // push result
+        if (real_size >= 0) {
+            lua_pushlstring(lua, buffer, real_size);
+        } else {
+            lua_pushlstring(lua, cstr, size);
+        }
+        tb_free(buffer);
+    } else {
+        lua_pushnil(lua);
+    }
+    return 1;
+}
diff --git a/core/src/xmake/string/upper.c b/core/src/xmake/string/upper.c
new file mode 100644
index 000000000..313e268a1
--- /dev/null
+++ b/core/src/xmake/string/upper.c
@@ -0,0 +1,74 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright (C) 2015-present, Xmake Open Source Community.
+ *
+ * @author      ruki
+ * @file        upper.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+
+/* string.upper
+ *
+ * @param str       the string
+ *
+ * @code
+ *      local result = (str)
+ * @endcode
+ */
+tb_int_t xm_string_upper(lua_State *lua) {
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // get string
+    size_t           size = 0;
+    tb_char_t const* cstr = luaL_checklstring(lua, 1, &size);
+    tb_check_return_val(cstr, 0);
+
+    // empty?
+    if (!size) {
+        lua_pushstring(lua, "");
+        return 1;
+    }
+
+    // copy string to buffer
+    tb_char_t* buffer = tb_malloc_bytes(size + 1);
+    if (buffer) {
+        tb_memcpy(buffer, cstr, size);
+        buffer[size] = '\0';
+
+        // to upper
+        tb_long_t real_size = tb_charset_utf8_toupper(buffer, size);
+        
+        // push result
+        if (real_size >= 0) {
+            lua_pushlstring(lua, buffer, real_size);
+        } else {
+            lua_pushlstring(lua, cstr, size);
+        }
+        tb_free(buffer);
+    } else {
+        lua_pushnil(lua);
+    }
+    return 1;
+}