cleanup.

4 files changed, 61 insertions, 98 deletions

diff --git a/src/yue.cpp b/src/yue.cpp
index f891ebe..b04bd92 100644
--- a/src/yue.cpp
+++ b/src/yue.cpp
@@ -37,7 +37,8 @@ int luaopen_yue(lua_State* L);
 static void openlibs(void* state) {
         lua_State* L = static_cast<lua_State*>(state);
         luaL_openlibs(L);
-        luaopen_yue(L);
+        luaL_requiref(L, "yue", luaopen_yue, 1);
+        lua_pop(L, 1);
 }
 
 void pushYue(lua_State* L, std::string_view name) {
diff --git a/src/yuescript/stacktraceplus.h b/src/yuescript/stacktraceplus.h
index b165754..48ea8c4 100644
--- a/src/yuescript/stacktraceplus.h
+++ b/src/yuescript/stacktraceplus.h
@@ -398,9 +398,9 @@ function _M.stacktrace(thread, message, level)
                 end
                 dumper:add("\r\n}")
         elseif type(message) == "string" then
-                local fname, line, msg = message:match('(.+):(%d+): (.*)$')
+                local fname, line, msg = message:match('([^\n]+):(%d+): (.*)$')
                 if fname then
-                        local nfname, nline, nmsg = fname:match('(.+):(%d+): (.*)$')
+                        local nfname, nmsg = fname:match('(.+):%d+: (.*)$')
                         if nfname then
                                 fname = nmsg
                         end
diff --git a/src/yuescript/yuescript.cpp b/src/yuescript/yuescript.cpp
index 9928f4d..d534f3e 100644
--- a/src/yuescript/yuescript.cpp
+++ b/src/yuescript/yuescript.cpp
@@ -19,9 +19,12 @@ static void init_yuescript(lua_State* L) {
         if (luaL_loadbuffer(L, yuescriptCodes, sizeof(yuescriptCodes) / sizeof(yuescriptCodes[0]) - 1, "=(yuescript)") != 0) {
                 std::string err = std::string("failed to load yuescript module.\n") + lua_tostring(L, -1);
                 luaL_error(L, err.c_str());
-        } else if (lua_pcall(L, 0, 0, 0) != 0) {
-                std::string err = std::string("failed to init yuescript module.\n") + lua_tostring(L, -1);
-                luaL_error(L, err.c_str());
+        } else {
+                lua_insert(L, -2);
+                if (lua_pcall(L, 1, 0, 0) != 0) {
+                        std::string err = std::string("failed to init yuescript module.\n") + lua_tostring(L, -1);
+                        luaL_error(L, err.c_str());
+                }
         }
 }
 
@@ -115,24 +118,29 @@ static int yuetolua(lua_State* L) {
         return 3;
 }
 
+static const luaL_Reg yuelib[] = {
+        {"to_lua", yuetolua},
+        {"version", nullptr},
+        {"options", nullptr},
+        {"load_stacktraceplus", nullptr},
+        {nullptr, nullptr}
+};
+
 int luaopen_yue(lua_State* L) {
-        lua_getglobal(L, "package"); // package
-        lua_getfield(L, -1, "loaded"); // package loaded
-        lua_createtable(L, 0, 0); // package loaded yue
-        lua_pushcfunction(L, yuetolua); // package loaded yue func
-        lua_setfield(L, -2, "to_lua"); // yue["to_lua"] = func, package loaded yue
-        lua_pushlstring(L, &yue::version.front(), yue::version.size()); // package loaded yue version
-        lua_setfield(L, -2, "version"); // yue["version"] = version, package loaded yue
-        lua_createtable(L, 0, 0); // package loaded yue options
-        lua_pushlstring(L, &yue::extension.front(), yue::extension.size()); // package loaded yue options ext
-        lua_setfield(L, -2, "extension"); // options["extension"] = ext, package loaded yue options
-        lua_setfield(L, -2, "options"); // yue["options"] = options, package loaded yue
-        lua_pushcfunction(L, init_stacktraceplus); // package loaded yue func1
-        lua_setfield(L, -2, "load_stacktraceplus"); // yue["load_stacktraceplus"] = func1, package loaded yue
-        lua_setfield(L, -2, "yue"); // loaded["yue"] = yue, package loaded
-        lua_pop(L, 2); // empty
-        init_yuescript(L);
-        return 0;
+        luaL_newlib(L, yuelib); // yue
+        lua_pushlstring(L, &yue::version.front(), yue::version.size()); // yue version
+        lua_setfield(L, -2, "version"); // yue["version"] = version, yue
+        lua_createtable(L, 0, 0); // yue options
+        lua_pushlstring(L, &yue::extension.front(), yue::extension.size()); // yue options ext
+        lua_setfield(L, -2, "extension"); // options["extension"] = ext, yue options
+        lua_pushliteral(L, LUA_DIRSEP);
+        lua_setfield(L, -2, "dirsep"); // options["dirsep"] = dirsep, yue options
+        lua_setfield(L, -2, "options"); // yue["options"] = options, yue
+        lua_pushcfunction(L, init_stacktraceplus); // yue func1
+        lua_setfield(L, -2, "load_stacktraceplus"); // yue["load_stacktraceplus"] = func1, yue
+        lua_pushvalue(L, -1); // yue yue
+        init_yuescript(L); // yue
+        return 1;
 }
 
 } // extern "C"
diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h
index 6fc9c20..30006ba 100644
--- a/src/yuescript/yuescript.h
+++ b/src/yuescript/yuescript.h
@@ -20,15 +20,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.]]
 
-local yue = require("yue")
-local concat, insert, remove = table.concat, table.insert, table.remove
+local yue = select(1, ...)
+local concat, insert = table.concat, table.insert
 local unpack = unpack or table.unpack
-local lua = {
-        loadstring = loadstring,
-        load = load
-}
-local split, get_options, create_yuepath, yue_loader, load_text, yue_call, loadstring, loadfile, dofile, insert_loader, remove_loader, yue_require, find_modulepath
-yue.dirsep = "/"
 yue.yue_compiled = { }
 yue.file_exist = function(fname)
         local file = io.open(fname)
@@ -48,18 +42,7 @@ yue.read_file = function(fname)
         file:close()
         return text
 end
-split = function(str, delim)
-        if str == "" then
-                return { }
-        end
-        str = str .. delim
-        local tokens = { }
-        for m in str:gmatch("(.-)" .. delim) do
-                table.insert(tokens, m)
-        end
-        return tokens
-end
-get_options = function(...)
+local function get_options(...)
         local count = select("#", ...)
         local opts = select(count, ...)
         if type(opts) == "table" then
@@ -70,27 +53,13 @@ get_options = function(...)
                 return { }, ...
         end
 end
-create_yuepath = function(package_path)
-        local extension = yue.options.extension
-        local yuepaths = { }
-        local tokens = split(package_path, ";")
-        for i = 1, #tokens do
-                local path = tokens[i]
-                local prefix = path:match("^(.-)%.lua$")
-                if prefix then
-                        table.insert(yuepaths, prefix .. "." .. extension)
-                end
-        end
-        return concat(yuepaths, ";")
-end
-find_modulepath = function(name)
-        if not package.yuepath then
-                package.yuepath = create_yuepath(package.path)
-        end
-        local name_path = name:match("[\\/]") and name or name:gsub("%.", yue.dirsep)
+local function find_modulepath(name)
+        local suffix = "." .. yue.options.extension
+        local dirsep = yue.options.dirsep
+        local name_path = name:match("[\\/]") and name or name:gsub("%.", dirsep)
         local file_exist, file_path
-        for path in package.yuepath:gmatch("[^;]+") do
-                file_path = path:gsub("?", name_path)
+        for path in package.path:gmatch("[^;]+") do
+                file_path = path:gsub("?", name_path):gsub("%.lua$", suffix)
                 file_exist = yue.file_exist(file_path)
                 if file_exist then
                         break
@@ -102,17 +71,18 @@ find_modulepath = function(name)
                 return nil
         end
 end
