From 522d4564338a94adc57b26bd16f154bae304944f Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Thu, 25 Jun 2020 16:29:12 +1000 Subject: [PATCH] add basic submodule support to require --- module/loadfile.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/loadfile.lua b/module/loadfile.lua index 3cb8de8..ff606d8 100644 --- a/module/loadfile.lua +++ b/module/loadfile.lua @@ -12,15 +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) end _G.package = {} -package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer} +package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer,table=table,string=string,package=package,os=os,math=math,coroutine=coroutine} 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 local lib = os.getenv("LIB") or "/boot/lib\n/pkg/lib" + local ln = f:gsub("%.","/") for d in lib:gmatch("[^\n]+") do - if fs.exists(d.."/"..f) then - package.loaded[f] = runfile(d.."/"..f) - elseif fs.exists(d.."/"..f..".lua") then - package.loaded[f] = runfile(d.."/"..f..".lua") + if fs.isDirectory(d.."/"..ln) then + package.loaded[f] = runfile(d.."/"..ln.."/init.lua") + elseif fs.exists(d.."/"..ln..".lua") then + package.loaded[f] = runfile(d.."/"..ln..".lua") end end end