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

Much better error reporting for compile errors (i.e. not parse errors),

Browse Source 
using the pretty_error system.
This commit is contained in:
Bruce Hill 2018-09-16 17:38:19 -07:00
parent 96e5e567cb
commit f225a48367
7 changed files with 120 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
core/control_flow.nom
View File

@ -197,7 +197,7 @@ compile [..]
..to:
# This uses Lua's approach of only allowing loop-scoped variables in a loop
unless (%var.type is "Var"):
compile error at %var.source "Loop expected variable, not: %s"
compile error at %var "Expected a variable here, not a \(%var.type)."
%lua = (..)
Lua "\
..for \(%var as lua expr)=\(%start as lua expr),\(%stop as lua expr),\(..)
@ -242,7 +242,7 @@ test:
compile [for %var in %iterable %body] to:
# This uses Lua's approach of only allowing loop-scoped variables in a loop
unless (%var.type is "Var"):
compile error at %var.source "Loop expected variable, not: %s"
compile error at %var "Expected a variable here, not a \(%var.type)."
define mangler
%lua = (..)
Lua "\
@ -280,9 +280,9 @@ compile [..]
..to:
# This uses Lua's approach of only allowing loop-scoped variables in a loop
unless (%key.type is "Var"):
compile error at %key.source "Loop expected variable, not: %s"
compile error at %key "Expected a variable here, not a \(%key.type)."
unless (%value.type is "Var"):
compile error at %value.source "Loop expected variable, not: %s"
compile error at %value "Expected a variable here, not a \(%value.type)."
%lua = (..)
Lua "\
..for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(..)
@ -331,23 +331,28 @@ compile [if %body, when %body] to:
%clause = "if"
%else_allowed = (yes)
unless (%body.type is "Block"):
compile error at %body.source "'if' expected a Block, but got: %s"
compile error at %body "'if' expected a Block, but got a \(%body.type)."
..hint "Perhaps you forgot to put a ':' after 'if'?"
for %line in %body:
unless (..)
((%line.type is "Action") and ((size of %line) >= 2)) and (..)
%line.(size of %line) is "Block" syntax tree
..:
compile error at %line.source "\
..Invalid line for 'if', each line should contain conditional expressions followed by a block, or "else" followed by a block:
%s"
compile error at %line "Invalid line for the body of an 'if' block."
..hint "Each line should contain one or more conditional expressions \
..followed by a block, or "else" followed by a block."
%action = %line.(size of %line)
if ((%line.1 is "else") and ((size of %line) == 2)):
unless %else_allowed:
compile error at %line.source "Can't have two 'else' blocks"
compile error at %line "You can't have two 'else' blocks."
..hint "Merge all of the 'else' blocks together."
unless ((size of "\%code") > 0):
compile error at %line.source "\
..Can't have an 'else' block without a preceeding condition"
compile error at %line "\
..You can't have an 'else' block without a preceeding condition"
..hint "If you want the code in this block to always execute, you don't \
..need a conditional block around it. Otherwise, make sure the 'else' \
..block comes last."
%code::append "\
..
@ -358,11 +363,6 @@ compile [if %body, when %body] to:
..else:
%code::append "\%clause "
for %i in 1 to ((size of %line) - 1):
unless (%line.%i is syntax tree):
compile error at %line.source "\
..Invalid condition for 'if' statement:
%s"
if (%i > 1):
%code::append " or "
%code::append (%line.%i as lua expr)
@ -374,7 +374,8 @@ compile [if %body, when %body] to:
%clause = "\nelseif"
if ((size of "\%code") == 0):
compile error at %body.source "'if' block has an empty body"
compile error at %body "'if' block has an empty body."
..hint "This means nothing would happen, so the 'if' block should be deleted."
%code::append "\nend --when"
return %code
@ -395,23 +396,28 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
%else_allowed = (yes)
define mangler
unless (%body.type is "Block"):
compile error at %body.source "'if' expected a Block, but got: %s"
compile error at %body "'if' expected a Block, but got a \(%body.type)"
..hint "Perhaps you forgot to put a ':' after the 'is'?"
for %line in %body:
unless (..)
((%line.type is "Action") and ((size of %line) >= 2)) and (..)
%line.(size of %line) is "Block" syntax tree
..:
compile error at %line.source "\
..Invalid line for 'if % is % %', each line should contain expressions followed by a block, or "else" followed by a block:
%s"
compile error at %line "Invalid line for 'if' block."
..hint "Each line should contain expressions \
..followed by a block, or "else" followed by a block"
%action = %line.(size of %line)
if ((%line.1 is "else") and ((size of %line) == 2)):
unless %else_allowed:
compile error at %line.source "Can't have two 'else' blocks"
compile error at %line "You can't have two 'else' blocks."
..hint "Merge all of the 'else' blocks together."
unless ((size of "\%code") > 0):
compile error at %line.source "\
..Can't have an 'else' block without a preceeding condition"
compile error at %line "\
..You can't have an 'else' block without a preceeding condition"
..hint "If you want the code in this block to always execute, you don't \
..need a conditional block around it. Otherwise, make sure the 'else' \
..block comes last."
%code::append "\
..
@ -422,11 +428,6 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
..else:
%code::append "\%clause "
for %i in 1 to ((size of %line) - 1):
unless (%line.%i is syntax tree):
compile error at %line.source "\
..Invalid condition for 'if' statement:
%s"
if (%i > 1):
%code::append " or "
%code::append "\(mangle "branch value") == \(%line.%i as lua expr)"
@ -438,7 +439,8 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
%clause = "\nelseif"
if ((size of "\%code") == 0):
compile error at %body.source "'if % is % %' block has an empty body"
compile error at %body "'if' block has an empty body."
..hint "This means nothing would happen, so the 'if' block should be deleted."
%code::append "\nend --when"
return (..)
Lua "\

