Skip to content

Fix to allow debug.upvalue() to set upvalues to nil #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix to allow debug.upvalue() to set upvalues to nil #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions moon/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,24 @@ type = function(value)
return base_type
end
debug = setmetatable({
upvalue = function(fn, k, v)
local upvalues = { }
upvalue = function(fn, k, ...)
local value = nil
local i = 1
while true do
local name = lua.debug.getupvalue(fn, i)
local name
name, value = lua.debug.getupvalue(fn, i)
if name == nil then
error("Failed to find upvalue: " .. tostring(k))
end
if name == k then
break
end
upvalues[name] = i
i = i + 1
end
if not upvalues[k] then
error("Failed to find upvalue: " .. tostring(k))
end
if not v then
local _, value = lua.debug.getupvalue(fn, upvalues[k])
if select("#", ...) == 0 then
return value
else
return lua.debug.setupvalue(fn, upvalues[k], v)
return lua.debug.setupvalue(fn, i, ...)
end
end
}, {
Expand Down
19 changes: 8 additions & 11 deletions moon/init.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,20 @@ type = (value) -> -- class aware type
base_type

debug = setmetatable {
upvalue: (fn, k, v) ->
upvalues = {}
upvalue: (fn, k, ...) ->
value = nil
i = 1
while true
name = lua.debug.getupvalue(fn, i)
break if name == nil
upvalues[name] = i
name, value = lua.debug.getupvalue(fn, i)
if name == nil
error "Failed to find upvalue: " .. tostring k
break if name == k
i += 1

if not upvalues[k]
error "Failed to find upvalue: " .. tostring k

if not v
_, value = lua.debug.getupvalue fn, upvalues[k]
if select("#", ...) == 0
value
else
lua.debug.setupvalue fn, upvalues[k], v
lua.debug.setupvalue fn, i, ...
}, __index: lua.debug

-- run a function with scope injected before its function environment
Expand Down