mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-11-22 12:51:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tracebacks recognize metamethods '__close'

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2019-07-31 11:22:39 -03:00
parent f645d31573
commit fe040633a1
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ldebug.c
View File

@ -651,6 +651,9 @@ static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
case OP_SHRI: case OP_SHLI:
*name = "shift";
return "metamethod";
case OP_CLOSE: case OP_RETURN:
*name = "close";
return "metamethod";
default:
return NULL; /* cannot find a reasonable name */
}

23
testes/locals.lua
View File

@ -316,14 +316,27 @@ do -- errors in __close
assert(log[1] == 5 and log[2] == 4 and log[3] == 4 and log[4] == 4
and #log == 4)
-- error in toclose in vararg function
function foo (...)
local x123 <close> = 10
-- error leaving a block
local function foo (...)
do
local x1 <close> = func2close(function () error("Y") end)
local x123 <close> = func2close(function () error("X") end)
end
end
local st, msg = pcall(foo)
assert(string.find(msg, "'x123'"))
local st, msg = xpcall(foo, debug.traceback)
assert(string.match(msg, "^[^ ]* X"))
assert(string.find(msg, "in metamethod 'close'"))
-- error in toclose in vararg function
local function foo (...)
local x123 <close> = func2close(function () error("X") end)
end
local st, msg = xpcall(foo, debug.traceback)
assert(string.match(msg, "^[^ ]* X"))
assert(string.find(msg, "in metamethod 'close'"))
end