6
core/errors.nom
View File

@ -6,8 +6,10 @@ use "core/metaprogramming.nom"
compile [barf] to (Lua "error(nil, 0);")
compile [barf %msg] to (Lua "error(\(%msg as lua expr), 0);")
compile [compile error at %source %msg] to (..)
Lua "nomsu:compile_error(\(%source as lua expr), \(%msg as lua expr))"
compile [compile error at %tree %msg] to (..)
Lua "nomsu:compile_error(\(%tree as lua expr), \(%msg as lua expr))"
compile [compile error at %tree %msg hint %hint] to (..)
Lua "nomsu:compile_error(\(%tree as lua expr), \(%msg as lua expr), \(%hint as lua expr))"
compile [assume %condition] to:
lua> "\

2
core/scopes.nom
View File

@ -36,7 +36,7 @@ compile [with local %locals %body, with local %locals do %body] to:
"Var" "Action":
%body_lua::declare locals ["\(%locals as lua)"]
else:
compile error at %locals.source "Unexpected locals: %s"
compile error at %locals "Unexpected local value"
return (..)
Lua "\

64
nomsu_compiler.lua
View File

@ -322,11 +322,13 @@ do
for i, t in ipairs(errs) do
if i <= 3 then
_accum_0[_len_0] = pretty_error({
title = "Parse error",
error = t.error,
hint = t.hint,
source = t:get_source_code(),
start = t.source.start,
stop = t.source.stop
stop = t.source.stop,
filename = t.source.filename
})
_len_0 = _len_0 + 1
end
@ -340,19 +342,20 @@ do
end
return tree
end
NomsuCompiler.compile_error = function(self, source, err_format_string, ...)
err_format_string = err_format_string:gsub("%%[^s]", "%%%1")
local file = Files.read(source.filename)
local line_starts = Files.get_line_starts(file)
local line_no = Files.get_line_number(file, source.start)
local line_start = line_starts[line_no]
local src = colored.dim(file:sub(line_start, source.start - 1))
src = src .. colored.underscore(colored.bright(colored.red(file:sub(source.start, source.stop - 1))))
local end_of_line = (line_starts[Files.get_line_number(file, source.stop) + 1] or 0) - 1
src = src .. colored.dim(file:sub(source.stop, end_of_line - 1))
src = ' ' .. src:gsub('\n', '\n ')
local err_msg = err_format_string:format(src, ...)
return error(tostring(source.filename) .. ":" .. tostring(line_no) .. ": " .. err_msg, 0)
NomsuCompiler.compile_error = function(self, tree, err_msg, hint)
if hint == nil then
hint = nil
end
local err_str = pretty_error({
title = "Compile error",
error = err_msg,
hint = hint,
source = tree:get_source_code(),
start = tree.source.start,
stop = tree.source.stop,
filename = tree.source.filename
})
return error(err_str, 0)
end
local add_lua_bits
add_lua_bits = function(self, val_or_stmt, code, compile_actions)
@ -369,7 +372,7 @@ do
else
local bit_lua = self:compile(bit, compile_actions)
if not (bit_lua.is_value) then
self:compile_error(bit.source, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
self:compile_error(bit, "Can't use this as a string interpolation value, since it's not an expression.")
end
lua:append(bit_lua)
end
@ -402,7 +405,7 @@ do
else
local bit_lua = self:compile(bit)
if not (bit_lua.is_value) then
self:compile_error(bit.source, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
self:compile_error(bit, "Can't use this as a string interpolation value, since it's not an expression.")
end
add_bit_lua(lua, bit_lua)
end
@ -422,7 +425,7 @@ do
else
local tok_lua = self:compile(tok, compile_actions)
if not (tok_lua.is_value) then
self:compile_error(tok.source, "Non-expression value inside math expression:\n%s")
self:compile_error(tok, "Can't use this as a value in a math expression, since it's not a value.")
end
if tok.type == "Action" then
tok_lua:parenthesize()
@ -700,7 +703,8 @@ do
end
local ret = compile_action(self, tree, unpack(args))
if not ret then
self:compile_error(tree.source, "Compile-time action:\n%s\nfailed to produce any Lua")
local info = debug.getinfo(compile_action, "S")
self:compile_error(tree, "The compile-time action here (" .. tostring(stub) .. ") failed to produce any Lua", "Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(info.short_src:sub(1, 200)) .. ":" .. tostring(info.linedefined) .. " and make sure it's returning Lua code.")
end
return ret
end
@ -726,9 +730,11 @@ do
local arg_lua = self:compile(tok, compile_actions)
if not (arg_lua.is_value) then
if tok.type == "Block" then
self:compile_error(tok.source, ("Cannot compile action '" .. tostring(stub) .. "' with a Block as an argument.\n" .. "Maybe there should be a compile-time action with that name that isn't being found?"))
self:compile_error(tok, "Can't compile action (" .. tostring(stub) .. ") with a Block as an argument.", "Maybe there should be a compile-time action with that name that isn't being found?")
elseif tok.type == "Action" then
self:compile_error(tok, "Can't use this as an argument to (" .. tostring(stub) .. "), since it's not an expression, it produces: " .. tostring(repr(arg_lua)), "Check the implementation of (" .. tostring(tok.stub) .. ") to see if it is actually meant to produce an expression.")
else
self:compile_error(tok.source, "Cannot use:\n%s\nas an argument to '%s', since it's not an expression, it produces: %s", stub, repr(arg_lua))
self:compile_error(tok, "Can't use this as an argument to (" .. tostring(stub) .. "), since it's not an expression, it produces: " .. tostring(repr(arg_lua)))
end
end
insert(args, arg_lua)
@ -800,7 +806,7 @@ do
if not (bit_lua.is_value) then
local src = ' ' .. gsub(tostring(self:compile(bit, compile_actions)), '\n', '\n ')
local line = tostring(bit.source.filename) .. ":" .. tostring(Files.get_line_number(Files.read(bit.source.filename), bit.source.start))
self:compile_error(bit.source, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
self:compile_error(bit, "Can't this as a string interpolation value, since it's not an expression.")
end
if #lua.bits > 0 then
lua:append("..")
@ -857,11 +863,11 @@ do
local key, value = tree[1], tree[2]
local key_lua = self:compile(key, compile_actions)
if not (key_lua.is_value) then
self:compile_error(tree[1].source, "Cannot use:\n%s\nas a dict key, since it's not an expression.")
self:compile_error(tree[1], "Can't use this as a dict key, since it's not an expression.")
end
local value_lua = value and self:compile(value, compile_actions) or LuaCode.Value(key.source, "true")
if not (value_lua.is_value) then
self:compile_error(tree[2].source, "Cannot use:\n%s\nas a dict value, since it's not an expression.")
self:compile_error(tree[2], "Can't use this as a dict value, since it's not an expression.")
end
local key_str = match(tostring(key_lua), [=[^["']([a-zA-Z_][a-zA-Z0-9_]*)['"]$]=])
if key_str then
@ -874,7 +880,7 @@ do
elseif "IndexChain" == _exp_0 then
local lua = self:compile(tree[1], compile_actions)
if not (lua.is_value) then
self:compile_error(tree[1].source, "Cannot index:\n%s\nsince it's not an expression.")
self:compile_error(tree[1], "Can't index into this, since it's not an expression.")
end
local first_char = sub(tostring(lua), 1, 1)
if first_char == "{" or first_char == '"' or first_char == "[" then
@ -884,7 +890,7 @@ do
local key = tree[i]
local key_lua = self:compile(key, compile_actions)
if not (key_lua.is_value) then
self:compile_error(key.source, "Cannot use:\n%s\nas an index, since it's not an expression.")
self:compile_error(key, "Can't use this as an index, since it's not an expression.")
end
local key_lua_str = tostring(key_lua)
do
@ -904,11 +910,11 @@ do
elseif "Var" == _exp_0 then
return LuaCode.Value(tree.source, (tree[1]):as_lua_id())
elseif "FileChunks" == _exp_0 then
return error("Cannot convert FileChunks to a single block of lua, since each chunk's " .. "compilation depends on the earlier chunks")
return error("Can't convert FileChunks to a single block of lua, since each chunk's " .. "compilation depends on the earlier chunks")
elseif "Comment" == _exp_0 then
return LuaCode(tree.source, "")
elseif "Error" == _exp_0 then
return error("Cannot compile errors")
return error("Can't compile errors")
else
return error("Unknown type: " .. tostring(tree.type))
end
@ -935,11 +941,11 @@ do
end
local _exp_0 = tree.type
if "FileChunks" == _exp_0 then
return error("Cannot inline a FileChunks")
return error("Can't inline a FileChunks")
elseif "Comment" == _exp_0 then
return NomsuCode(tree.source, "")
elseif "Error" == _exp_0 then
return error("Cannot compile errors")
return error("Can't compile errors")
elseif "Action" == _exp_0 then
local nomsu = NomsuCode(tree.source)
if tree.target then

84
nomsu_compiler.moon
View File

@ -164,28 +164,22 @@ with NomsuCompiler
num_errs = #errs
if num_errs > 0
err_strings = [pretty_error{
title:"Parse error"
error:t.error, hint:t.hint, source:t\get_source_code!
start:t.source.start, stop:t.source.stop
start:t.source.start, stop:t.source.stop, filename:t.source.filename
} for i, t in ipairs(errs) when i <= 3]
if num_errs > 3
table.insert(err_strings, "\027[31;1m +#{num_errs-#errs} additional errors...\027[0m\n")
error(table.concat(err_strings, '\n\n'), 0)
return tree
-- TODO: use pretty_error instead of this
.compile_error = (source, err_format_string, ...)=>
err_format_string = err_format_string\gsub("%%[^s]", "%%%1")
file = Files.read(source.filename)
line_starts = Files.get_line_starts(file)
line_no = Files.get_line_number(file, source.start)
line_start = line_starts[line_no]
src = colored.dim(file\sub(line_start, source.start-1))
src ..= colored.underscore colored.bright colored.red(file\sub(source.start, source.stop-1))
end_of_line = (line_starts[Files.get_line_number(file, source.stop) + 1] or 0) - 1
src ..= colored.dim(file\sub(source.stop, end_of_line-1))
src = ' '..src\gsub('\n', '\n ')
err_msg = err_format_string\format(src, ...)
error("#{source.filename}:#{line_no}: "..err_msg, 0)
.compile_error = (tree, err_msg, hint=nil)=>
err_str = pretty_error{
title: "Compile error"
error:err_msg, hint:hint, source:tree\get_source_code!
start:tree.source.start, stop:tree.source.stop, filename:tree.source.filename
}
error(err_str, 0)
add_lua_bits = (val_or_stmt, code, compile_actions)=>
cls = val_or_stmt == "value" and LuaCode.Value or LuaCode
@ -199,8 +193,8 @@ with NomsuCompiler
else
bit_lua = @compile(bit, compile_actions)
unless bit_lua.is_value
@compile_error bit.source,
"Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
@compile_error bit,
"Can't use this as a string interpolation value, since it's not an expression."
lua\append bit_lua
return lua
return operate_on_text code
@ -223,8 +217,8 @@ with NomsuCompiler
else
bit_lua = @compile(bit)
unless bit_lua.is_value
@compile_error bit.source,
"Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
@compile_error bit,
"Can't use this as a string interpolation value, since it's not an expression."
add_bit_lua(lua, bit_lua)
lua\append ")"
return lua
@ -242,7 +236,8 @@ with NomsuCompiler
else
tok_lua = @compile(tok, compile_actions)
unless tok_lua.is_value
@compile_error tok.source, "Non-expression value inside math expression:\n%s"
@compile_error tok,
"Can't use this as a value in a math expression, since it's not a value."
tok_lua\parenthesize! if tok.type == "Action"
lua\append tok_lua
lua\append " " if i < #tree
@ -409,8 +404,10 @@ with NomsuCompiler
-- TODO: use tail call?
ret = compile_action(@, tree, unpack(args))
if not ret
@compile_error tree.source,
"Compile-time action:\n%s\nfailed to produce any Lua"
info = debug.getinfo(compile_action, "S")
@compile_error tree,
"The compile-time action here (#{stub}) failed to produce any Lua",
"Look at the implementation of (#{stub}) in #{info.short_src\sub(1,200)}:#{info.linedefined} and make sure it's returning Lua code."
return ret
lua = LuaCode.Value(tree.source)
@ -427,14 +424,17 @@ with NomsuCompiler
arg_lua = @compile(tok, compile_actions)
unless arg_lua.is_value
if tok.type == "Block"
@compile_error tok.source,
("Cannot compile action '#{stub}' with a Block as an argument.\n"..
"Maybe there should be a compile-time action with that name that isn't being found?")
@compile_error tok,
"Can't compile action (#{stub}) with a Block as an argument.",
"Maybe there should be a compile-time action with that name that isn't being found?"
elseif tok.type == "Action"
@compile_error tok,
"Can't use this as an argument to (#{stub}), since it's not an expression, it produces: #{repr arg_lua}",
"Check the implementation of (#{tok.stub}) to see if it is actually meant to produce an expression."
else
@compile_error tok.source,
"Cannot use:\n%s\nas an argument to '%s', since it's not an expression, it produces: %s",
stub, repr arg_lua
@compile_error tok,
"Can't use this as an argument to (#{stub}), since it's not an expression, it produces: #{repr arg_lua}"
insert args, arg_lua
lua\concat_append args, ", "
lua\append ")"
@ -479,8 +479,8 @@ with NomsuCompiler
unless bit_lua.is_value
src = ' '..gsub(tostring(@compile(bit, compile_actions)), '\n','\n ')
line = "#{bit.source.filename}:#{Files.get_line_number(Files.read(bit.source.filename), bit.source.start)}"
@compile_error bit.source,
"Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
@compile_error bit,
"Can't this as a string interpolation value, since it's not an expression."
if #lua.bits > 0 then lua\append ".."
if bit.type != "Text"
bit_lua = LuaCode.Value(bit.source, "stringify(",bit_lua,")")
@ -510,12 +510,12 @@ with NomsuCompiler
key, value = tree[1], tree[2]
key_lua = @compile(key, compile_actions)
unless key_lua.is_value
@compile_error tree[1].source,
"Cannot use:\n%s\nas a dict key, since it's not an expression."
@compile_error tree[1],
"Can't use this as a dict key, since it's not an expression."
value_lua = value and @compile(value, compile_actions) or LuaCode.Value(key.source, "true")
unless value_lua.is_value
@compile_error tree[2].source,
"Cannot use:\n%s\nas a dict value, since it's not an expression."
@compile_error tree[2],
"Can't use this as a dict value, since it's not an expression."
-- TODO: support arbitrary words here, like operators and unicode
key_str = match(tostring(key_lua), [=[^["']([a-zA-Z_][a-zA-Z0-9_]*)['"]$]=])
return if key_str
@ -531,8 +531,8 @@ with NomsuCompiler
when "IndexChain"
lua = @compile(tree[1], compile_actions)
unless lua.is_value
@compile_error tree[1].source,
"Cannot index:\n%s\nsince it's not an expression."
@compile_error tree[1],
"Can't index into this, since it's not an expression."
first_char = sub(tostring(lua),1,1)
if first_char == "{" or first_char == '"' or first_char == "["
lua\parenthesize!
@ -541,8 +541,8 @@ with NomsuCompiler
key = tree[i]
key_lua = @compile(key, compile_actions)
unless key_lua.is_value
@compile_error key.source,
"Cannot use:\n%s\nas an index, since it's not an expression."
@compile_error key,
"Can't use this as an index, since it's not an expression."
key_lua_str = tostring(key_lua)
if lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
lua\append ".#{lua_id}"
@ -562,7 +562,7 @@ with NomsuCompiler
return LuaCode.Value(tree.source, (tree[1])\as_lua_id!)
when "FileChunks"
error("Cannot convert FileChunks to a single block of lua, since each chunk's "..
error("Can't convert FileChunks to a single block of lua, since each chunk's "..
"compilation depends on the earlier chunks")
when "Comment"
@ -570,7 +570,7 @@ with NomsuCompiler
return LuaCode(tree.source, "")
when "Error"
error("Cannot compile errors")
error("Can't compile errors")
else
error("Unknown type: #{tree.type}")
@ -580,14 +580,14 @@ with NomsuCompiler
@tree_to_inline_nomsu(tree, parenthesize_blocks, check, len + (nomsu and #tostring(nomsu) or 0))
switch tree.type
when "FileChunks"
error("Cannot inline a FileChunks")
error("Can't inline a FileChunks")
when "Comment"
-- TODO: implement?
return NomsuCode(tree.source, "")
when "Error"
error("Cannot compile errors")
error("Can't compile errors")
when "Action"
nomsu = NomsuCode(tree.source)

6
pretty_errors.lua
View File

@ -25,7 +25,7 @@ format_error = function(err)
else
pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. "⬆"
end
local err_msg = "\027[33;41;1mParse error at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "\027[0m"
local err_msg = "\027[33;41;1m" .. tostring(err.title or "Error") .. " at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "\027[0m"
for i = err_linenum - context, err_linenum - 1 do
do
local line = string2.line(err.source, i)
@ -61,9 +61,9 @@ format_error = function(err)
end
end
local box_width = 70
local err_text = "\027[47;31;1m" .. tostring((" " .. err.error):wrap_to_1(box_width):gsub("\n", "\n\027[47;31;1m "))
local err_text = "\027[47;31;1m" .. tostring(string2.wrap(" " .. err.error, box_width, 16):gsub("\n", "\n\027[47;31;1m "))
if err.hint then
err_text = err_text .. "\n\027[47;30m" .. tostring((" Suggestion: " .. tostring(err.hint)):wrap_to_1(box_width):gsub("\n", "\n\027[47;30m "))
err_text = err_text .. "\n\027[47;30m" .. tostring(string2.wrap(" Suggestion: " .. tostring(err.hint), box_width, 16):gsub("\n", "\n\027[47;30m "))
end
err_msg = err_msg .. ("\n\027[33;1m " .. box(err_text):gsub("\n", "\n "))
for i = err_linenum_end + 1, err_linenum_end + context do

6
pretty_errors.moon
View File

@ -23,7 +23,7 @@ format_error = (err)->
(" ")\rep(err_linepos+#fmt_str\format(0)-1).."╚#{("═")\rep(err_size-2)}╝"
else
(" ")\rep(err_linepos+#fmt_str\format(0)-1).."⬆"
err_msg = "\027[33;41;1mParse error at #{err.filename or '???'}:#{err_linenum}\027[0m"
err_msg = "\027[33;41;1m#{err.title or "Error"} at #{err.filename or '???'}:#{err_linenum}\027[0m"
for i=err_linenum-context,err_linenum-1
if line = string2.line(err.source, i)
err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0m#{line}\027[0m"
@ -47,9 +47,9 @@ format_error = (err)->
err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0;41;30m#{line}\027[0m"
box_width = 70
err_text = "\027[47;31;1m#{(" "..err.error)\wrap_to_1(box_width)\gsub("\n", "\n\027[47;31;1m ")}"
err_text = "\027[47;31;1m#{string2.wrap(" "..err.error, box_width, 16)\gsub("\n", "\n\027[47;31;1m ")}"
if err.hint
err_text ..= "\n\027[47;30m#{(" Suggestion: #{err.hint}")\wrap_to_1(box_width)\gsub("\n", "\n\027[47;30m ")}"
err_text ..= "\n\027[47;30m#{string2.wrap(" Suggestion: #{err.hint}", box_width, 16)\gsub("\n", "\n\027[47;30m ")}"
err_msg ..= "\n\027[33;1m "..box(err_text)\gsub("\n", "\n ")
for i=err_linenum_end+1,err_linenum_end+context