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

Better error messaging (using pretty_error in more places)

Browse Source
This commit is contained in:
Bruce Hill 2019-01-16 16:31:49 -08:00
parent 25e1ccc025
commit 8ca7749b55
16 changed files with 148 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bootstrap.lua
View File

@ -10,33 +10,8 @@ do
end end
local SyntaxTree = require("syntax_tree") local SyntaxTree = require("syntax_tree")
local Files = require("files") local Files = require("files")
local pretty_error = require("pretty_errors") local fail_at
local compile_error fail_at = require('nomsu_compiler').fail_at
compile_error = function(source, err_msg, hint)
if hint == nil then
hint = nil
end
local file
if SyntaxTree:is_instance(source) then
file = source:get_source_file()
source = source.source
elseif type(source) == 'string' then
source = Source:from_string(source)
end
if source and not file then
file = Files.read(source.filename)
end
local err_str = pretty_error({
title = "Compile error",
error = err_msg,
hint = hint,
source = file,
start = source.start,
stop = source.stop,
filename = source.filename
})
return error(err_str, 0)
end
local MAX_LINE = 80 local MAX_LINE = 80
local compile_actions = { local compile_actions = {
[""] = function(self, fn, ...) [""] = function(self, fn, ...)
@ -130,7 +105,7 @@ local compile_actions = {
end, end,
["test"] = function(self, body) ["test"] = function(self, body)
if not (body.type == 'Block') then if not (body.type == 'Block') then
compile_error(body, "This should be a Block") fail_at(body, "Compile error: This should be a Block")
end end
local test_nomsu = body:get_source_code():match(":[ ]*(.*)") local test_nomsu = body:get_source_code():match(":[ ]*(.*)")
do do

21
bootstrap.moon
View File

@ -4,24 +4,7 @@
SyntaxTree = require "syntax_tree" SyntaxTree = require "syntax_tree"
Files = require "files" Files = require "files"
-- TODO: de-duplicate this {:fail_at} = require('nomsu_compiler')
pretty_error = require("pretty_errors")
compile_error = (source, err_msg, hint=nil)->
local file
if SyntaxTree\is_instance(source)
file = source\get_source_file!
source = source.source
elseif type(source) == 'string'
source = Source\from_string(source)
if source and not file
file = Files.read(source.filename)
err_str = pretty_error{
title: "Compile error"
error:err_msg, hint:hint, source:file
start:source.start, stop:source.stop, filename:source.filename
}
error(err_str, 0)
MAX_LINE = 80 -- For beautification purposes, try not to make lines much longer than this value MAX_LINE = 80 -- For beautification purposes, try not to make lines much longer than this value
compile_actions = { compile_actions = {
@ -107,7 +90,7 @@ compile_actions = {
["test"]: (body)=> ["test"]: (body)=>
unless body.type == 'Block' unless body.type == 'Block'
compile_error(body, "This should be a Block") fail_at(body, "Compile error: This should be a Block")
test_nomsu = body\get_source_code!\match(":[ ]*(.*)") test_nomsu = body\get_source_code!\match(":[ ]*(.*)")
if indent = test_nomsu\match("\n([ ]*)") if indent = test_nomsu\match("\n([ ]*)")
test_nomsu = test_nomsu\gsub("\n"..indent, "\n") test_nomsu = test_nomsu\gsub("\n"..indent, "\n")

2
lib/compatibility/3.5.5.6.nom
View File

@ -8,4 +8,4 @@ use "compatibility/compatibility"
upgrade action "traceback" to "3.5.5.6" via upgrade action "traceback" to "3.5.5.6" via
for $tree: for $tree:
compile error at $tree "'traceback' has been deprecated." at $tree fail "Upgrade error: 'traceback' has been deprecated."

6
lib/compatibility/3.nom
View File

@ -11,5 +11,7 @@ upgrade action (me) to "3" as $me
upgrade action (@) to "3" as $me upgrade action (@) to "3" as $me
upgrade action "as" to "3" via upgrade action "as" to "3" via
for $tree: for $tree:
compile error at $tree "Object API has changed and 'as' is no longer supported." at $tree fail ("
"Use ($obj, action ...) instead of (as $obj: action ...)" Upgrade error: Object API has changed and 'as' is no longer supported.
Hint: Use ($obj, action ...) instead of (as $obj: action ...)
")

6
lib/compatibility/4.11.nom
View File

@ -29,8 +29,10 @@ upgrade action "set" to "4.11" via
upgrade action "1 with 2 ~>" to "4.11" via upgrade action "1 with 2 ~>" to "4.11" via
for $tree: for $tree:
compile error at $tree "This method has been deprecated." at $tree fail ("
"Perhaps this could be use ($tree, map ...) instead." Upgrade error: This method has been deprecated.
Hint: Perhaps this could be use ($tree, map ...) instead.
")
# Changing filesystem API: # Changing filesystem API:
upgrade action (for file $f in $path $body) to "4.11" as upgrade action (for file $f in $path $body) to "4.11" as

12
lib/compatibility/4.12.nom
View File

@ -9,10 +9,14 @@ use "compatibility/compatibility"
upgrade action "do next repeat" to "4.12" via upgrade action "do next repeat" to "4.12" via
for $tree: for $tree:
compile error at $tree "This method has been deprecated." at $tree fail ("
"Use either (do next) or (go to (label)) instead." Upgrade error: This method has been deprecated.
Hint: Use either (do next) or (go to (label)) instead.
")
upgrade action "stop repeating" to "4.12" via upgrade action "stop repeating" to "4.12" via
for $tree: for $tree:
compile error at $tree "This method has been deprecated." at $tree fail ("
"Use either (stop) or (go to (label)) instead." Upgrade error: This method has been deprecated.
Hint: Use either (stop) or (go to (label)) instead.
")

64
lib/core/control_flow.nom
View File

@ -328,29 +328,34 @@ test:
$clause = "if" $clause = "if"
$else_allowed = (yes) $else_allowed = (yes)
unless ($body.type is "Block"): unless ($body.type is "Block"):
compile error at $body "'if' expected a Block, but got a \($body.type)." at $body fail ("
"Perhaps you forgot to put a ':' after 'if'?" Compile error: 'if' expected a Block, but got a \($body.type).
Hint: Perhaps you forgot to put a ':' after 'if'?
")
for $line in $body: for $line in $body:
unless unless
(($line.type is "Action") and ((size of $line) >= 2)) and (($line.type is "Action") and ((size of $line) >= 2)) and
$line.(size of $line) is "Block" syntax tree $line.(size of $line) is "Block" syntax tree
..: ..:
compile error at $line "Invalid line for the body of an 'if' block." (" at $line fail ("
Each line should contain one or more conditional expressions followed by a block, or "else"\ Compile error: Invalid line for the body of an 'if' block.
.. followed by a 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) $action = $line.(size of $line)
if (($line.1 is "else") and ((size of $line) == 2)): if (($line.1 is "else") and ((size of $line) == 2)):
unless $else_allowed: unless $else_allowed:
compile error at $line "You can't have two 'else' blocks." at $line fail ("
"Merge all of the 'else' blocks together." Compile error: You can't have two 'else' blocks.
Hint: Merge all of the 'else' blocks together.
")
unless ((size of "\$code") > 0): unless ((size of "\$code") > 0):
compile error at $line at $line fail ("
.."You can't have an 'else' block without a preceding condition" (" Compile error: You can't have an 'else' block without a preceding condition.
If you want the code in this block to always execute, you don't need a conditional block \ Hint: If you want the code in this block to always execute, you don't need a \
..around it. Otherwise, make sure the 'else' block comes last. ..conditional block around it. Otherwise, make sure the 'else' block comes last.
") ")
$code, add "\nelse\n " ($action as lua) $code, add "\nelse\n " ($action as lua)
@ -365,8 +370,10 @@ test:
$clause = "\nelseif" $clause = "\nelseif"
if ((size of "\$code") == 0): if ((size of "\$code") == 0):
compile error at $body "'if' block has an empty body." at $body fail ("
"This means nothing would happen, so the 'if' block should be deleted." Compile error: 'if' block has an empty body.
Hint: This means nothing would happen, so the 'if' block should be deleted.
")
$code, add "\nend --when" $code, add "\nend --when"
return $code return $code
@ -392,28 +399,33 @@ test:
$else_allowed = (yes) $else_allowed = (yes)
define mangler define mangler
unless ($body.type is "Block"): unless ($body.type is "Block"):
compile error at $body "'if' expected a Block, but got a \($body.type)" at $body fail ("
"Perhaps you forgot to put a ':' after the 'is'?" Compile error: 'if' expected a Block, but got a \($body.type).
Hint: Perhaps you forgot to put a ':' after the 'is'?
")
for $line in $body: for $line in $body:
unless unless
(($line.type is "Action") and ((size of $line) >= 2)) and (($line.type is "Action") and ((size of $line) >= 2)) and
$line.(size of $line) is "Block" syntax tree $line.(size of $line) is "Block" syntax tree
..: ..:
compile error at $line "Invalid line for 'if' block." (" at $line fail ("
Each line should contain expressions followed by a block, or "else" followed by a block Compile error: 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) $action = $line.(size of $line)
if (($line.1 is "else") and ((size of $line) == 2)): if (($line.1 is "else") and ((size of $line) == 2)):
unless $else_allowed: unless $else_allowed:
compile error at $line "You can't have two 'else' blocks." at $line fail ("
"Merge all of the 'else' blocks together." Compile error: You can't have two 'else' blocks.
Hint: Merge all of the 'else' blocks together.
")
unless ((size of "\$code") > 0): unless ((size of "\$code") > 0):
compile error at $line at $line fail ("
.."You can't have an 'else' block without a preceding condition" (" Compile error: You can't have an 'else' block without a preceding condition.
If you want the code in this block to always execute, you don't need a conditional block \ Hint: If you want the code in this block to always execute, you don't need \
..around it. Otherwise, make sure the 'else' block comes last. ..a conditional block around it. Otherwise, make sure the 'else' block comes last.
") ")
$code, add "\nelse\n " ($action as lua) $code, add "\nelse\n " ($action as lua)
@ -428,8 +440,10 @@ test:
$clause = "\nelseif" $clause = "\nelseif"
if ((size of "\$code") == 0): if ((size of "\$code") == 0):
compile error at $body "'if' block has an empty body." at $body fail ("
"This means nothing would happen, so the 'if' block should be deleted." Compile error: 'if' block has an empty body.
Hint: This means nothing would happen, so the 'if' block should be deleted.
")
$code, add "\nend --when" $code, add "\nend --when"
return return

40
lib/core/errors.nom
View File

@ -8,29 +8,33 @@ use "core/control_flow"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
(fail $msg) compiles to "error(\(($msg as lua expr) if $msg else "nil"), 0);" (fail $msg) compiles to
(assume $condition) compiles to: LuaCode
lua> (" "at_1_fail(\(quote $msg.source), 'Failure: '..\($msg as lua expr))"
local \$assumption = 'Assumption failed: '..tostring((\$condition):get_source_code()) ..if $msg else "error('Failure', 0)"
")
return (assume $condition) compiles to ("
Lua ("
if not \($condition as lua expr) then if not \($condition as lua expr) then
error(\(quote "\$assumption"), 0) at_1_fail(\(quote "\($condition.source)"), "Assumption failed: This is not true.")
end end
") ")
(assume $a == $b) compiles to: (assume $a == $b) compiles to ("
lua> "local \$assumption = 'Assumption failed: '..tostring(\(\($a == $b) as nomsu))"
define mangler
return
Lua ("
do do
local \(mangle "a"), \(mangle "b") = \($a as lua expr), \($b as lua expr) local _a, _b = \($a as lua expr), \($b as lua expr)
if \(mangle "a") ~= \(mangle "b") then if _a ~= _b then
error(\(quote "\$assumption").."\\n"..tostring(\(mangle "a")).." != "..tostring(\ at_1_fail(\(quote "\($a.source)"),
..\(mangle "b")), 0) "Assumption failed: This value is "..tostring(_a)..", but it was supposed to be "..tostring(_b)..".")
end
end
")
(assume $a != $b) compiles to ("
do
local _a, _b = \($a as lua expr), \($b as lua expr)
if _a == _b then
at_1_fail(\(quote "\($a.source)"),
"Assumption failed: This value is "..tostring(_a)..", but it wasn't supposed to be.")
end end
end end
") ")
@ -44,7 +48,7 @@ test:
$worked = (yes) $worked = (yes)
..if it succeeds: ..if it succeeds:
fail "'try' incorrectly ran success case." fail "'try' incorrectly ran success case."
assume $failure == "xx" assume ($failure, matches "xx")
unless $worked: unless $worked:
fail "'try' failed to recover from failure" fail "'try' failed to recover from failure"

30
lib/core/metaprogramming.nom
View File

@ -34,14 +34,15 @@ lua> ("
local arg_lua = SyntaxTree:is_instance(arg) and \(nomsu environment):compile(arg):text() or arg local arg_lua = SyntaxTree:is_instance(arg) and \(nomsu environment):compile(arg):text() or arg
if arg_lua == "..." then if arg_lua == "..." then
if i < #\$args then if i < #\$args then
compile_error_at(SyntaxTree:is_instance(arg) and arg or nil, at_1_fail(SyntaxTree:is_instance(arg) and arg or nil,
"Extra arguments must come last.", "Try removing any arguments after \ "Compile error: Extra arguments must come last. "..
..(*extra arguments*)") "Hint: Try removing any arguments after (*extra arguments*)")
end end
elseif not arg_lua:is_lua_id() then elseif not arg_lua:is_lua_id() then
compile_error_at(SyntaxTree:is_instance(arg) and arg or nil, at_1_fail(SyntaxTree:is_instance(arg) and arg or nil,
"This does not compile to a Lua identifier, so it can't be used as a function argument.", "Compile error: This does not compile to a Lua identifier, so it "..
"This should probably be a Nomsu variable instead (like $x).") "can't be used as a function argument."..
"Hint: This should probably be a Nomsu variable instead (like $x).")
end end
lua:add(i > 1 and ", " or "", arg_lua) lua:add(i > 1 and ", " or "", arg_lua)
body_lua:remove_free_vars({arg_lua}) body_lua:remove_free_vars({arg_lua})
@ -98,7 +99,7 @@ lua> ("
($actions all compile to $body) compiles to: ($actions all compile to $body) compiles to:
lua> (" lua> ("
if \$actions.type ~= "List" then if \$actions.type ~= "List" then
compile_error(\$actions, "This should be a list of actions.") at_1_fail(\$actions, "Compile error: This should be a list of actions.")
end end
local lua = \(\($actions.1 compiles to $body) as lua) local lua = \(\($actions.1 compiles to $body) as lua)
local \$args = List{"\(nomsu environment)", unpack(\$actions[1]:get_args())} local \$args = List{"\(nomsu environment)", unpack(\$actions[1]:get_args())}
@ -151,7 +152,7 @@ test:
lua:add(\$action:get_stub():as_lua_id()) lua:add(\$action:get_stub():as_lua_id())
lua:add_free_vars({\$action:get_stub():as_lua_id()}) lua:add_free_vars({\$action:get_stub():as_lua_id()})
else else
compile_error_at(\$action, "Expected an action or method call here") at_1_fail(\$action, "Compile error: Expected an action or method call here")
end end
lua:add(" = ", \(\($action -> $body) as lua), ";") lua:add(" = ", \(\($action -> $body) as lua), ";")
return lua return lua
@ -241,7 +242,7 @@ test:
lua> (" lua> ("
local replacements = {} local replacements = {}
if \$actions.type ~= "List" then if \$actions.type ~= "List" then
compile_error(\$actions, "This should be a list.") at_1_fail(\$actions, "Compile error: This should be a list.")
end end
for i,arg in ipairs(\$actions[1]:get_args()) do for i,arg in ipairs(\$actions[1]:get_args()) do
replacements[arg[1]] = \(nomsu environment):compile(arg):text() replacements[arg[1]] = \(nomsu environment):compile(arg):text()
@ -293,9 +294,8 @@ external:
if \$tree.type == 'Block' then if \$tree.type == 'Block' then
tree_lua = LuaCode:from(\$tree.source, '(function()\\n ', tree_lua, '\\nend)()') tree_lua = LuaCode:from(\$tree.source, '(function()\\n ', tree_lua, '\\nend)()')
elseif \$tree.type == 'MethodCall' and #\$tree > 2 then elseif \$tree.type == 'MethodCall' and #\$tree > 2 then
compile_error_at(\$tree, "This must be a single value instead of "..(#\$tree - 1).."\ at_1_fail(\$tree, "Compile error: This must be a single value instead of "..
.. method calls.", (#\$tree - 1).." method calls. Hint: Replace this with a single method call.")
"Replace this with a single method call.")
end end
return tree_lua return tree_lua
") ")
@ -311,9 +311,9 @@ external:
lua> (" lua> ("
local lua = \($var as lua) local lua = \($var as lua)
if not lua:text():is_a_lua_id() then if not lua:text():is_a_lua_id() then
compile_error(\$var, at_1_fail(\$var, "Compile error: "..
"This is supposed to be something that compiles to a valid Lua identifier.", "This is supposed to be something that compiles to a valid Lua identifier. "..
"This should probably be a variable.") "Hint: This should probably be a variable.")
end end
return lua return lua
") ")

125
lib/object.nom
View File

@ -1,125 +0,0 @@
#!/usr/bin/env nomsu -V6.15.13.8
#
This file contains the implementation of an Object-Oriented programming system.
$globals.METAMETHOD_MAP = {
."as text" = "__tostring", ."clean up" = "__gc", ."+ 1" = "__add"
."- 1" = "__sub", ."* 1" = "__mul", ."/ 1" = "__div", ."-" = "__unm"
."// 1" = "__idiv", ."mod 1" = "__mod", ."^ 1" = "__pow", ."& 1" = "__band"
."| 1" = "__bor", ."~ 1" = "__bxor", ."~" = "__bnot", ."<< 1" = "__bshl"
.">> 1" = "__bshr", ."== 1" = "__eq", ."< 1" = "__lt", ."<= 1" = "__le"
."set 1 = 2" = "__newindex", .size = "__len", .iterate = "__ipairs"
."iterate all" = "__pairs"
}
test:
object (Dog):
(Dog).genus = "Canus"
my action [set up]:
$me.barks or= 0
my action [bark, woof]:
$barks = [: for $ in 1 to $me.barks: add "Bark!"]
return ($barks, joined with " ")
my action [get pissed off]: $me.barks += 1
$d = (Dog {.barks = 2})
assume (type of $d) == "Dog"
assume ($d is a "Dog")
assume $d.barks == 2
assume (($d, bark) == "Bark! Bark!")
assume (($d, woof) == "Bark! Bark!")
$d, get pissed off
assume ($d.barks == 3)
assume (($d, bark) == "Bark! Bark! Bark!")
assume ($d.genus == "Canus")
assume ("\($d.class)" == "Dog")
assume ($d.genus == "Canus")
assume ($d.barks == 3)
$d2 = (Dog {})
unless ($d2.barks == 0):
fail "Default initializer failed"
with [$d = (Dog {.barks = 1})]:
assume (($d, bark) == "Bark!")
object (Corgi) extends (Dog):
my action [sploot] "splooted"
my action [bark, woof]:
$barks = [: for $ in 1 to $me.barks: add "Yip!"]
return ($barks, joined with " ")
$corg = (Corgi {})
assume ($corg.barks == 0)
with [$d = (Corgi {.barks = 1})]:
unless (($d, sploot) == "splooted"):
fail "subclass method failed"
unless (($d, bark) == "Yip!"):
fail "inheritance failed"
assume (($d, woof) == "Yip!")
with [$d = (Dog {.barks = 2})]:
assume (($d, bark) == "Bark! Bark!")
(my action $actions $body) compiles to:
lua> ("
local fn_name = \$actions[1].stub:as_lua_id()
local \$args = List(\$actions[1]:get_args())
table.insert(\$args, 1, \(\$me))
local lua = LuaCode("class.", fn_name, " = ", \(\($args -> $body) as lua))
for i=2,#\$actions do
local alias = \$actions[i]
local alias_name = alias.stub:as_lua_id()
local \$alias_args = List(alias:get_args())
table.insert(\$alias_args, 1, \(\$me))
lua:add("\\nclass.", alias_name, " = ")
if \$args == \$alias_args then
lua:add("class.", fn_name)
else
lua:add(\(\($alias_args -> $actions.1) as lua))
end
end
return lua
")
(object $classname extends $parent $class_body) compiles to:
unless ($classname.type == "Action"):
compile error at $classname
"Expected this to be an action, not a \$classname.type"
for $ in $classname:
unless ($ is text):
compile error at $ "Class names should not have arguments."
return
Lua ("
do
local class = {name=\(quote $classname.stub)}
class.__type = class.name
setmetatable(class, {
__index=\($parent as lua expr),
__tostring=function(cls) return cls.name end,
__call=function(cls, inst)
if inst == nil then return cls end
inst = setmetatable(inst, cls)
if inst.set_up then inst:set_up() end
return inst
end,
})
\(nomsu environment name)[class.name:as_lua_id()] = class
class.__index = class
class.class = class
class.__tostring = function(inst)
return inst.name..getmetatable(Dict{}).__tostring(inst)
end
\($class_body as lua)
for stub,metamethod in pairs(globals.METAMETHOD_MAP) do
class[metamethod] = class[stub:as_lua_id()]
end
end
")
(object $classname $class_body) parses as
object $classname extends (nil) $class_body

25
nomsu_compiler.lua
View File

@ -17,11 +17,8 @@ end
local SyntaxTree = require("syntax_tree") local SyntaxTree = require("syntax_tree")
local Files = require("files") local Files = require("files")
local pretty_error = require("pretty_errors") local pretty_error = require("pretty_errors")
local compile_error local fail_at
compile_error = function(source, err_msg, hint) fail_at = function(source, msg)
if hint == nil then
hint = nil
end
local file local file
if SyntaxTree:is_instance(source) then if SyntaxTree:is_instance(source) then
file = source:get_source_file() file = source:get_source_file()
@ -32,8 +29,20 @@ compile_error = function(source, err_msg, hint)
if source and not file then if source and not file then
file = Files.read(source.filename) file = Files.read(source.filename)
end end
local title, err_msg, hint = msg:match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)")
if not err_msg then
err_msg, hint = msg:match("*(.*)[ \n]+Hint:[ \n]+(.*)")
title = "Error"
end
if not err_msg then
title, err_msg = msg:match("([^:]*):[ \n]+(.*)")
end
if not err_msg then
err_msg = msg
title = "Error"
end
local err_str = pretty_error({ local err_str = pretty_error({
title = "Compile error", title = title,
error = err_msg, error = err_msg,
hint = hint, hint = hint,
source = file, source = file,
@ -88,7 +97,7 @@ compile = function(self, tree)
if ret == nil then if ret == nil then
local info = debug.getinfo(compile_action, "S") local info = debug.getinfo(compile_action, "S")
local filename = Source:from_string(info.source).filename local filename = Source:from_string(info.source).filename
compile_error(tree, "The compile-time action here (" .. tostring(stub) .. ") failed to return any value.", "Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(filename) .. ":" .. tostring(info.linedefined) .. " and make sure it's returning something.") fail_at(tree, ("Compile error: The compile-time action here (" .. tostring(stub) .. ") failed to return any value. " .. "Hint: Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(filename) .. ":" .. tostring(info.linedefined) .. " and make sure it's returning something."))
end end
if not (SyntaxTree:is_instance(ret)) then if not (SyntaxTree:is_instance(ret)) then
ret.source = ret.source or tree.source ret.source = ret.source or tree.source
@ -353,5 +362,5 @@ compile = function(self, tree)
end end
return { return {
compile = compile, compile = compile,
compile_error = compile_error fail_at = fail_at
} }

27
nomsu_compiler.moon
View File

@ -8,9 +8,8 @@ unpack or= table.unpack
SyntaxTree = require "syntax_tree" SyntaxTree = require "syntax_tree"
Files = require "files" Files = require "files"
-- TODO: de-duplicate this
pretty_error = require("pretty_errors") pretty_error = require("pretty_errors")
compile_error = (source, err_msg, hint=nil)-> fail_at = (source, msg)->
local file local file
if SyntaxTree\is_instance(source) if SyntaxTree\is_instance(source)
file = source\get_source_file! file = source\get_source_file!
@ -20,10 +19,20 @@ compile_error = (source, err_msg, hint=nil)->
if source and not file if source and not file
file = Files.read(source.filename) file = Files.read(source.filename)
title, err_msg, hint = msg\match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)")
if not err_msg
err_msg, hint = msg\match("*(.*)[ \n]+Hint:[ \n]+(.*)")
title = "Error"
if not err_msg
title, err_msg = msg\match("([^:]*):[ \n]+(.*)")
if not err_msg
err_msg = msg
title = "Error"
err_str = pretty_error{ err_str = pretty_error{
title: "Compile error" title: title,
error:err_msg, hint:hint, source:file error: err_msg, hint: hint, source: file,
start:source.start, stop:source.stop, filename:source.filename start:source.start, stop:source.stop, filename:source.filename,
} }
error(err_str, 0) error(err_str, 0)
@ -60,9 +69,9 @@ compile = (tree)=>
if ret == nil if ret == nil
info = debug.getinfo(compile_action, "S") info = debug.getinfo(compile_action, "S")
filename = Source\from_string(info.source).filename filename = Source\from_string(info.source).filename
compile_error tree, fail_at tree,
"The compile-time action here (#{stub}) failed to return any value.", ("Compile error: The compile-time action here (#{stub}) failed to return any value. "..
"Look at the implementation of (#{stub}) in #{filename}:#{info.linedefined} and make sure it's returning something." "Hint: Look at the implementation of (#{stub}) in #{filename}:#{info.linedefined} and make sure it's returning something.")
unless SyntaxTree\is_instance(ret) unless SyntaxTree\is_instance(ret)
ret.source or= tree.source ret.source or= tree.source
return ret return ret
@ -282,4 +291,4 @@ compile = (tree)=>
else else
error("Unknown type: #{tree.type}") error("Unknown type: #{tree.type}")
return {:compile, :compile_error} return {:compile, :fail_at}

6
nomsu_environment.lua
View File

@ -58,10 +58,10 @@ do
local _obj_0 = require("nomsu_decompiler") local _obj_0 = require("nomsu_decompiler")
tree_to_nomsu, tree_to_inline_nomsu = _obj_0.tree_to_nomsu, _obj_0.tree_to_inline_nomsu tree_to_nomsu, tree_to_inline_nomsu = _obj_0.tree_to_nomsu, _obj_0.tree_to_inline_nomsu
end end
local compile, compile_error local compile, fail_at
do do
local _obj_0 = require('nomsu_compiler') local _obj_0 = require('nomsu_compiler')
compile, compile_error = _obj_0.compile, _obj_0.compile_error compile, fail_at = _obj_0.compile, _obj_0.fail_at
end end
local _currently_running_files = List({ }) local _currently_running_files = List({ })
local _module_imports = { } local _module_imports = { }
@ -142,7 +142,7 @@ nomsu_environment = Importer({
_1_as_nomsu = tree_to_nomsu, _1_as_nomsu = tree_to_nomsu,
_1_as_inline_nomsu = tree_to_inline_nomsu, _1_as_inline_nomsu = tree_to_inline_nomsu,
compile = compile, compile = compile,
compile_error_at = compile_error, at_1_fail = fail_at,
exit = os.exit, exit = os.exit,
quit = os.exit, quit = os.exit,
_1_parsed = function(nomsu_code, syntax_version) _1_parsed = function(nomsu_code, syntax_version)

4
nomsu_environment.moon
View File

@ -32,7 +32,7 @@ for version=1,999
Parsers[version] = make_parser(peg_contents, make_tree) Parsers[version] = make_parser(peg_contents, make_tree)
{:tree_to_nomsu, :tree_to_inline_nomsu} = require "nomsu_decompiler" {:tree_to_nomsu, :tree_to_inline_nomsu} = require "nomsu_decompiler"
{:compile, :compile_error} = require('nomsu_compiler') {:compile, :fail_at} = require('nomsu_compiler')
_currently_running_files = List{} -- Used to check for circular imports in run_file_1_in _currently_running_files = List{} -- Used to check for circular imports in run_file_1_in
_module_imports = {} _module_imports = {}
_importer_mt = {__index: (k)=> _module_imports[@][k]} _importer_mt = {__index: (k)=> _module_imports[@][k]}
@ -66,7 +66,7 @@ nomsu_environment = Importer{
-- Nomsu functions: -- Nomsu functions:
_1_as_nomsu:tree_to_nomsu, _1_as_inline_nomsu:tree_to_inline_nomsu, _1_as_nomsu:tree_to_nomsu, _1_as_inline_nomsu:tree_to_inline_nomsu,
compile: compile, compile_error_at:compile_error, compile: compile, at_1_fail:fail_at,
exit:os.exit, quit:os.exit, exit:os.exit, quit:os.exit,
_1_parsed: (nomsu_code, syntax_version)-> _1_parsed: (nomsu_code, syntax_version)->

2
syntax_tree.lua
View File

@ -85,7 +85,7 @@ do
return self.__class.source_code_for_tree[self] return self.__class.source_code_for_tree[self]
end, end,
get_source_code = function(self) get_source_code = function(self)
return self.__class.source_code_for_tree[self]:sub(self.source.start, self.source.stop) return self.__class.source_code_for_tree[self]:sub(self.source.start, self.source.stop - 1)
end, end,
map = function(self, fn) map = function(self, fn)
local replacement = fn(self) local replacement = fn(self)

4
syntax_tree.moon
View File

@ -14,8 +14,6 @@ as_lua = =>
return @as_lua! if @as_lua return @as_lua! if @as_lua
error("Not supported: #{@}") error("Not supported: #{@}")
--types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry",
-- "IndexChain", "Action", "FileChunks", "Error", "Comment"}
class SyntaxTree class SyntaxTree
__tostring: => __tostring: =>
bits = [type(b) == 'string' and b\as_lua! or tostring(b) for b in *@] bits = [type(b) == 'string' and b\as_lua! or tostring(b) for b in *@]
@ -45,7 +43,7 @@ class SyntaxTree
__mode: "k" __mode: "k"
}) })
get_source_file: => @@source_code_for_tree[@] get_source_file: => @@source_code_for_tree[@]
get_source_code: => @@source_code_for_tree[@]\sub(@source.start, @source.stop) get_source_code: => @@source_code_for_tree[@]\sub(@source.start, @source.stop-1)
map: (fn)=> map: (fn)=>
replacement = fn(@) replacement = fn(@)
if replacement == false then return nil if replacement == false then return nil