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

Tidying up exceptions and error reporting. Also simplified the grammar a

Browse Source 
tiny bit.
This commit is contained in:
Bruce Hill 2018-06-12 13:56:15 -07:00
parent 7cd512d15e
commit 0c9973ff03
8 changed files with 150 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/control_flow.nom
View File

@ -49,13 +49,13 @@ immediately
To see why this is necessary consider: (random()<.5 and false or 99) To see why this is necessary consider: (random()<.5 and false or 99)
return return
Lua value ".." Lua value ".."
(function() ((function()
if \(%condition as lua expr) then if \(%condition as lua expr) then
return \(%when_true_expr as lua expr) return \(%when_true_expr as lua expr)
else else
return \(%when_false_expr as lua expr) return \(%when_false_expr as lua expr)
end end
end)() end)())
# GOTOs # GOTOs
immediately immediately
@ -361,31 +361,46 @@ immediately
# Try/except # Try/except
immediately immediately
compile [..] compile [..]
try %action and if it succeeds %success or if it barfs %fallback try %action and if it succeeds %success or if it barfs %msg %fallback
try %action and if it barfs %fallback or if it succeeds %success try %action and if it barfs %msg %fallback or if it succeeds %success
..to ..to
Lua ".." Lua ".."
do do
local fell_through = false local fell_through = false
local ok, ret = pcall(function() local err, erred = nil, false
local ok, ret = xpcall(function()
\(%action as lua statements) \(%action as lua statements)
fell_through = true fell_through = true
end, function(\(%msg as lua expr))
local ok, ret = pcall(function()
\(%fallback as lua statements)
end)
if not ok then err, erred = ret, true end
end) end)
if ok then if ok then
\(%success as lua statements) \(%success as lua statements)
if not fell_through then if not fell_through then
return ret return ret
end end
else elseif erred then
\(%fallback as lua statements) error(err, 0)
end end
end end
immediately
parse [..]
try %action and if it succeeds %success or if it barfs %fallback
try %action and if it barfs %fallback or if it succeeds %success
..as: try %action and if it succeeds %success or if it barfs (=lua "") %fallback
immediately
parse [try %action] as parse [try %action] as
try %action and if it succeeds: do nothing try %action and if it succeeds: do nothing
..or if it barfs: do nothing ..or if it barfs: do nothing
parse [try %action and if it barfs %fallback] as parse [try %action and if it barfs %fallback] as
try %action and if it succeeds: do nothing try %action and if it succeeds: do nothing
..or if it barfs %fallback ..or if it barfs %fallback
parse [try %action and if it barfs %msg %fallback] as
try %action and if it succeeds: do nothing
..or if it barfs %msg %fallback
parse [try %action and if it succeeds %success] as parse [try %action and if it succeeds %success] as
try %action and if it succeeds %success or if it barfs: do nothing try %action and if it succeeds %success or if it barfs: do nothing
@ -406,17 +421,20 @@ immediately
fell_through = true fell_through = true
end) end)
\(%final_action as lua statements) \(%final_action as lua statements)
if not ok then error(ret) end if not ok then error(ret, 0) end
if not fell_through then return ret end if not fell_through then return ret end
end end
# Inline thunk: # Inline thunk:
immediately immediately
compile [result of %body] to compile [result of %body] to
%body <- (%body as lua statements)
declare locals in %body
return
Lua value ".." Lua value ".."
(function() ((function()
\(%body as lua statements) \%body
end)() end)())
# Coroutines: # Coroutines:
immediately immediately

18
core/metaprogramming.nom
View File

@ -132,15 +132,25 @@ immediately
lua> ".." lua> ".."
local lua = nomsu:tree_to_lua(\%tree) local lua = nomsu:tree_to_lua(\%tree)
if not lua.is_value then if not lua.is_value then
error("Invalid thing to convert to lua expr: "..tostring(\%tree)) compile_error(\%tree, "Invalid thing to convert to lua expr:\n%s")
end end
return lua return lua
action [%tree as lua statements] action [%tree as lua statements]
=lua "nomsu:tree_to_lua(\%tree):as_statements()" =lua "nomsu:tree_to_lua(\%tree):as_statements()"
action [%tree with vars %vars] action [%tree as lua return]
=lua "\%tree:map(\%vars)" =lua "nomsu:tree_to_lua(\%tree):as_statements('return ')"
immediately
compile [%tree with vars %vars] to
barf "Deprecated"
compile [%tree with %t -> %replacement] to
Lua value ".."
\(%tree as lua expr):map(function(\(%t as lua expr))
\(%replacement as lua return)
end)
compile [declare locals in %code] to compile [declare locals in %code] to
Lua value "\(%code as lua expr):declare_locals()" Lua value "\(%code as lua expr):declare_locals()"
@ -202,6 +212,8 @@ immediately
# Error functions # Error functions
immediately immediately
compile [traceback] to: Lua value "debug.traceback()"
compile [traceback %] to: Lua value "debug.traceback('', \(% as lua expr))"
compile [barf] to: Lua "error(nil, 0);" compile [barf] to: Lua "error(nil, 0);"
compile [barf %msg] to: Lua "error(\(%msg as lua expr), 0);" compile [barf %msg] to: Lua "error(\(%msg as lua expr), 0);"
compile [assume %condition] to compile [assume %condition] to

