From 8ca7749b5509a40256195563fa52d3ede4bd1a34 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 16 Jan 2019 16:31:49 -0800 Subject: [PATCH] Better error messaging (using pretty_error in more places) --- bootstrap.lua | 31 +-------- bootstrap.moon | 21 +----- lib/compatibility/3.5.5.6.nom | 2 +- lib/compatibility/3.nom | 6 +- lib/compatibility/4.11.nom | 6 +- lib/compatibility/4.12.nom | 12 ++-- lib/core/control_flow.nom | 64 ++++++++++------- lib/core/errors.nom | 56 ++++++++------- lib/core/metaprogramming.nom | 30 ++++---- lib/object.nom | 125 ---------------------------------- nomsu_compiler.lua | 25 ++++--- nomsu_compiler.moon | 27 +++++--- nomsu_environment.lua | 6 +- nomsu_environment.moon | 4 +- syntax_tree.lua | 2 +- syntax_tree.moon | 4 +- 16 files changed, 148 insertions(+), 273 deletions(-) delete mode 100644 lib/object.nom diff --git a/bootstrap.lua b/bootstrap.lua index c257965..27a1953 100644 --- a/bootstrap.lua +++ b/bootstrap.lua @@ -10,33 +10,8 @@ do end local SyntaxTree = require("syntax_tree") local Files = require("files") -local pretty_error = require("pretty_errors") -local compile_error -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 fail_at +fail_at = require('nomsu_compiler').fail_at local MAX_LINE = 80 local compile_actions = { [""] = function(self, fn, ...) @@ -130,7 +105,7 @@ local compile_actions = { end, ["test"] = function(self, body) 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 local test_nomsu = body:get_source_code():match(":[ ]*(.*)") do diff --git a/bootstrap.moon b/bootstrap.moon index 05bd2a6..aca2dd7 100644 --- a/bootstrap.moon +++ b/bootstrap.moon @@ -4,24 +4,7 @@ SyntaxTree = require "syntax_tree" Files = require "files" --- TODO: de-duplicate this -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) +{:fail_at} = require('nomsu_compiler') MAX_LINE = 80 -- For beautification purposes, try not to make lines much longer than this value compile_actions = { @@ -107,7 +90,7 @@ compile_actions = { ["test"]: (body)=> 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(":[ ]*(.*)") if indent = test_nomsu\match("\n([ ]*)") test_nomsu = test_nomsu\gsub("\n"..indent, "\n") diff --git a/lib/compatibility/3.5.5.6.nom b/lib/compatibility/3.5.5.6.nom index d9bba4f..9887498 100644 --- a/lib/compatibility/3.5.5.6.nom +++ b/lib/compatibility/3.5.5.6.nom @@ -8,4 +8,4 @@ use "compatibility/compatibility" upgrade action "traceback" to "3.5.5.6" via for $tree: - compile error at $tree "'traceback' has been deprecated." + at $tree fail "Upgrade error: 'traceback' has been deprecated." diff --git a/lib/compatibility/3.nom b/lib/compatibility/3.nom index 966dbf9..6ce3fdc 100644 --- a/lib/compatibility/3.nom +++ b/lib/compatibility/3.nom @@ -11,5 +11,7 @@ upgrade action (me) to "3" as $me upgrade action (@) to "3" as $me upgrade action "as" to "3" via for $tree: - compile error at $tree "Object API has changed and 'as' is no longer supported." - "Use ($obj, action ...) instead of (as $obj: action ...)" + at $tree fail (" + Upgrade error: Object API has changed and 'as' is no longer supported. + Hint: Use ($obj, action ...) instead of (as $obj: action ...) + ") diff --git a/lib/compatibility/4.11.nom b/lib/compatibility/4.11.nom index 88ea7b3..053e1c8 100644 --- a/lib/compatibility/4.11.nom +++ b/lib/compatibility/4.11.nom @@ -29,8 +29,10 @@ upgrade action "set" to "4.11" via upgrade action "1 with 2 ~>" to "4.11" via for $tree: - compile error at $tree "This method has been deprecated." - "Perhaps this could be use ($tree, map ...) instead." + at $tree fail (" + Upgrade error: This method has been deprecated. + Hint: Perhaps this could be use ($tree, map ...) instead. + ") # Changing filesystem API: upgrade action (for file $f in $path $body) to "4.11" as diff --git a/lib/compatibility/4.12.nom b/lib/compatibility/4.12.nom index bb1af0b..033f6ed 100644 --- a/lib/compatibility/4.12.nom +++ b/lib/compatibility/4.12.nom @@ -9,10 +9,14 @@ use "compatibility/compatibility" upgrade action "do next repeat" to "4.12" via for $tree: - compile error at $tree "This method has been deprecated." - "Use either (do next) or (go to (label)) instead." + at $tree fail (" + 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 for $tree: - compile error at $tree "This method has been deprecated." - "Use either (stop) or (go to (label)) instead." + at $tree fail (" + Upgrade error: This method has been deprecated. + Hint: Use either (stop) or (go to (label)) instead. + ") diff --git a/lib/core/control_flow.nom b/lib/core/control_flow.nom index 715630b..c4c1770 100644 --- a/lib/core/control_flow.nom +++ b/lib/core/control_flow.nom @@ -328,29 +328,34 @@ test: $clause = "if" $else_allowed = (yes) unless ($body.type is "Block"): - compile error at $body "'if' expected a Block, but got a \($body.type)." - "Perhaps you forgot to put a ':' after 'if'?" + at $body fail (" + Compile error: '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 "Invalid line for the body of an 'if' block." (" - Each line should contain one or more conditional expressions followed by a block, or "else"\ - .. followed by a block. + at $line fail (" + Compile error: 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 "You can't have two 'else' blocks." - "Merge all of the 'else' blocks together." + at $line fail (" + Compile error: You can't have two 'else' blocks. + Hint: Merge all of the 'else' blocks together. + ") unless ((size of "\$code") > 0): - compile error at $line - .."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 \ - ..around it. Otherwise, make sure the 'else' block comes last. + at $line fail (" + Compile error: You can't have an 'else' block without a preceding 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, add "\nelse\n " ($action as lua) @@ -365,8 +370,10 @@ test: $clause = "\nelseif" if ((size of "\$code") == 0): - compile error at $body "'if' block has an empty body." - "This means nothing would happen, so the 'if' block should be deleted." + at $body fail (" + 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" return $code @@ -392,28 +399,33 @@ test: $else_allowed = (yes) define mangler unless ($body.type is "Block"): - compile error at $body "'if' expected a Block, but got a \($body.type)" - "Perhaps you forgot to put a ':' after the 'is'?" + at $body fail (" + 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: unless (($line.type is "Action") and ((size of $line) >= 2)) and $line.(size of $line) is "Block" syntax tree ..: - compile error at $line "Invalid line for 'if' block." (" - Each line should contain expressions followed by a block, or "else" followed by a block + at $line fail (" + 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) if (($line.1 is "else") and ((size of $line) == 2)): unless $else_allowed: - compile error at $line "You can't have two 'else' blocks." - "Merge all of the 'else' blocks together." + at $line fail (" + Compile error: You can't have two 'else' blocks. + Hint: Merge all of the 'else' blocks together. + ") unless ((size of "\$code") > 0): - compile error at $line - .."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 \ - ..around it. Otherwise, make sure the 'else' block comes last. + at $line fail (" + Compile error: You can't have an 'else' block without a preceding 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, add "\nelse\n " ($action as lua) @@ -428,8 +440,10 @@ test: $clause = "\nelseif" if ((size of "\$code") == 0): - compile error at $body "'if' block has an empty body." - "This means nothing would happen, so the 'if' block should be deleted." + at $body fail (" + 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" return diff --git a/lib/core/errors.nom b/lib/core/errors.nom index 9a2cc9b..0b67400 100644 --- a/lib/core/errors.nom +++ b/lib/core/errors.nom @@ -8,32 +8,36 @@ use "core/control_flow" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -(fail $msg) compiles to "error(\(($msg as lua expr) if $msg else "nil"), 0);" -(assume $condition) compiles to: - lua> (" - local \$assumption = 'Assumption failed: '..tostring((\$condition):get_source_code()) - ") - - return - Lua (" - if not \($condition as lua expr) then - error(\(quote "\$assumption"), 0) - end - ") +(fail $msg) compiles to + LuaCode + "at_1_fail(\(quote $msg.source), 'Failure: '..\($msg as lua expr))" + ..if $msg else "error('Failure', 0)" -(assume $a == $b) compiles to: - lua> "local \$assumption = 'Assumption failed: '..tostring(\(\($a == $b) as nomsu))" - define mangler - return - Lua (" - do - local \(mangle "a"), \(mangle "b") = \($a as lua expr), \($b as lua expr) - if \(mangle "a") ~= \(mangle "b") then - error(\(quote "\$assumption").."\\n"..tostring(\(mangle "a")).." != "..tostring(\ - ..\(mangle "b")), 0) - end - end - ") +(assume $condition) compiles to (" + if not \($condition as lua expr) then + at_1_fail(\(quote "\($condition.source)"), "Assumption failed: This is not true.") + 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 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 +") test: try: fail @@ -44,7 +48,7 @@ test: $worked = (yes) ..if it succeeds: fail "'try' incorrectly ran success case." - assume $failure == "xx" + assume ($failure, matches "xx") unless $worked: fail "'try' failed to recover from failure" diff --git a/lib/core/metaprogramming.nom b/lib/core/metaprogramming.nom index 9b3d5c4..a17a33c 100644 --- a/lib/core/metaprogramming.nom +++ b/lib/core/metaprogramming.nom @@ -34,14 +34,15 @@ lua> (" local arg_lua = SyntaxTree:is_instance(arg) and \(nomsu environment):compile(arg):text() or arg if arg_lua == "..." then if i < #\$args then - compile_error_at(SyntaxTree:is_instance(arg) and arg or nil, - "Extra arguments must come last.", "Try removing any arguments after \ - ..(*extra arguments*)") + at_1_fail(SyntaxTree:is_instance(arg) and arg or nil, + "Compile error: Extra arguments must come last. ".. + "Hint: Try removing any arguments after (*extra arguments*)") end elseif not arg_lua:is_lua_id() then - compile_error_at(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.", - "This should probably be a Nomsu variable instead (like $x).") + at_1_fail(SyntaxTree:is_instance(arg) and arg or nil, + "Compile error: This does not compile to a Lua identifier, so it ".. + "can't be used as a function argument.".. + "Hint: This should probably be a Nomsu variable instead (like $x).") end lua:add(i > 1 and ", " or "", arg_lua) body_lua:remove_free_vars({arg_lua}) @@ -98,7 +99,7 @@ lua> (" ($actions all compile to $body) compiles to: lua> (" 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 local lua = \(\($actions.1 compiles to $body) as lua) 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_free_vars({\$action:get_stub():as_lua_id()}) 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 lua:add(" = ", \(\($action -> $body) as lua), ";") return lua @@ -241,7 +242,7 @@ test: lua> (" local replacements = {} 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 for i,arg in ipairs(\$actions[1]:get_args()) do replacements[arg[1]] = \(nomsu environment):compile(arg):text() @@ -293,9 +294,8 @@ external: if \$tree.type == 'Block' then tree_lua = LuaCode:from(\$tree.source, '(function()\\n ', tree_lua, '\\nend)()') elseif \$tree.type == 'MethodCall' and #\$tree > 2 then - compile_error_at(\$tree, "This must be a single value instead of "..(#\$tree - 1).."\ - .. method calls.", - "Replace this with a single method call.") + at_1_fail(\$tree, "Compile error: This must be a single value instead of ".. + (#\$tree - 1).." method calls. Hint: Replace this with a single method call.") end return tree_lua ") @@ -311,9 +311,9 @@ external: lua> (" local lua = \($var as lua) if not lua:text():is_a_lua_id() then - compile_error(\$var, - "This is supposed to be something that compiles to a valid Lua identifier.", - "This should probably be a variable.") + at_1_fail(\$var, "Compile error: ".. + "This is supposed to be something that compiles to a valid Lua identifier. ".. + "Hint: This should probably be a variable.") end return lua ") diff --git a/lib/object.nom b/lib/object.nom deleted file mode 100644 index 99981a0..0000000 --- a/lib/object.nom +++ /dev/null @@ -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 diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua index 9c8c9ac..c2502d8 100644 --- a/nomsu_compiler.lua +++ b/nomsu_compiler.lua @@ -17,11 +17,8 @@ end local SyntaxTree = require("syntax_tree") local Files = require("files") local pretty_error = require("pretty_errors") -local compile_error -compile_error = function(source, err_msg, hint) - if hint == nil then - hint = nil - end +local fail_at +fail_at = function(source, msg) local file if SyntaxTree:is_instance(source) then file = source:get_source_file() @@ -32,8 +29,20 @@ compile_error = function(source, err_msg, hint) if source and not file then file = Files.read(source.filename) 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({ - title = "Compile error", + title = title, error = err_msg, hint = hint, source = file, @@ -88,7 +97,7 @@ compile = function(self, tree) if ret == nil then local info = debug.getinfo(compile_action, "S") 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 if not (SyntaxTree:is_instance(ret)) then ret.source = ret.source or tree.source @@ -353,5 +362,5 @@ compile = function(self, tree) end return { compile = compile, - compile_error = compile_error + fail_at = fail_at } diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon index f3530e9..0bb020c 100644 --- a/nomsu_compiler.moon +++ b/nomsu_compiler.moon @@ -8,9 +8,8 @@ unpack or= table.unpack SyntaxTree = require "syntax_tree" Files = require "files" --- TODO: de-duplicate this pretty_error = require("pretty_errors") -compile_error = (source, err_msg, hint=nil)-> +fail_at = (source, msg)-> local file if SyntaxTree\is_instance(source) file = source\get_source_file! @@ -20,10 +19,20 @@ compile_error = (source, err_msg, hint=nil)-> if source and not file 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{ - title: "Compile error" - error:err_msg, hint:hint, source:file - start:source.start, stop:source.stop, filename:source.filename + title: title, + error: err_msg, hint: hint, source: file, + start:source.start, stop:source.stop, filename:source.filename, } error(err_str, 0) @@ -60,9 +69,9 @@ compile = (tree)=> if ret == nil info = debug.getinfo(compile_action, "S") filename = Source\from_string(info.source).filename - compile_error tree, - "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." + fail_at tree, + ("Compile error: The compile-time action here (#{stub}) failed to return any value. ".. + "Hint: Look at the implementation of (#{stub}) in #{filename}:#{info.linedefined} and make sure it's returning something.") unless SyntaxTree\is_instance(ret) ret.source or= tree.source return ret @@ -282,4 +291,4 @@ compile = (tree)=> else error("Unknown type: #{tree.type}") -return {:compile, :compile_error} +return {:compile, :fail_at} diff --git a/nomsu_environment.lua b/nomsu_environment.lua index 5a055c3..204b151 100644 --- a/nomsu_environment.lua +++ b/nomsu_environment.lua @@ -58,10 +58,10 @@ do local _obj_0 = require("nomsu_decompiler") tree_to_nomsu, tree_to_inline_nomsu = _obj_0.tree_to_nomsu, _obj_0.tree_to_inline_nomsu end -local compile, compile_error +local compile, fail_at do 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 local _currently_running_files = List({ }) local _module_imports = { } @@ -142,7 +142,7 @@ nomsu_environment = Importer({ _1_as_nomsu = tree_to_nomsu, _1_as_inline_nomsu = tree_to_inline_nomsu, compile = compile, - compile_error_at = compile_error, + at_1_fail = fail_at, exit = os.exit, quit = os.exit, _1_parsed = function(nomsu_code, syntax_version) diff --git a/nomsu_environment.moon b/nomsu_environment.moon index 2719252..522b4c9 100644 --- a/nomsu_environment.moon +++ b/nomsu_environment.moon @@ -32,7 +32,7 @@ for version=1,999 Parsers[version] = make_parser(peg_contents, make_tree) {: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 _module_imports = {} _importer_mt = {__index: (k)=> _module_imports[@][k]} @@ -66,7 +66,7 @@ nomsu_environment = Importer{ -- Nomsu functions: _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, _1_parsed: (nomsu_code, syntax_version)-> diff --git a/syntax_tree.lua b/syntax_tree.lua index 017b44a..186b40d 100644 --- a/syntax_tree.lua +++ b/syntax_tree.lua @@ -85,7 +85,7 @@ do return self.__class.source_code_for_tree[self] end, 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, map = function(self, fn) local replacement = fn(self) diff --git a/syntax_tree.moon b/syntax_tree.moon index 6347be8..b8c0b9d 100644 --- a/syntax_tree.moon +++ b/syntax_tree.moon @@ -14,8 +14,6 @@ as_lua = => return @as_lua! if @as_lua error("Not supported: #{@}") ---types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry", --- "IndexChain", "Action", "FileChunks", "Error", "Comment"} class SyntaxTree __tostring: => bits = [type(b) == 'string' and b\as_lua! or tostring(b) for b in *@] @@ -45,7 +43,7 @@ class SyntaxTree __mode: "k" }) 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)=> replacement = fn(@) if replacement == false then return nil