tangent/lume
1
0
Fork 0
mirror of https://github.com/TangentFoxy/lume.git synced 2024-11-19 07:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed module's table not updating in lume.hotswap()

Browse Source 
Changed the returned values from pcall() in lume.hotswap() to be handled
correctly -- the second return value being the wrapped-function's first
return value. This bug would effect hotswapped modules which used the
modern approach of returning a table rather than creating globals.
This commit is contained in:
rxi 2014-03-05 19:11:14 +00:00
parent 83a051aadb
commit 05828bd840
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lume.lua
View File

@ -266,12 +266,13 @@ function lume.hotswap(modname)
if type(v) == "table" then update(old[k], v) else old[k] = v end if type(v) == "table" then update(old[k], v) else old[k] = v end
end end
end end
local oldmod = pcall(require, modname) or nil
local err = nil local err = nil
local function onerror(e) local function onerror(e)
for k, v in pairs(_G) do _G[k] = oldglobal[k] end for k, v in pairs(_G) do _G[k] = oldglobal[k] end
err = lume.trim(e) err = lume.trim(e)
end end
local ok, oldmod = pcall(require, modname)
oldmod = ok and oldmod or nil
xpcall(function() xpcall(function()
package.loaded[modname] = nil package.loaded[modname] = nil
local newmod = require(modname) local newmod = require(modname)