4
core/scopes.nom
View File

@ -30,7 +30,7 @@ compile [using %definitions %body, using %definitions do %body] to
\%setup_lua \%setup_lua
if not ok then if not ok then
ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders
error(ret) error(ret, 0)
end end
if not fell_through then if not fell_through then
ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders
@ -42,7 +42,7 @@ compile [using %definitions %body, using %definitions do %body] to
\%body_lua \%body_lua
ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders ACTIONS, COMPILE_ACTIONS, ARG_ORDERS = old_actions, old_compile_actions, old_arg_orders
if not ok then if not ok then
error(ret) error(ret, 0)
end end
if not fell_through then if not fell_through then
return ret return ret

87
nomsu.lua
View File

@ -278,7 +278,7 @@ end
local NomsuCompiler local NomsuCompiler
do do
local _class_0 local _class_0
local stub_pattern, var_pattern, _running_files, _report_error, MAX_LINE, math_expression local compile_error, stub_pattern, var_pattern, _running_files, MAX_LINE, math_expression
local _base_0 = { local _base_0 = {
define_action = function(self, signature, fn, is_compile_action) define_action = function(self, signature, fn, is_compile_action)
if is_compile_action == nil then if is_compile_action == nil then
@ -304,12 +304,13 @@ do
end end
fn_arg_positions = _tbl_0 fn_arg_positions = _tbl_0
end end
local actions = (is_compile_action and self.environment.COMPILE_ACTIONS or self.environment.ACTIONS)
local arg_orders = { } local arg_orders = { }
for _index_0 = 1, #signature do for _index_0 = 1, #signature do
local alias = signature[_index_0] local alias = signature[_index_0]
local stub = concat(assert(stub_pattern:match(alias)), ' ') local stub = concat(assert(stub_pattern:match(alias)), ' ')
local stub_args = assert(var_pattern:match(alias)); local stub_args = assert(var_pattern:match(alias))
(is_compile_action and self.environment.COMPILE_ACTIONS or self.environment.ACTIONS)[stub] = fn actions[stub] = fn
do do
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
@ -507,10 +508,11 @@ do
end end
args = _accum_0 args = _accum_0
end end
local arg_orders = self.environment.ARG_ORDERS[compile_action]
do do
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
local _list_0 = self.environment.ARG_ORDERS[compile_action][stub] local _list_0 = arg_orders[stub]
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local p = _list_0[_index_0] local p = _list_0[_index_0]
_accum_0[_len_0] = args[p - 1] _accum_0[_len_0] = args[p - 1]
@ -520,9 +522,7 @@ do
end end
local ret = compile_action(tree, unpack(args)) local ret = compile_action(tree, unpack(args))
if not ret then if not ret then
_report_error(tree, function(src) compile_error(tree, "Compile-time action:\n%s\nfailed to produce any Lua")
return "Compile-time action:\n" .. tostring(src) .. "\nfailed to produce any Lua"
end)
end end
return ret return ret
end end
@ -535,9 +535,7 @@ do
else else
local tok_lua = self:tree_to_lua(tok) local tok_lua = self:tree_to_lua(tok)
if not (tok_lua.is_value) then if not (tok_lua.is_value) then
_report_error(tok, function(src) compile_error(tok, "Non-expression value inside math expression:\n%s")
return "Non-expression value inside math expression:\n" .. tostring(src)
end)
end end
if tok.type == "Action" then if tok.type == "Action" then
tok_lua:parenthesize() tok_lua:parenthesize()
@ -560,9 +558,7 @@ do
end end
local arg_lua = self:tree_to_lua(tok) local arg_lua = self:tree_to_lua(tok)
if not (arg_lua.is_value) then if not (arg_lua.is_value) then
_report_error(tok, function(src) compile_error(tok, "Cannot use:\n%s\nas an argument to %s, since it's not an expression, it produces: %s", stub, repr(arg_lua))
return "Cannot use:\n" .. tostring(src) .. "\nas an argument to " .. tostring(stub) .. ", since it's not an expression, it produces: " .. tostring(repr(arg_lua)), 0
end)
end end
insert(args, arg_lua) insert(args, arg_lua)
_continue_0 = true _continue_0 = true
@ -649,9 +645,7 @@ do
if not (bit_lua.is_value) then if not (bit_lua.is_value) then
local src = ' ' .. tostring(self:tree_to_nomsu(bit)):gsub('\n', '\n ') local src = ' ' .. tostring(self:tree_to_nomsu(bit)):gsub('\n', '\n ')
local line = tostring(bit.source.filename) .. ":" .. tostring(pos_to_line(FILE_CACHE[bit.source.filename], bit.source.start)) local line = tostring(bit.source.filename) .. ":" .. tostring(pos_to_line(FILE_CACHE[bit.source.filename], bit.source.start))
_report_error(bit, function(src) compile_error(bit, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a string interpolation value, since it's not an expression."
end)
end end
if #lua.bits > 0 then if #lua.bits > 0 then
lua:append("..") lua:append("..")
@ -682,9 +676,7 @@ do
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local item_lua = self:tree_to_lua(item) local item_lua = self:tree_to_lua(item)
if not (item_lua.is_value) then if not (item_lua.is_value) then
_report_error(item, function(src) compile_error(item, "Cannot use:\n%s\nas a list item, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a list item, since it's not an expression."
end)
end end
lua:append(item_lua) lua:append(item_lua)
local item_string = tostring(item_lua) local item_string = tostring(item_lua)
@ -735,15 +727,11 @@ do
local key, value = tree[1], tree[2] local key, value = tree[1], tree[2]
local key_lua = self:tree_to_lua(key) local key_lua = self:tree_to_lua(key)
if not (key_lua.is_value) then if not (key_lua.is_value) then
_report_error(tree[1], function(src) compile_error(tree[1], "Cannot use:\n%s\nas a dict key, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a dict key, since it's not an expression."
end)
end end
local value_lua = value and self:tree_to_lua(value) or Lua.Value(key.source, "true") local value_lua = value and self:tree_to_lua(value) or Lua.Value(key.source, "true")
if not (value_lua.is_value) then if not (value_lua.is_value) then
_report_error(tree[2], function(src) compile_error(tree[2], "Cannot use:\n%s\nas a dict value, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a dict value, since it's not an expression."
end)
end end
local key_str = tostring(key_lua):match([=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=]) local key_str = tostring(key_lua):match([=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=])
if key_str then if key_str then
@ -756,9 +744,7 @@ do
elseif "IndexChain" == _exp_0 then elseif "IndexChain" == _exp_0 then
local lua = self:tree_to_lua(tree[1]) local lua = self:tree_to_lua(tree[1])
if not (lua.is_value) then if not (lua.is_value) then
_report_error(tree[1], function(src) compile_error(tree[1], "Cannot index:\n%s\nsince it's not an expression.")
return "Cannot index:\n" .. tostring(src) .. "\nsince it's not an expression."
end)
end end
local first_char = tostring(lua):sub(1, 1) local first_char = tostring(lua):sub(1, 1)
if first_char == "{" or first_char == '"' or first_char == "[" then if first_char == "{" or first_char == '"' or first_char == "[" then
@ -768,9 +754,7 @@ do
local key = tree[i] local key = tree[i]
local key_lua = self:tree_to_lua(key) local key_lua = self:tree_to_lua(key)
if not (key_lua.is_value) then if not (key_lua.is_value) then
_report_error(key, function(src) compile_error(key, "Cannot use:\n%s\nas an index, since it's not an expression.")
return "Cannot use:\n" .. tostring(key) .. "\nas an index, since it's not an expression."
end)
end end
local key_lua_str = tostring(key_lua) local key_lua_str = tostring(key_lua)
do do
@ -1135,9 +1119,7 @@ do
else else
local bit_lua = nomsu:tree_to_lua(bit) local bit_lua = nomsu:tree_to_lua(bit)
if not (bit_lua.is_value) then if not (bit_lua.is_value) then
_report_error(bit, function(src) compile_error(bit, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a string interpolation value, since it's not an expression."
end)
end end
lua:append(bit_lua) lua:append(bit_lua)
end end
@ -1164,9 +1146,7 @@ do
else else
local bit_lua = nomsu:tree_to_lua(bit) local bit_lua = nomsu:tree_to_lua(bit)
if not (bit_lua.is_value) then if not (bit_lua.is_value) then
_report_error(bit, function(src) compile_error(bit, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
return "Cannot use:\n" .. tostring(src) .. "\nas a string interpolation value, since it's not an expression."
end)
end end
lua:append(bit_lua) lua:append(bit_lua)
end end
@ -1186,12 +1166,10 @@ do
return add_lua_bits(Lua.Value(self.source), _code) return add_lua_bits(Lua.Value(self.source), _code)
end) end)
return self:define_compile_action("use %path", function(self, _path) return self:define_compile_action("use %path", function(self, _path)
local path if not (_path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string') then
if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string' then return Lua(_path.source, "nomsu:run_file(" .. tostring(nomsu:tree_to_lua(_path)) .. ");")
path = _path[1]
else
path = nomsu:run_lua(Lua(_path.source, "return ", nomsu:tree_to_lua(_path)))
end end
local path = _path[1]
nomsu:run_file(path) nomsu:run_file(path)
return Lua(_path.source, "nomsu:run_file(" .. tostring(repr(path)) .. ");") return Lua(_path.source, "nomsu:run_file(" .. tostring(repr(path)) .. ");")
end) end)
@ -1260,6 +1238,7 @@ do
utils = utils, utils = utils,
lpeg = lpeg, lpeg = lpeg,
re = re, re = re,
compile_error = compile_error,
next = next, next = next,
unpack = unpack, unpack = unpack,
setmetatable = setmetatable, setmetatable = setmetatable,
@ -1382,6 +1361,18 @@ do
}) })
_base_0.__class = _class_0 _base_0.__class = _class_0
local self = _class_0 local self = _class_0
compile_error = function(tok, err_format_string, ...)
local file = FILE_CACHE[tok.source.filename]
local line_no = pos_to_line(file, tok.source.start)
local line_start = LINE_STARTS[file][line_no]
local src = colored.dim(file:sub(line_start, tok.source.start - 1))
src = src .. colored.underscore(colored.bright(colored.red(file:sub(tok.source.start, tok.source.stop - 1))))
local end_of_line = (LINE_STARTS[file][pos_to_line(file, tok.source.stop) + 1] or 0) - 1
src = src .. colored.dim(file:sub(tok.source.stop, end_of_line - 1))
src = ' ' .. src:gsub('\n', '\n ')
local err_msg = err_format_string:format(src, ...)
return error(tostring(tok.source.filename) .. ":" .. tostring(line_no) .. ": " .. err_msg, 0)
end
local stub_defs local stub_defs
do do
stub_defs = { stub_defs = {
@ -1394,18 +1385,6 @@ do
]=], stub_defs) ]=], stub_defs)
var_pattern = re.compile("{| ((('%' {%varname}) / %word) ([ ])*)+ !. |}", stub_defs) var_pattern = re.compile("{| ((('%' {%varname}) / %word) ([ ])*)+ !. |}", stub_defs)
_running_files = { } _running_files = { }
_report_error = function(tok, fn)
local file = FILE_CACHE[tok.source.filename]
local line_no = pos_to_line(file, tok.source.start)
local line_start = LINE_STARTS[file][line_no]
local src = colored.dim(file:sub(line_start, tok.source.start - 1))
src = src .. colored.underscore(colored.bright(colored.red(file:sub(tok.source.start, tok.source.stop - 1))))
local end_of_line = (LINE_STARTS[file][pos_to_line(file, tok.source.stop) + 1] or 0) - 1
src = src .. colored.dim(file:sub(tok.source.stop, end_of_line - 1))
src = ' ' .. src:gsub('\n', '\n ')
local err_msg = fn(src)
return error(tostring(tok.source.filename) .. ":" .. tostring(line_no) .. ": " .. err_msg, 0)
end
MAX_LINE = 80 MAX_LINE = 80
math_expression = re.compile([[ ([+-] " ")* "%" (" " [*/^+-] (" " [+-])* " %")+ !. ]]) math_expression = re.compile([[ ([+-] " ")* "%" (" " [*/^+-] (" " [+-])* " %")+ !. ]])
NomsuCompiler = _class_0 NomsuCompiler = _class_0

