improve string.lastof

4 files changed, 99 insertions, 0 deletions

diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index 5cd6c1bd5..625f60f63 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -167,6 +167,7 @@ tb_int_t xm_winos_registry_query(lua_State* lua);
 // the string functions
 tb_int_t xm_string_trim(lua_State* lua);
 tb_int_t xm_string_split(lua_State* lua);
+tb_int_t xm_string_lastof(lua_State* lua);
 tb_int_t xm_string_convert(lua_State* lua);
 tb_int_t xm_string_endswith(lua_State* lua);
 tb_int_t xm_string_startswith(lua_State* lua);
@@ -329,6 +330,7 @@ static luaL_Reg const g_string_functions[] =
 {
     { "trim",           xm_string_trim          }
 ,   { "split",          xm_string_split         }
+,   { "lastof",         xm_string_lastof        }
 ,   { "convert",        xm_string_convert       }
 ,   { "endswith",       xm_string_endswith      }
 ,   { "startswith",     xm_string_startswith    }
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 1292adea3..6def8df5b 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -96,6 +96,7 @@ xmake_C_FILES 			+= \
 						hash/sha256 \
 						string/trim \
 						string/split \
+						string/lastof \
 						string/convert \
 						string/endswith \
 						string/startswith \
diff --git a/core/src/xmake/string/lastof.c b/core/src/xmake/string/lastof.c
new file mode 100644
index 000000000..2be44ba22
--- /dev/null
+++ b/core/src/xmake/string/lastof.c
@@ -0,0 +1,90 @@
+/*!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-2020, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        lastof.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME                "string_lastof"
+#define TB_TRACE_MODULE_DEBUG               (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * private implementation
+ */
+static tb_void_t xm_string_lastof_str(lua_State* lua, tb_char_t const* cstr, tb_size_t nstr, tb_char_t const* csubstr, tb_size_t nsubstr)
+{
+    // find it
+    tb_char_t const* curr = tb_null;
+    tb_char_t const* next = cstr;
+    do
+    {
+        next = tb_strstr(next, csubstr); // faster than tb_strnstr()
+        if (next)
+        {
+            curr = next;
+            next += nsubstr;
+        }
+
+    } while (!next);
+
+    // found?
+    if (curr) lua_pushinteger(lua, curr - cstr + 1);
+    else lua_pushnil(lua);
+}
+static tb_void_t xm_string_lastof_chr(lua_State* lua, tb_char_t const* cstr, tb_size_t nstr, tb_char_t ch)
+{
+    tb_char_t const* pos = tb_strrchr(cstr, ch); // faster than tb_strnrchr()
+    if (pos) lua_pushinteger(lua, pos - cstr + 1);
+    else lua_pushnil(lua);
+}
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+
+/* lastof string (only support plain text)
+ *
+ * @param str             the string
+ * @param substr          the substring
+ */
+tb_int_t xm_string_lastof(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // get string
+    size_t           nstr = 0;
+    tb_char_t const* cstr = luaL_checklstring(lua, 1, &nstr);
+
+    // get substring
+    size_t           nsubstr = 0;
+    tb_char_t const* csubstr = luaL_checklstring(lua, 2, &nsubstr);
+
+    // lastof it
+    lua_newtable(lua);
+    if (nsubstr == 1) xm_string_lastof_chr(lua, cstr, (tb_size_t)nstr, csubstr[0]);
+    else xm_string_lastof_str(lua, cstr, (tb_size_t)nstr, csubstr, nsubstr);
+    return 1;
+}
diff --git a/xmake/core/base/string.lua b/xmake/core/base/string.lua
index 4a224b2c5..89d85672f 100644
--- a/xmake/core/base/string.lua
+++ b/xmake/core/base/string.lua
@@ -29,10 +29,16 @@ local serialize  = require("base/serialize")
 string._dump = string._dump or string.dump
 string._trim = string._trim or string.trim
 string._split = string._split or string.split
+string._lastof = string._lastof or string.lastof
 
 -- find the last substring with the given pattern
 function string:lastof(pattern, plain)
 
+    -- is plain text? use the native implementation
+    if plain then
+        return string._lastof(self, pattern)
+    end
+
     -- find the last substring
     local curr = 0
     repeat