mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00
Code Issues Releases Wiki Activity

Add package.searchpath

Browse Source
This commit is contained in:
MCJack123 2021-12-01 18:55:24 -05:00
parent 422bfdb60d
commit e18ba8a2c2
No known key found for this signature in database
GPG Key ID: 1D99413F734AA894
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua
View File

@ -31,22 +31,37 @@ local function preload(package)
end end
end end
local function from_file(package, env, dir) local function from_file(package, env)
return function(name) return function(name)
local fname = string.gsub(name, "%.", "/") local sPath, sError = package.searchpath(name, package.path)
if not sPath then
return nil, sError
end
local fnFile, sError = loadfile(sPath, nil, env)
if fnFile then
return fnFile, sPath
else
return nil, sError
end
end
end
local function make_searchpath(dir)
return function(name, path, sep, rep)
expect(1, name, "string")
expect(2, path, "string")
sep = expect(3, sep, "string", "nil") or "."
rep = expect(4, rep, "string", "nil") or "/"
local fname = string.gsub(name, sep:gsub("%.", "%%%."), rep)
local sError = "" local sError = ""
for pattern in string.gmatch(package.path, "[^;]+") do for pattern in string.gmatch(path, "[^;]+") do
local sPath = string.gsub(pattern, "%?", fname) local sPath = string.gsub(pattern, "%?", fname)
if sPath:sub(1, 1) ~= "/" then if sPath:sub(1, 1) ~= "/" then
sPath = fs.combine(dir, sPath) sPath = fs.combine(dir, sPath)
end end
if fs.exists(sPath) and not fs.isDir(sPath) then if fs.exists(sPath) and not fs.isDir(sPath) then
local fnFile, sError = loadfile(sPath, nil, env) return sPath
if fnFile then
return fnFile, sPath
else
return nil, sError
end
else else
if #sError > 0 then if #sError > 0 then
sError = sError .. "\n " sError = sError .. "\n "
@ -118,7 +133,8 @@ local function make_package(env, dir)
end end
package.config = "/\n;\n?\n!\n-" package.config = "/\n;\n?\n!\n-"
package.preload = {} package.preload = {}
package.loaders = { preload(package), from_file(package, env, dir) } package.loaders = { preload(package), from_file(package, env) }
package.searchpath = make_searchpath(dir)
return make_require(package), package return make_require(package), package
end end