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

Fixing a bug in error handling.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-23 15:25:23 -07:00
parent 09d797eddc
commit 0ee80c555d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
error_handling.moon
View File

@ -68,15 +68,18 @@ print_error = (error_message, start_fn, stop_fn)->
filename,start,stop = calling_fn.source\match('@([^[]*)%[([0-9]+):([0-9]+)]') filename,start,stop = calling_fn.source\match('@([^[]*)%[([0-9]+):([0-9]+)]')
assert(filename) assert(filename)
file = files.read(filename) file = files.read(filename)
err_line = files.get_line(file, calling_fn.currentline)
offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)")))
-- TODO: get name properly -- TODO: get name properly
name = if calling_fn.name name = if calling_fn.name
if tmp = calling_fn.name\match("^A_([a-zA-Z0-9_]*)$") if tmp = calling_fn.name\match("^A_([a-zA-Z0-9_]*)$")
"action '#{tmp\gsub("_"," ")\gsub("x([0-9A-F][0-9A-F])", => string.char(tonumber(@, 16)))}'" "action '#{tmp\gsub("_"," ")\gsub("x([0-9A-F][0-9A-F])", => string.char(tonumber(@, 16)))}'"
else "action '#{calling_fn.name}'" else "action '#{calling_fn.name}'"
else "main chunk" else "main chunk"
line = colored.yellow("#{filename}:#{calling_fn.currentline} in #{name}\n #{offending_statement}")
if err_line = files.get_line(file, calling_fn.currentline)
offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)")))
line = colored.yellow("#{filename}:#{calling_fn.currentline} in #{name}\n #{offending_statement}")
else
line = colored.yellow("#{filename}:#{calling_fn.currentline} in #{name}")
else else
ok, file = pcall ->files.read(calling_fn.short_src) ok, file = pcall ->files.read(calling_fn.short_src)
if not ok then file = nil if not ok then file = nil
@ -117,9 +120,9 @@ print_error = (error_message, start_fn, stop_fn)->
line = colored.blue("#{calling_fn.short_src}:#{calling_fn.currentline} in #{name or '?'}") line = colored.blue("#{calling_fn.short_src}:#{calling_fn.currentline} in #{name or '?'}")
if file if file
err_line = files.get_line(file, line_num) if err_line = files.get_line(file, line_num)
offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)$"))) offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)$")))
line ..= "\n "..offending_statement line ..= "\n "..offending_statement
io.stderr\write(line,"\n") io.stderr\write(line,"\n")
if calling_fn.istailcall if calling_fn.istailcall
io.stderr\write(" #{colored.dim colored.white " (...tail calls...)"}\n") io.stderr\write(" #{colored.dim colored.white " (...tail calls...)"}\n")