MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give loadfile() result a better name for tracebacks

develop
lethosor 2016-10-19 09:51:48 -04:00
parent b04083690e
commit b1e3c1088c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/lua/dfhack.lua
Unescape Escape View File

@ -543,23 +543,23 @@ function dfhack.run_script_with_env(envVars, name, flags, ...)
end end
env.dfhack_flags = flags env.dfhack_flags = flags
env.moduleMode = flags.module env.moduleMode = flags.module
local f local script_code
local perr local perr
local time = dfhack.filesystem.mtime(file) local time = dfhack.filesystem.mtime(file)
if time == scripts[file].mtime and scripts[file].run then if time == scripts[file].mtime and scripts[file].run then
f = scripts[file].run script_code = scripts[file].run
else else
--reload --reload
f, perr = loadfile(file, 't', env) script_code, perr = loadfile(file, 't', env)
if not f then if not script_code then
error(perr) error(perr)
end end
-- avoid updating mtime if the script failed to load -- avoid updating mtime if the script failed to load
scripts[file].mtime = time scripts[file].mtime = time
end end
scripts[file].env = env scripts[file].env = env
scripts[file].run = f scripts[file].run = script_code
return f(...), env return script_code(...), env
end end
local function _run_command(...) local function _run_command(...)