Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error reporting

Browse Source
This commit is contained in:
Bruce Hill 2019-03-04 14:19:44 -08:00
parent 30a7473d10
commit 026f7bf0e4
2 changed files with 77 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
error_handling.lua
View File

@ -85,79 +85,87 @@ enhance_error = function(error_message)
if not (error_message and error_message:match("%d|")) then if not (error_message and error_message:match("%d|")) then
error_message = error_message or "" error_message = error_message or ""
do do
local fn_name = (error_message:match("attempt to call a nil value %(global '(.*)'%)") or error_message:match("attempt to call global '(.*)' %(a nil value%)")) local fn_name = error_message:match("attempt to call a nil value %(method '(.*)'%)")
if fn_name then if fn_name then
local action_name = fn_name:from_lua_id() local action_name = fn_name:from_lua_id()
error_message = "The action '" .. tostring(action_name) .. "' is not defined." error_message = "This object does not have the method '" .. tostring(action_name) .. "'."
local func = debug.getinfo(2, 'f').func else
local ename, env = debug.getupvalue(func, 1) do
if not (ename == "_ENV" or ename == "_G") then fn_name = (error_message:match("attempt to call a nil value %(global '(.*)'%)") or error_message:match("attempt to call global '(.*)' %(a nil value%)"))
func = debug.getinfo(3, 'f').func if fn_name then
ename, env = debug.getupvalue(func, 1) local action_name = fn_name:from_lua_id()
end error_message = "The action '" .. tostring(action_name) .. "' is not defined."
local THRESHOLD = math.min(4.5, .9 * #action_name) local func = debug.getinfo(2, 'f').func
local candidates = { } local ename, env = debug.getupvalue(func, 1)
local cache = { } if not (ename == "_ENV" or ename == "_G") then
for i = 1, 99 do func = debug.getinfo(3, 'f').func
local k, v = debug.getlocal(2, i) ename, env = debug.getupvalue(func, 1)
if k == nil then
break
end
if not (k:sub(1, 1) == "(" or type(v) ~= 'function') then
k = k:from_lua_id()
if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then
table.insert(candidates, k)
end end
end local THRESHOLD = math.min(4.5, .9 * #action_name)
end local candidates = { }
for i = 1, debug.getinfo(func, 'u').nups do local cache = { }
local k, v = debug.getupvalue(func, i) for i = 1, 99 do
if not (k:sub(1, 1) == "(" or type(v) ~= 'function') then local k, v = debug.getlocal(2, i)
k = k:from_lua_id() if k == nil then
if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then break
table.insert(candidates, k) end
end if not (k:sub(1, 1) == "(" or type(v) ~= 'function') then
end
end
local scan
scan = function(t, is_lua_id)
for k, v in pairs(t) do
if type(k) == 'string' and type(v) == 'function' then
if not (is_lua_id) then
k = k:from_lua_id() k = k:from_lua_id()
end if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then
if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then table.insert(candidates, k)
table.insert(candidates, k) end
end end
end end
end for i = 1, debug.getinfo(func, 'u').nups do
end local k, v = debug.getupvalue(func, i)
scan(env.COMPILE_RULES, true) if not (k:sub(1, 1) == "(" or type(v) ~= 'function') then
scan(env.COMPILE_RULES._IMPORTS, true) k = k:from_lua_id()
scan(env) if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then
scan(env._IMPORTS) table.insert(candidates, k)
if #candidates > 0 then end
for _index_0 = 1, #candidates do end
local c = candidates[_index_0] end
THRESHOLD = math.min(THRESHOLD, strdist(c, action_name, cache)) local scan
end scan = function(t, is_lua_id)
do for k, v in pairs(t) do
local _accum_0 = { } if type(k) == 'string' and type(v) == 'function' then
local _len_0 = 1 if not (is_lua_id) then
for _index_0 = 1, #candidates do k = k:from_lua_id()
local c = candidates[_index_0] end
if strdist(c, action_name, cache) <= THRESHOLD then if strdist(k, action_name, cache) <= THRESHOLD and k ~= "" then
_accum_0[_len_0] = c table.insert(candidates, k)
_len_0 = _len_0 + 1 end
end
end
end
scan(env.COMPILE_RULES, true)
scan(env.COMPILE_RULES._IMPORTS, true)
scan(env)
scan(env._IMPORTS)
if #candidates > 0 then
for _index_0 = 1, #candidates do
local c = candidates[_index_0]
THRESHOLD = math.min(THRESHOLD, strdist(c, action_name, cache))
end
do
local _accum_0 = { }
local _len_0 = 1
for _index_0 = 1, #candidates do
local c = candidates[_index_0]
if strdist(c, action_name, cache) <= THRESHOLD then
_accum_0[_len_0] = c
_len_0 = _len_0 + 1
end
end
candidates = _accum_0
end
if #candidates == 1 then
error_message = error_message .. "\n\x1b[3mSuggestion: Maybe you meant '" .. tostring(candidates[1]) .. "'? "
elseif #candidates > 0 then
local last = table.remove(candidates)
error_message = error_message .. ("\n" .. C('italic', "Suggestion: Maybe you meant '" .. tostring(table.concat(candidates, "', '")) .. "'" .. tostring(#candidates > 1 and ',' or '') .. " or '" .. tostring(last) .. "'? "))
end end
end end
candidates = _accum_0
end
if #candidates == 1 then
error_message = error_message .. "\n\x1b[3mSuggestion: Maybe you meant '" .. tostring(candidates[1]) .. "'? "
elseif #candidates > 0 then
local last = table.remove(candidates)
error_message = error_message .. ("\n" .. C('italic', "Suggestion: Maybe you meant '" .. tostring(table.concat(candidates, "', '")) .. "'" .. tostring(#candidates > 1 and ',' or '') .. " or '" .. tostring(last) .. "'? "))
end end
end end
end end

5
error_handling.moon
View File

@ -61,7 +61,10 @@ enhance_error = (error_message)->
unless error_message and error_message\match("%d|") unless error_message and error_message\match("%d|")
error_message or= "" error_message or= ""
-- When calling 'nil' actions, make a better error message -- When calling 'nil' actions, make a better error message
if fn_name = (error_message\match("attempt to call a nil value %(global '(.*)'%)") or if fn_name = error_message\match("attempt to call a nil value %(method '(.*)'%)")
action_name = fn_name\from_lua_id!
error_message = "This object does not have the method '#{action_name}'."
elseif fn_name = (error_message\match("attempt to call a nil value %(global '(.*)'%)") or
error_message\match("attempt to call global '(.*)' %(a nil value%)")) error_message\match("attempt to call global '(.*)' %(a nil value%)"))
action_name = fn_name\from_lua_id! action_name = fn_name\from_lua_id!