-load_text = function(name)
+local function load_text(name)
         local file_path = find_modulepath(name)
         if file_path then
                 return yue.read_file(file_path), file_path
         end
         return nil, nil
 end
-yue_loader = function(name)
+local yue_loadstring
+local function yue_loader(name)
         local text, file_path = load_text(name)
         if text then
-                local res, err = loadstring(text, file_path)
+                local res, err = yue_loadstring(text, file_path)
                 if not res then
                         error(file_path .. ": " .. err)
                 end
@@ -120,7 +90,7 @@ yue_loader = function(name)
         end
         return nil, "Could not find yue file"
 end
-yue_call = function(f, ...)
+local function yue_call(f, ...)
         local args = {
                 ...
         }
@@ -130,7 +100,7 @@ yue_call = function(f, ...)
                 return yue.stp.stacktrace(err, 1)
         end)
 end
-loadstring = function(...)
+yue_loadstring = function(...)
         local options, str, chunk_name, mode, env = get_options(...)
         chunk_name = chunk_name or "=(yuescript.loadstring)"
         local code, err = yue.to_lua(str, options)
@@ -140,26 +110,23 @@ loadstring = function(...)
         if chunk_name then
                 yue.yue_compiled["@" .. chunk_name] = code
         end
-        return (lua.loadstring or lua.load)(code, chunk_name, unpack({
+        return (loadstring or load)(code, chunk_name, unpack({
                 mode,
                 env
         }))
 end
-loadfile = function(fname, ...)
+local function yue_loadfile(fname, ...)
         local text = yue.read_file(fname)
-        return loadstring(text, tostring(fname), ...)
+        return yue_loadstring(text, tostring(fname), ...)
 end
-dofile = function(...)
-        local f = assert(loadfile(...))
+local function yue_dofile(...)
+        local f = assert(yue_loadfile(...))
         return f()
 end
-insert_loader = function(pos)
+local function insert_loader(pos)
         if pos == nil then
                 pos = 2
         end
-        if not package.yuepath then
-                package.yuepath = create_yuepath(package.path)
-        end
         local loaders = package.loaders or package.searchers
         for i = 1, #loaders do
                 local loader = loaders[i]
@@ -170,17 +137,7 @@ insert_loader = function(pos)
         insert(loaders, pos, yue_loader)
         return true
 end
-remove_loader = function()
-        local loaders = package.loaders or package.searchers
-        for i, loader in ipairs(loaders) do
-                if loader == yue_loader then
-                        remove(loaders, i)
-                        return true
-                end
-        end
-        return false
-end
-yue_require = function(name)
+local function yue_require(name)
         insert_loader()
         local success, res = xpcall((function()
                 return require(name)
@@ -195,6 +152,8 @@ yue_require = function(name)
                 return nil
         end
 end
+local load_stacktraceplus = yue.load_stacktraceplus
+yue.load_stacktraceplus = nil
 setmetatable(yue, {
         __index = function(self, key)
                 if not (key == "stp") then
@@ -202,11 +161,10 @@ setmetatable(yue, {
                 end
                 local stp = rawget(yue, "stp")
                 if not stp then
-                        stp = yue.load_stacktraceplus()
+                        stp = load_stacktraceplus()
                         stp.dump_locals = false
                         stp.simplified = true
-                        rawset(yue, "stp", stp)
-                        rawset(yue, "load_stacktraceplus", nil)
+                        yue.stp = stp
                 end
                 return stp
         end,
@@ -248,13 +206,9 @@ local function p(...)
         print(concat(args))
 end
 yue.insert_loader = insert_loader
-yue.remove_loader = remove_loader
-yue.loader = yue_loader
-yue.dofile = dofile
-yue.loadfile = loadfile
-yue.loadstring = loadstring
-yue.create_yuepath = create_yuepath
-yue.find_modulepath = find_modulepath
+yue.dofile = yue_dofile
+yue.loadfile = yue_loadfile
+yue.loadstring = yue_loadstring
 yue.pcall = yue_call
 yue.require = yue_require
 yue.p = p