replace default lua searcher by soluna.file

Author: cloudwu

src/embedlua.c

@@ -20,6 +20,7 @@
 #include "text.lua.h"
 #include "util.lua.h"
 #include "coroutine.lua.h"
+#include "packageloader.lua.h"
 
 #include "lua.h"
 #include "lauxlib.h"
@@ -60,6 +61,7 @@ luaopen_embedsource(lua_State *L) {
 			REG_SOURCE(main)
 			REG_SOURCE(print_r)
 			REG_SOURCE(fontmgr)
+			REG_SOURCE(packageloader)
 		lua_setfield(L, -2, "runtime");
 
 		lua_newtable(L);	// runtime

src/lualib/main.lua

@@ -9,6 +9,8 @@ local init_func_temp = [=[
 	package.path = [[${lua_path}]]
 	package.cpath = [[${lua_cpath}]]
 	_G.print_r = load(embedsource.runtime.print_r(), "@src/lualib/print_r.lua")()
+	local packageloader = load(embedsource.runtime.packageloader(), "@src/lualib/packageloader.lua")
+	packageloader()
 	local function embedloader(name)
 		local ename
 		if name == "soluna" then
@@ -20,8 +22,9 @@ local init_func_temp = [=[
 			local code = embedsource.lib[ename]
 			if code then
 				return function()
-					local f = load(code(), "@src/lualib/"..ename..".lua")
-					return f()
+					local srcname = "src/lualib/"..ename..".lua"
+					local f = load(code(), "@" .. srcname)
+					return f(ename, srcname)
 				end
 			end
 			return "no embed soluna." .. ename
@@ -178,6 +181,8 @@ end
 function api.init(desc)
 	-- todo : settings
 	local embedsource = require "soluna.embedsource"
+	local packageloader = load(embedsource.runtime.packageloader(), "@src/lualib/packageloader.lua")
+	packageloader()
 	local initsetting = load(embedsource.lib.initsetting, "@3rd/ltask/lualib/initsetting.lua")()
 	local settings = initsetting.init(args)
 	local soluna_app = require "soluna.app"

src/lualib/packageloader.lua

@@ -0,0 +1,32 @@
+local file = require "soluna.file"
+
+local package = package
+local string = string
+local io = io
+
+global load, print
+
+local dir_sep, temp_sep, temp_marker = package.config:match "(.)\n(.)\n(.)"
+local temp_pat = "[^"..temp_sep.."]+"
+
+local function fileload(name, fullname)
+	local s, err = file.load(fullname)
+	local f = load(s, "@"..fullname)
+	return f(name, fullname)
+end
+
+local function search_file(name)
+	local cname = name:gsub("%.", "/")
+	for temp in package.path:gmatch(temp_pat) do
+		local fullname = temp:gsub(temp_marker, cname)
+		if dir_sep ~= '/' then
+			fullname = fullname:gsub(dir_sep, "/")
+		end
+		if file.exist(fullname) then
+			return fileload, fullname
+		end
+	end
+	return "No package : " .. name
+end
+
+package.searchers[2] = search_file