izaya/OC-PsychOS2
1
0
Fork 4
Code Issues Pull Requests Releases Wiki Activity

rewrote require() to support package.path and submodules

Browse Source
This commit is contained in:
Izaya 2020-06-25 17:19:50 +10:00
parent 522d456433
commit be3d3c207f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/loadfile.lua
View File

@ -12,16 +12,16 @@ function os.spawnfile(p,n,...) -- string string -- number -- spawns a new proces
return os.spawn(function() local res={pcall(loadfile(p), table.unpack(tA))} computer.pushSignal("process_finished", os.pid(), table.unpack(res)) dprint(table.concat(res)) end,n or p) return os.spawn(function() local res={pcall(loadfile(p), table.unpack(tA))} computer.pushSignal("process_finished", os.pid(), table.unpack(res)) dprint(table.concat(res)) end,n or p)
end end
_G.package = {} _G.package = {}
package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer,table=table,string=string,package=package,os=os,math=math,coroutine=coroutine} package.path="./?;./?.lua;/boot/lib/?.lua;/pkg/lib/?.lua;/boot/lib/?/init.lua;/pkg/lib/?/init.lua"
package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer}
function require(f,force) -- string boolean -- table -- searches for a library with name *f* and returns what the library returns, if possible. if *force* is set, loads the library even if it is cached function require(f,force) -- string boolean -- table -- searches for a library with name *f* and returns what the library returns, if possible. if *force* is set, loads the library even if it is cached
if not package.loaded[f] or force then if not package.loaded[f] or force then
local lib = os.getenv("LIB") or "/boot/lib\n/pkg/lib"
local ln = f:gsub("%.","/") local ln = f:gsub("%.","/")
for d in lib:gmatch("[^\n]+") do for d in package.path:gmatch("[^;]+") do
if fs.isDirectory(d.."/"..ln) then local p = d:gsub("%?",ln)
package.loaded[f] = runfile(d.."/"..ln.."/init.lua") if fs.exists(p) and not fs.isDirectory(p) then
elseif fs.exists(d.."/"..ln..".lua") then package.loaded[f] = runfile(p)
package.loaded[f] = runfile(d.."/"..ln..".lua") break
end end
end end
end end