81
nomsu.moon
View File

@ -230,6 +230,17 @@ NOMSU_PATTERN = do
re.compile(nomsu_peg, NOMSU_DEFS) re.compile(nomsu_peg, NOMSU_DEFS)
class NomsuCompiler class NomsuCompiler
compile_error = (tok, err_format_string, ...)->
file = FILE_CACHE[tok.source.filename]
line_no = pos_to_line(file, tok.source.start)
line_start = LINE_STARTS[file][line_no]
src = colored.dim(file\sub(line_start, tok.source.start-1))
src ..= colored.underscore colored.bright colored.red(file\sub(tok.source.start, tok.source.stop-1))
end_of_line = (LINE_STARTS[file][pos_to_line(file, tok.source.stop) + 1] or 0) - 1
src ..= colored.dim(file\sub(tok.source.stop, end_of_line-1))
src = ' '..src\gsub('\n', '\n ')
err_msg = err_format_string\format(src, ...)
error("#{tok.source.filename}:#{line_no}: "..err_msg, 0)
new: => new: =>
-- Weak-key mapping from objects to randomly generated unique IDs -- Weak-key mapping from objects to randomly generated unique IDs
NaN_surrogate = {} NaN_surrogate = {}
@ -259,6 +270,7 @@ class NomsuCompiler
@environment = { @environment = {
-- Discretionary/convenience stuff -- Discretionary/convenience stuff
nomsu:self, repr:repr, stringify:stringify, utils:utils, lpeg:lpeg, re:re, nomsu:self, repr:repr, stringify:stringify, utils:utils, lpeg:lpeg, re:re,
:compile_error
-- Lua stuff: -- Lua stuff:
:next, :unpack, :setmetatable, :coroutine, :rawequal, :getmetatable, :pcall, :next, :unpack, :setmetatable, :coroutine, :rawequal, :getmetatable, :pcall,
:error, :package, :os, :require, :tonumber, :tostring, :string, :xpcall, :module, :error, :package, :os, :require, :tonumber, :tostring, :string, :xpcall, :module,
@ -329,11 +341,12 @@ class NomsuCompiler
fn_info = debug_getinfo(fn, "u") fn_info = debug_getinfo(fn, "u")
assert(not fn_info.isvararg, "Vararg functions aren't supported. Sorry, use a list instead.") assert(not fn_info.isvararg, "Vararg functions aren't supported. Sorry, use a list instead.")
fn_arg_positions = {debug.getlocal(fn, i), i for i=1,fn_info.nparams} fn_arg_positions = {debug.getlocal(fn, i), i for i=1,fn_info.nparams}
actions = (is_compile_action and @environment.COMPILE_ACTIONS or @environment.ACTIONS)
arg_orders = {} arg_orders = {}
for alias in *signature for alias in *signature
stub = concat(assert(stub_pattern\match(alias)), ' ') stub = concat(assert(stub_pattern\match(alias)), ' ')
stub_args = assert(var_pattern\match(alias)) stub_args = assert(var_pattern\match(alias))
(is_compile_action and @environment.COMPILE_ACTIONS or @environment.ACTIONS)[stub] = fn actions[stub] = fn
arg_orders[stub] = [fn_arg_positions[string.as_lua_id a] for a in *stub_args] arg_orders[stub] = [fn_arg_positions[string.as_lua_id a] for a in *stub_args]
@environment.ARG_ORDERS[fn] = arg_orders @environment.ARG_ORDERS[fn] = arg_orders
@ -411,17 +424,6 @@ class NomsuCompiler
loaded[filename] = ret or true loaded[filename] = ret or true
return ret return ret
_report_error = (tok, fn)->
file = FILE_CACHE[tok.source.filename]
line_no = pos_to_line(file, tok.source.start)
line_start = LINE_STARTS[file][line_no]
src = colored.dim(file\sub(line_start, tok.source.start-1))
src ..= colored.underscore colored.bright colored.red(file\sub(tok.source.start, tok.source.stop-1))
end_of_line = (LINE_STARTS[file][pos_to_line(file, tok.source.stop) + 1] or 0) - 1
src ..= colored.dim(file\sub(tok.source.stop, end_of_line-1))
src = ' '..src\gsub('\n', '\n ')
err_msg = fn(src)
error("#{tok.source.filename}:#{line_no}: "..err_msg, 0)
run_lua: (lua)=> run_lua: (lua)=>
assert(type(lua) != 'string', "Attempt to run lua string instead of Lua (object)") assert(type(lua) != 'string', "Attempt to run lua string instead of Lua (object)")
lua_string = tostring(lua) lua_string = tostring(lua)
@ -469,13 +471,14 @@ class NomsuCompiler
if compile_action if compile_action
args = [arg for arg in *tree when type(arg) != "string"] args = [arg for arg in *tree when type(arg) != "string"]
-- Force all compile-time actions to take a tree location -- Force all compile-time actions to take a tree location
args = [args[p-1] for p in *@environment.ARG_ORDERS[compile_action][stub]] arg_orders = @environment.ARG_ORDERS[compile_action]
args = [args[p-1] for p in *arg_orders[stub]]
-- Force Lua to avoid tail call optimization for debugging purposes -- Force Lua to avoid tail call optimization for debugging purposes
-- TODO: use tail call -- TODO: use tail call
ret = compile_action(tree, unpack(args)) ret = compile_action(tree, unpack(args))
if not ret if not ret
_report_error tree, (src)-> compile_error tree,
"Compile-time action:\n#{src}\nfailed to produce any Lua" "Compile-time action:\n%s\nfailed to produce any Lua"
return ret return ret
action = rawget(@environment.ACTIONS, stub) action = rawget(@environment.ACTIONS, stub)
lua = Lua.Value(tree.source) lua = Lua.Value(tree.source)
@ -489,8 +492,8 @@ class NomsuCompiler
else else
tok_lua = @tree_to_lua(tok) tok_lua = @tree_to_lua(tok)
unless tok_lua.is_value unless tok_lua.is_value
_report_error tok, (src)-> compile_error tok,
"Non-expression value inside math expression:\n#{src}" "Non-expression value inside math expression:\n%s"
if tok.type == "Action" if tok.type == "Action"
tok_lua\parenthesize! tok_lua\parenthesize!
lua\append tok_lua lua\append tok_lua
@ -503,8 +506,9 @@ class NomsuCompiler
if type(tok) == "string" then continue if type(tok) == "string" then continue
arg_lua = @tree_to_lua(tok) arg_lua = @tree_to_lua(tok)
unless arg_lua.is_value unless arg_lua.is_value
_report_error tok, (src)-> compile_error tok,
"Cannot use:\n#{src}\nas an argument to #{stub}, since it's not an expression, it produces: #{repr arg_lua}", 0 "Cannot use:\n%s\nas an argument to %s, since it's not an expression, it produces: %s",
stub, repr arg_lua
insert args, arg_lua insert args, arg_lua
if action if action
@ -554,8 +558,8 @@ class NomsuCompiler
unless bit_lua.is_value unless bit_lua.is_value
src = ' '..tostring(@tree_to_nomsu(bit))\gsub('\n','\n ') src = ' '..tostring(@tree_to_nomsu(bit))\gsub('\n','\n ')
line = "#{bit.source.filename}:#{pos_to_line(FILE_CACHE[bit.source.filename], bit.source.start)}" line = "#{bit.source.filename}:#{pos_to_line(FILE_CACHE[bit.source.filename], bit.source.start)}"
_report_error bit, (src)-> compile_error bit,
"Cannot use:\n#{src}\nas a string interpolation value, since it's not an expression." "Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
if #lua.bits > 0 then lua\append ".." if #lua.bits > 0 then lua\append ".."
if bit.type != "Text" if bit.type != "Text"
bit_lua = Lua.Value(bit.source, "stringify(",bit_lua,")") bit_lua = Lua.Value(bit.source, "stringify(",bit_lua,")")
@ -575,8 +579,8 @@ class NomsuCompiler
for i, item in ipairs tree for i, item in ipairs tree
item_lua = @tree_to_lua(item) item_lua = @tree_to_lua(item)
unless item_lua.is_value unless item_lua.is_value
_report_error item, (src)-> compile_error item,
"Cannot use:\n#{src}\nas a list item, since it's not an expression." "Cannot use:\n%s\nas a list item, since it's not an expression."
lua\append item_lua lua\append item_lua
item_string = tostring(item_lua) item_string = tostring(item_lua)
last_line = item_string\match("[^\n]*$") last_line = item_string\match("[^\n]*$")
@ -621,12 +625,12 @@ class NomsuCompiler
key, value = tree[1], tree[2] key, value = tree[1], tree[2]
key_lua = @tree_to_lua(key) key_lua = @tree_to_lua(key)
unless key_lua.is_value unless key_lua.is_value
_report_error tree[1], (src)-> compile_error tree[1],
"Cannot use:\n#{src}\nas a dict key, since it's not an expression." "Cannot use:\n%s\nas a dict key, since it's not an expression."
value_lua = value and @tree_to_lua(value) or Lua.Value(key.source, "true") value_lua = value and @tree_to_lua(value) or Lua.Value(key.source, "true")
unless value_lua.is_value unless value_lua.is_value
_report_error tree[2], (src)-> compile_error tree[2],
"Cannot use:\n#{src}\nas a dict value, since it's not an expression." "Cannot use:\n%s\nas a dict value, since it's not an expression."
key_str = tostring(key_lua)\match([=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=]) key_str = tostring(key_lua)\match([=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=])
return if key_str return if key_str
Lua tree.source, key_str,"=",value_lua Lua tree.source, key_str,"=",value_lua
@ -641,8 +645,8 @@ class NomsuCompiler
when "IndexChain" when "IndexChain"
lua = @tree_to_lua(tree[1]) lua = @tree_to_lua(tree[1])
unless lua.is_value unless lua.is_value
_report_error tree[1], (src)-> compile_error tree[1],
"Cannot index:\n#{src}\nsince it's not an expression." "Cannot index:\n%s\nsince it's not an expression."
first_char = tostring(lua)\sub(1,1) first_char = tostring(lua)\sub(1,1)
if first_char == "{" or first_char == '"' or first_char == "[" if first_char == "{" or first_char == '"' or first_char == "["
lua\parenthesize! lua\parenthesize!
@ -651,8 +655,8 @@ class NomsuCompiler
key = tree[i] key = tree[i]
key_lua = @tree_to_lua(key) key_lua = @tree_to_lua(key)
unless key_lua.is_value unless key_lua.is_value
_report_error key, (src)-> compile_error key,
"Cannot use:\n#{key}\nas an index, since it's not an expression." "Cannot use:\n%s\nas an index, since it's not an expression."
key_lua_str = tostring(key_lua) key_lua_str = tostring(key_lua)
if lua_id = key_lua_str\match("^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$") if lua_id = key_lua_str\match("^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
lua\append ".#{lua_id}" lua\append ".#{lua_id}"
@ -927,8 +931,8 @@ class NomsuCompiler
else else
bit_lua = nomsu\tree_to_lua(bit) bit_lua = nomsu\tree_to_lua(bit)
unless bit_lua.is_value unless bit_lua.is_value
_report_error bit, (src)-> compile_error bit,
"Cannot use:\n#{src}\nas a string interpolation value, since it's not an expression." "Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
lua\append bit_lua lua\append bit_lua
@define_compile_action "Lua %code", (_code)=> @define_compile_action "Lua %code", (_code)=>
@ -950,8 +954,8 @@ class NomsuCompiler
else else
bit_lua = nomsu\tree_to_lua(bit) bit_lua = nomsu\tree_to_lua(bit)
unless bit_lua.is_value unless bit_lua.is_value
_report_error bit, (src)-> compile_error bit,
"Cannot use:\n#{src}\nas a string interpolation value, since it's not an expression." "Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
lua\append bit_lua lua\append bit_lua
return lua return lua
@ -966,10 +970,9 @@ class NomsuCompiler
return add_lua_bits(Lua.Value(@source), _code) return add_lua_bits(Lua.Value(@source), _code)
@define_compile_action "use %path", (_path)=> @define_compile_action "use %path", (_path)=>
path = if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string' unless _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string'
_path[1] return Lua(_path.source, "nomsu:run_file(#{nomsu\tree_to_lua(_path)});")
else path = _path[1]
nomsu\run_lua Lua(_path.source, "return ",nomsu\tree_to_lua(_path))
nomsu\run_file(path) nomsu\run_file(path)
return Lua(_path.source, "nomsu:run_file(#{repr path});") return Lua(_path.source, "nomsu:run_file(#{repr path});")

28
nomsu.peg
View File

@ -16,7 +16,7 @@ noindex_inline_expression:
number / variable / inline_text / inline_list / inline_dict / inline_nomsu number / variable / inline_text / inline_list / inline_dict / inline_nomsu
/ ( "(" / ( "("
%ws* (inline_block / inline_action / inline_expression) %ws* %ws* (inline_block / inline_action / inline_expression) %ws*
(comma %ws* (inline_block / inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)*
(")" (")"
/ (({} ((!. / &%nl) -> 'Line ended without finding a closing )-parenthesis') %userdata) => error) / (({} ((!. / &%nl) -> 'Line ended without finding a closing )-parenthesis') %userdata) => error)
/ (({} ([^%nl]* -> 'Unexpected character while parsing subexpression') %userdata) => error) / (({} ([^%nl]* -> 'Unexpected character while parsing subexpression') %userdata) => error)
@ -47,17 +47,21 @@ indented_nomsu (EscapedNomsu):
index_chain (IndexChain): index_chain (IndexChain):
{| noindex_inline_expression ("." (text_word / noindex_inline_expression))+ |} {| noindex_inline_expression ("." (text_word / noindex_inline_expression))+ |}
-- Actions need at least one word in them -- Actions need either at least 1 word, or at least 2 tokens
inline_action (Action): inline_action (Action):
{| {|
(inline_expression %ws*)* word (%ws* (inline_expression / word))* ( (inline_expression (%ws* (inline_expression / word))+)
/ (word (%ws* (inline_expression / word))*))
(%ws* ":" %ws* (inline_block / inline_action / inline_expression (%ws* ":" %ws* (inline_block / inline_action / inline_expression
/ (({} ('' -> "Missing expression after the ':'") %userdata) => error)))? / (({} ('' -> "Missing expression after the ':'") %userdata) => error)))?
|} |}
action (Action): action (Action):
{| (expression (dotdot? %ws*))* word ((dotdot? %ws*) (expression / word))* |} {|
(expression ((nodent "..")? %ws* (expression / word))+)
/ (word ((nodent "..")? %ws* (expression / word))*)
|}
word: { %operator_char+ / (!number %ident_char+) } word: !number { %operator_char+ / %ident_char+ }
text_word (Text): {| word |} text_word (Text): {| word |}
@ -84,7 +88,7 @@ inline_text_interpolation:
variable / inline_list / inline_dict / inline_text variable / inline_list / inline_dict / inline_text
/ ("(" / ("("
%ws* (inline_block / inline_action / inline_expression) %ws* %ws* (inline_block / inline_action / inline_expression) %ws*
(comma %ws* (inline_block / inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)*
(")" (")"
/ (({} (&%nl -> 'Line ended without finding a closing )-parenthesis') %userdata) => error) / (({} (&%nl -> 'Line ended without finding a closing )-parenthesis') %userdata) => error)
/ (({} ([^%nl]* -> 'Unexpected character while parsing Text interpolation') %userdata) => error)) / (({} ([^%nl]* -> 'Unexpected character while parsing Text interpolation') %userdata) => error))
@ -103,7 +107,7 @@ variable (Var): "%" { (%ident_char+ ((!"'" %operator_char+) / %ident_char+)*)? }
inline_list (List): inline_list (List):
!('[..]') !('[..]')
"[" %ws* "[" %ws*
{| (inline_list_item (comma inline_list_item)* comma?)? |} %ws* {| (inline_list_item (%ws* ',' %ws* inline_list_item)* (%ws* ',')?)? |} %ws*
("]" / (","? ( ("]" / (","? (
(({} (eol->"Line ended before finding a closing ]-bracket") %userdata) => error) (({} (eol->"Line ended before finding a closing ]-bracket") %userdata) => error)
/(({} ([^%nl]*->"Unexpected character while parsing List") %userdata) => error) /(({} ([^%nl]*->"Unexpected character while parsing List") %userdata) => error)
@ -113,14 +117,14 @@ indented_list (List):
{| list_line (nodent list_line)* |} {| list_line (nodent list_line)* |}
(dedent / ((","? {} (non_dedent_error -> "Unexpected character while parsing List") %userdata) => error)) (dedent / ((","? {} (non_dedent_error -> "Unexpected character while parsing List") %userdata) => error))
list_line: list_line:
((action / expression) !comma) ((action / expression) !(%ws* ','))
/ (inline_list_item (comma list_line?)?) / (inline_list_item ((%ws* ',' %ws*) list_line?)?)
inline_list_item: inline_block / inline_action / inline_expression inline_list_item: inline_block / inline_action / inline_expression
inline_dict (Dict): inline_dict (Dict):
!('{..}') !('{..}')
"{" %ws* "{" %ws*
{| (inline_dict_entry (comma inline_dict_entry)*)? |} %ws* {| (inline_dict_entry (%ws* ',' %ws* inline_dict_entry)*)? |} %ws*
("}" / (","? ( ("}" / (","? (
(({} (%ws* eol->"Line ended before finding a closing }-brace") %userdata) => error) (({} (%ws* eol->"Line ended before finding a closing }-brace") %userdata) => error)
/ (({} ([^%nl]*->"Unexpected character while parsing Dictionary") %userdata) => error) / (({} ([^%nl]*->"Unexpected character while parsing Dictionary") %userdata) => error)
@ -130,7 +134,7 @@ indented_dict (Dict):
{| dict_line (nodent dict_line)* |} {| dict_line (nodent dict_line)* |}
(dedent / ((","? {} (non_dedent_error -> "Unexpected character while parsing Dictionary") %userdata) => error)) (dedent / ((","? {} (non_dedent_error -> "Unexpected character while parsing Dictionary") %userdata) => error))
dict_line: dict_line:
(dict_entry !comma) / (inline_dict_entry (comma dict_line?)?) (dict_entry !(%ws* ',')) / (inline_dict_entry (%ws* ',' %ws dict_line?)?)
dict_entry(DictEntry): dict_entry(DictEntry):
{| dict_key (%ws* ":" %ws* (action / expression))? |} {| dict_key (%ws* ":" %ws* (action / expression))? |}
inline_dict_entry(DictEntry): inline_dict_entry(DictEntry):
@ -147,5 +151,3 @@ indent: eol (%nl ignored_line)* %nl %indent (comment (%nl ignored_line)* nodent)
nodent: eol (%nl ignored_line)* %nl %nodent nodent: eol (%nl ignored_line)* %nl %nodent
dedent: eol (%nl ignored_line)* (((!.) %dedent) / (&(%nl %dedent))) dedent: eol (%nl ignored_line)* (((!.) %dedent) / (&(%nl %dedent)))
non_dedent_error: (!dedent .)* eol (%nl ignored_line)* (!. / &%nl) non_dedent_error: (!dedent .)* eol (%nl ignored_line)* (!. / &%nl)
comma: %ws* "," %ws*
dotdot: nodent ".."

27
nomsu_tree.lua
View File

@ -36,18 +36,6 @@ Tree = function(name, fields, methods)
return source, ... return source, ...
end end
methods.is_multi = is_multi methods.is_multi = is_multi
methods.map = function(self, fn)
if type(fn) == 'table' then
if not (next(fn)) then
return self
end
local _replacements = fn
fn = function(k)
return _replacements[k]
end
end
return self:_map(fn)
end
if is_multi then if is_multi then
methods.__tostring = function(self) methods.__tostring = function(self)
return tostring(self.name) .. "(" .. tostring(table.concat((function() return tostring(self.name) .. "(" .. tostring(table.concat((function()
@ -61,11 +49,11 @@ Tree = function(name, fields, methods)
return _accum_0 return _accum_0
end)(), ', ')) .. ")" end)(), ', ')) .. ")"
end end
methods._map = function(self, fn) methods.map = function(self, fn)
do do
local ret = fn(self) local replacement = fn(self)
if ret then if replacement then
return ret return replacement
end end
end end
local new_vals local new_vals
@ -74,19 +62,18 @@ Tree = function(name, fields, methods)
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #self do for _index_0 = 1, #self do
local v = self[_index_0] local v = self[_index_0]
_accum_0[_len_0] = v._map and v:_map(fn) or v _accum_0[_len_0] = v.map and v:map(fn) or v
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
new_vals = _accum_0 new_vals = _accum_0
end end
local ret = getmetatable(self)(self.source, unpack(new_vals)) return getmetatable(self)(self.source, unpack(new_vals))
return ret
end end
else else
methods.__tostring = function(self) methods.__tostring = function(self)
return tostring(self.name) .. "(" .. tostring(repr(self.value)) .. ")" return tostring(self.name) .. "(" .. tostring(repr(self.value)) .. ")"
end end
methods._map = function(self, fn) methods.map = function(self, fn)
return fn(self) or self return fn(self) or self
end end
end end

19
nomsu_tree.moon
View File

@ -27,23 +27,16 @@ Tree = (name, fields, methods)->
--assert Source\is_instance(source) --assert Source\is_instance(source)
return source, ... return source, ...
.is_multi = is_multi .is_multi = is_multi
.map = (fn)=>
if type(fn) == 'table'
return @ unless next(fn)
_replacements = fn
fn = (k)-> _replacements[k]
return @_map(fn)
if is_multi if is_multi
.__tostring = => "#{@name}(#{table.concat [repr(v) for v in *@], ', '})" .__tostring = => "#{@name}(#{table.concat [repr(v) for v in *@], ', '})"
._map = (fn)=> .map = (fn)=>
if ret = fn(@) if replacement = fn(@)
return ret return replacement
new_vals = [v._map and v\_map(fn) or v for v in *@] new_vals = [v.map and v\map(fn) or v for v in *@]
ret = getmetatable(self)(@source, unpack(new_vals)) return getmetatable(self)(@source, unpack(new_vals))
return ret
else else
.__tostring = => "#{@name}(#{repr(@value)})" .__tostring = => "#{@name}(#{repr(@value)})"
._map = (fn)=> .map = (fn)=>
fn(@) or @ fn(@) or @
Types[name] = immutable fields, methods Types[name] = immutable fields, methods