6502
/
l65
mirror of https://github.com/g012/l65.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed one line of info in error report.

This commit is contained in:
g012 2017-09-28 10:33:32 +02:00
parent a36c8237df
commit 92c6dfe245
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
l65.lua
View File

@ -2486,8 +2486,9 @@ end
l65.msghandler = function(msg)
msg = tostring(msg)
msg = msg:gsub('%[string "(.-%.l65)"%]', '%1') -- [string "xxx.l65"] -> xxx.l65
local trace_cur = debug.traceback()
local trace_cur = debug.traceback(nil, 2)
trace_cur = trace_cur:gsub('%[string "(.-%.l65)"%]', '%1') -- [string "xxx.l65"] -> xxx.l65
trace_cur = trace_cur:gsub('stack traceback:', '')
local i=2
while debug.getinfo(i) do
@ -2498,7 +2499,6 @@ l65.msghandler = function(msg)
if n == 'l65dbg' then
local o = function(s) io.stderr:write(s) end
o(string.format("%s\n", msg))
local trace_cur = debug.traceback()
if trace_cur:find("in local 'late'") then
local lines = {}
for line in trace_cur:gmatch("[^\n]+") do
@ -2509,6 +2509,7 @@ l65.msghandler = function(msg)
end
local trace = v.trace:match(".-\n(.*)\n.-'xpcall'")
trace = trace:gsub('%[string "(.-%.l65)"%]', '%1')
trace = trace:gsub('stack traceback:', '')
print(trace)
os.exit(-2)
end
@ -2521,9 +2522,6 @@ l65.msghandler = function(msg)
io.stderr:write(string.format("%s\n%s\n", msg, trace_cur))
os.exit(-3)
end
l65.require = function()
-- TODO
end
do
local getembedded = type(arg[-1]) == 'function' and arg[-1]
l65.load_embedded = function(name)
@ -2578,7 +2576,7 @@ l65.loadfile = function(filename, mode, ...)
end
l65.dofile = function(filename)
local f = l65.report(l65.loadfile(filename))
return xpcall(f, l65.msghandler)
return f()
end
l65.installhooks = function()
if package.searchers[l65.searcher_index] ~= l65.searcher then
@ -2671,4 +2669,5 @@ if dump then l65.format = function(ast)
end end
local fn='' for i=#inf,1,-1 do local c=inf:sub(i,i) if c==dirsep or c=='/' then break end fn=c..fn if c=='.' then fn='' end end filename=fn
dofile(inf)
local f = l65.report(l65.loadfile(inf))
return xpcall(f, l65.msghandler)