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

Lots of cleanup.

Browse Source
This commit is contained in:
Bruce Hill 2018-06-19 00:44:17 -07:00
parent 6d8d617774
commit d7d86e0268
6 changed files with 182 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code_obj.lua
View File

@ -98,25 +98,34 @@ do
end end
self.__str = nil self.__str = nil
end, end,
concat_append = function(self, values, joiner) concat_append = function(self, values, joiner, wrapping_joiner)
wrapping_joiner = wrapping_joiner or joiner
local bits, indents = self.bits, self.indents local bits, indents = self.bits, self.indents
local match = string.match local match = string.match
local line_len = 0
for i = 1, #values do for i = 1, #values do
local b = values[i] local b = values[i]
assert(b)
if i > 1 then if i > 1 then
if line_len > 80 then
bits[#bits + 1] = wrapping_joiner
line_len = 0
else
bits[#bits + 1] = joiner bits[#bits + 1] = joiner
end end
end
bits[#bits + 1] = b bits[#bits + 1] = b
if type(b) == 'string' then if type(b) ~= 'string' and self.current_indent ~= 0 then
do indents[#bits] = self.current_indent
local spaces = match(b, "\n([ ]*)[^\n]*$") end
local b_str = tostring(b)
local line, spaces = match(b_str, "\n(([ ]*)[^\n]*)$")
if spaces then if spaces then
if type(b) == 'string' then
self.current_indent = #spaces self.current_indent = #spaces
end end
end line_len = #line
elseif self.current_indent ~= 0 then else
indents[#bits] = self.current_indent line_len = line_len + #b
end end
end end
self.__str = nil self.__str = nil

22
code_obj.moon
View File

@ -66,20 +66,30 @@ class Code
indents[#bits] = @current_indent indents[#bits] = @current_indent
@__str = nil @__str = nil
concat_append: (values, joiner)=> concat_append: (values, joiner, wrapping_joiner)=>
wrapping_joiner or= joiner
bits, indents = @bits, @indents bits, indents = @bits, @indents
match = string.match match = string.match
line_len = 0
for i=1,#values for i=1,#values
b = values[i] b = values[i]
assert(b)
if i > 1 if i > 1
if line_len > 80
bits[#bits+1] = wrapping_joiner
line_len = 0
else
bits[#bits+1] = joiner bits[#bits+1] = joiner
bits[#bits+1] = b bits[#bits+1] = b
if type(b) == 'string' if type(b) != 'string' and @current_indent != 0
if spaces = match(b, "\n([ ]*)[^\n]*$")
@current_indent = #spaces
elseif @current_indent != 0
indents[#bits] = @current_indent indents[#bits] = @current_indent
b_str = tostring(b)
line, spaces = match(b_str, "\n(([ ]*)[^\n]*)$")
if spaces
if type(b) == 'string'
@current_indent = #spaces
line_len = #line
else
line_len += #b
@__str = nil @__str = nil
prepend: (...)=> prepend: (...)=>

242
nomsu.lua
View File

@ -1,16 +1,10 @@
local lpeg = require('lpeg') local lpeg = require('lpeg')
local re = require('re') local re = require('re')
lpeg.setmaxstack(10000) lpeg.setmaxstack(10000)
local P, R, V, S, Cg, C, Cp, B, Cmt, Carg
P, R, V, S, Cg, C, Cp, B, Cmt, Carg = lpeg.P, lpeg.R, lpeg.V, lpeg.S, lpeg.Cg, lpeg.C, lpeg.Cp, lpeg.B, lpeg.Cmt, lpeg.Carg
local utils = require('utils') local utils = require('utils')
local repr, stringify, min, max, equivalent, set, is_list, sum local repr, stringify, equivalent
repr, stringify, min, max, equivalent, set, is_list, sum = utils.repr, utils.stringify, utils.min, utils.max, utils.equivalent, utils.set, utils.is_list, utils.sum repr, stringify, equivalent = utils.repr, utils.stringify, utils.equivalent
local colors = setmetatable({ }, { colors = require('consolecolors')
__index = function()
return ""
end
})
colored = setmetatable({ }, { colored = setmetatable({ }, {
__index = function(_, color) __index = function(_, color)
return (function(msg) return (function(msg)
@ -35,6 +29,8 @@ do
local _obj_0 = require("code_obj") local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end end
local AST = require("nomsu_tree")
local parse = require("parser")
local STDIN, STDOUT, STDERR = "/dev/fd/0", "/dev/fd/1", "/dev/fd/2" local STDIN, STDOUT, STDERR = "/dev/fd/0", "/dev/fd/1", "/dev/fd/2"
string.as_lua_id = function(str) string.as_lua_id = function(str)
local argnum = 0 local argnum = 0
@ -60,6 +56,11 @@ table.map = function(self, fn)
end end
return _accum_0 return _accum_0
end end
table.fork = function(t, values)
return setmetatable(values or { }, {
__index = t
})
end
FILE_CACHE = setmetatable({ }, { FILE_CACHE = setmetatable({ }, {
__index = function(self, filename) __index = function(self, filename)
local file = io.open(filename) local file = io.open(filename)
@ -103,12 +104,12 @@ end
local line_counter = re.compile([[ lines <- {| line (%nl line)* |} local line_counter = re.compile([[ lines <- {| line (%nl line)* |}
line <- {} (!%nl .)* line <- {} (!%nl .)*
]], { ]], {
nl = P("\r") ^ -1 * P("\n") nl = lpeg.P("\r") ^ -1 * lpeg.P("\n")
}) })
local get_lines = re.compile([[ lines <- {| line (%nl line)* |} local get_lines = re.compile([[ lines <- {| line (%nl line)* |}
line <- {[^%nl]*} line <- {[^%nl]*}
]], { ]], {
nl = P("\r") ^ -1 * P("\n") nl = lpeg.P("\r") ^ -1 * lpeg.P("\n")
}) })
LINE_STARTS = setmetatable({ }, { LINE_STARTS = setmetatable({ }, {
__mode = "k", __mode = "k",
@ -127,7 +128,6 @@ LINE_STARTS = setmetatable({ }, {
return line_starts return line_starts
end end
}) })
local pos_to_line
pos_to_line = function(str, pos) pos_to_line = function(str, pos)
local line_starts = LINE_STARTS[str] local line_starts = LINE_STARTS[str]
local lo, hi = 1, #line_starts local lo, hi = 1, #line_starts
@ -158,9 +158,8 @@ do
end end
end end
end end
local AST = require("nomsu_tree")
local _list_mt = { local _list_mt = {
__eq = utils.equivalent, __eq = equivalent,
__tostring = function(self) __tostring = function(self)
return "[" .. concat((function() return "[" .. concat((function()
local _accum_0 = { } local _accum_0 = { }
@ -179,7 +178,7 @@ list = function(t)
return setmetatable(t, _list_mt) return setmetatable(t, _list_mt)
end end
local _dict_mt = { local _dict_mt = {
__eq = utils.equivalent, __eq = equivalent,
__tostring = function(self) __tostring = function(self)
return "{" .. concat((function() return "{" .. concat((function()
local _accum_0 = { } local _accum_0 = { }
@ -212,7 +211,6 @@ local NomsuCompiler = setmetatable({ }, {
do do
NomsuCompiler._ENV = NomsuCompiler NomsuCompiler._ENV = NomsuCompiler
NomsuCompiler.nomsu = NomsuCompiler NomsuCompiler.nomsu = NomsuCompiler
local parse = require("parser")
NomsuCompiler.parse = function(self, ...) NomsuCompiler.parse = function(self, ...)
return parse(...) return parse(...)
end end
@ -270,9 +268,6 @@ do
NomsuCompiler.LuaCode = LuaCode NomsuCompiler.LuaCode = LuaCode
NomsuCompiler.NomsuCode = NomsuCode NomsuCompiler.NomsuCode = NomsuCode
NomsuCompiler.Source = Source NomsuCompiler.Source = Source
NomsuCompiler.ARG_ORDERS = setmetatable({ }, {
__mode = "k"
})
NomsuCompiler.ALIASES = setmetatable({ }, { NomsuCompiler.ALIASES = setmetatable({ }, {
__mode = "k" __mode = "k"
}) })
@ -337,7 +332,7 @@ do
end end
end end
NomsuCompiler.COMPILE_ACTIONS = setmetatable({ NomsuCompiler.COMPILE_ACTIONS = setmetatable({
compile_math_expr = function(self, tree, ...) ["# compile math expr #"] = function(self, tree, ...)
local lua = LuaCode.Value(tree.source) local lua = LuaCode.Value(tree.source)
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
if type(tok) == 'string' then if type(tok) == 'string' then
@ -393,19 +388,10 @@ do
}, { }, {
__index = function(self, stub) __index = function(self, stub)
if math_expression:match(stub) then if math_expression:match(stub) then
return self.compile_math_expr return self["# compile math expr #"]
end end
end end
}) })
NomsuCompiler.fork = function(self)
return setmetatable({
COMPILE_ACTIONS = setmetatable({ }, {
__index = self.COMPILE_ACTIONS
})
}, {
__index = self
})
end
NomsuCompiler.run = function(self, to_run, source) NomsuCompiler.run = function(self, to_run, source)
if source == nil then if source == nil then
source = nil source = nil
@ -453,11 +439,13 @@ do
for filename in all_files(filename) do for filename in all_files(filename) do
local _continue_0 = false local _continue_0 = false
repeat repeat
if self.LOADED[filename] then do
ret = self.LOADED[filename] ret = self.LOADED[filename]
if ret then
_continue_0 = true _continue_0 = true
break break
end end
end
for i, running in ipairs(_running_files) do for i, running in ipairs(_running_files) do
if running == filename then if running == filename then
local loop local loop
@ -471,7 +459,7 @@ do
loop = _accum_0 loop = _accum_0
end end
insert(loop, filename) insert(loop, filename)
error("Circular import, this loops forever: " .. tostring(concat(loop, " -> "))) error("Circular import, this loops forever: " .. tostring(concat(loop, " -> ")) .. "...")
end end
end end
insert(_running_files, filename) insert(_running_files, filename)
@ -479,21 +467,24 @@ do
local file = assert(FILE_CACHE[filename], "Could not find file: " .. tostring(filename)) local file = assert(FILE_CACHE[filename], "Could not find file: " .. tostring(filename))
ret = self:run_lua(file, Source(filename, 1, #file)) ret = self:run_lua(file, Source(filename, 1, #file))
elseif match(filename, "%.nom$") or match(filename, "^/dev/fd/[012]$") then elseif match(filename, "%.nom$") or match(filename, "^/dev/fd/[012]$") then
local ran_lua
if not self.skip_precompiled then if not self.skip_precompiled then
local lua_filename = gsub(filename, "%.nom$", ".lua") local lua_filename = gsub(filename, "%.nom$", ".lua")
do
local file = FILE_CACHE[lua_filename] local file = FILE_CACHE[lua_filename]
if file then if file then
ret = self:run_lua(file, Source(filename, 1, #file)) ret = self:run_lua(file, Source(lua_filename, 1, #file))
remove(_running_files) ran_lua = true
_continue_0 = true
break
end end
end end
end
if not (ran_lua) then
local file = file or FILE_CACHE[filename] local file = file or FILE_CACHE[filename]
if not file then if not file then
error("File does not exist: " .. tostring(filename), 0) error("File does not exist: " .. tostring(filename), 0)
end end
ret = self:run(file, Source(filename, 1, #file)) ret = self:run(file, Source(filename, 1, #file))
end
else else
error("Invalid filetype for " .. tostring(filename), 0) error("Invalid filetype for " .. tostring(filename), 0)
end end
@ -515,13 +506,15 @@ do
local lua_string = tostring(lua) local lua_string = tostring(lua)
local run_lua_fn, err = load(lua_string, nil and tostring(source or lua.source), "t", self) local run_lua_fn, err = load(lua_string, nil and tostring(source or lua.source), "t", self)
if not run_lua_fn then if not run_lua_fn then
local n = 1 local line_numbered_lua = concat((function()
local fn local _accum_0 = { }
fn = function() local _len_0 = 1
n = n + 1 for i, line in ipairs(get_lines:match(lua_string)) do
return ("\n%-3d|"):format(n) _accum_0[_len_0] = format("%3d|%s", i, line)
_len_0 = _len_0 + 1
end end
local line_numbered_lua = "1 |" .. lua_string:gsub("\n", fn) return _accum_0
end)(), "\n")
error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(colored.onblack(line_numbered_lua)))) .. "\n\n" .. tostring(err), 0) error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(colored.onblack(line_numbered_lua)))) .. "\n\n" .. tostring(err), 0)
end end
local source_key = tostring(source or lua.source) local source_key = tostring(source or lua.source)
@ -559,7 +552,6 @@ do
return run_lua_fn() return run_lua_fn()
end end
NomsuCompiler.compile = function(self, tree) NomsuCompiler.compile = function(self, tree)
assert(LuaCode)
local _exp_0 = tree.type local _exp_0 = tree.type
if "Action" == _exp_0 then if "Action" == _exp_0 then
local stub = tree.stub local stub = tree.stub
@ -579,21 +571,6 @@ do
end end
args = _accum_0 args = _accum_0
end end
do
local arg_orders = self.ARG_ORDERS[stub]
if arg_orders then
do
local _accum_0 = { }
local _len_0 = 1
for _index_0 = 1, #arg_orders do
local p = arg_orders[_index_0]
_accum_0[_len_0] = args[p]
_len_0 = _len_0 + 1
end
args = _accum_0
end
end
end
local ret = compile_action(self, tree, unpack(args)) local ret = compile_action(self, tree, unpack(args))
if not ret then if not ret then
self:compile_error(tree, "Compile-time action:\n%s\nfailed to produce any Lua") self:compile_error(tree, "Compile-time action:\n%s\nfailed to produce any Lua")
@ -601,28 +578,7 @@ do
return ret return ret
end end
end end
local action = self['A' .. string.as_lua_id(stub)] local lua = LuaCode.Value(tree.source, "A", string.as_lua_id(stub), "(")
local lua = LuaCode.Value(tree.source)
if not action and math_expression:match(stub) then
for i, tok in ipairs(tree) do
if type(tok) == 'string' then
lua:append(tok)
else
local tok_lua = self:compile(tok)
if not (tok_lua.is_value) then
self:compile_error(tok, "Non-expression value inside math expression:\n%s")
end
if tok.type == "Action" then
tok_lua:parenthesize()
end
lua:append(tok_lua)
end
if i < #tree then
lua:append(" ")
end
end
return lua
end
local args = { } local args = { }
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
local _continue_0 = false local _continue_0 = false
@ -642,30 +598,7 @@ do
break break
end end
end end
if action then lua:concat_append(args, ", ")
do
local arg_orders = self.ARG_ORDERS[stub]
if arg_orders then
do
local _accum_0 = { }
local _len_0 = 1
for _index_0 = 1, #arg_orders do
local p = arg_orders[_index_0]
_accum_0[_len_0] = args[p]
_len_0 = _len_0 + 1
end
args = _accum_0
end
end
end
end
lua:append("A", string.as_lua_id(stub), "(")
for i, arg in ipairs(args) do
lua:append(arg)
if i < #args then
lua:append(", ")
end
end
lua:append(")") lua:append(")")
return lua return lua
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
@ -690,13 +623,16 @@ do
return LuaCode.Value(tree.source, make_tree(tree[1])) return LuaCode.Value(tree.source, make_tree(tree[1]))
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
local lua = LuaCode(tree.source) local lua = LuaCode(tree.source)
for i, line in ipairs(tree) do lua:concat_append((function()
local line_lua = self:compile(line) local _accum_0 = { }
if i > 1 then local _len_0 = 1
lua:append("\n") for _index_0 = 1, #tree do
end local line = tree[_index_0]
lua:append(line_lua:as_statements()) _accum_0[_len_0] = self:compile(line):as_statements()
_len_0 = _len_0 + 1
end end
return _accum_0
end)(), "\n")
return lua return lua
elseif "Text" == _exp_0 then elseif "Text" == _exp_0 then
local lua = LuaCode.Value(tree.source) local lua = LuaCode.Value(tree.source)
@ -747,55 +683,29 @@ do
return lua return lua
elseif "List" == _exp_0 then elseif "List" == _exp_0 then
local lua = LuaCode.Value(tree.source, "list{") local lua = LuaCode.Value(tree.source, "list{")
local line_length = 0 local items = { }
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local item_lua = self:compile(item) local item_lua = self:compile(item)
if not (item_lua.is_value) then if not (item_lua.is_value) then
self:compile_error(item, "Cannot use:\n%s\nas a list item, since it's not an expression.") self:compile_error(item, "Cannot use:\n%s\nas a list item, since it's not an expression.")
end end
lua:append(item_lua) items[i] = item_lua
local item_string = tostring(item_lua)
local last_line = match(item_string, "[^\n]*$")
if match(item_string, "\n") then
line_length = #last_line
else
line_length = line_length + #last_line
end
if i < #tree then
if line_length >= MAX_LINE then
lua:append(",\n ")
line_length = 0
else
lua:append(", ")
line_length = line_length + 2
end
end
end end
lua:concat_append(items, ", ", ",\n ")
lua:append("}") lua:append("}")
return lua return lua
elseif "Dict" == _exp_0 then elseif "Dict" == _exp_0 then
local lua = LuaCode.Value(tree.source, "dict{") local lua = LuaCode.Value(tree.source, "dict{")
local line_length = 0 lua:concat_append((function()
for i, entry in ipairs(tree) do local _accum_0 = { }
local entry_lua = self:compile(entry) local _len_0 = 1
lua:append(entry_lua) for _index_0 = 1, #tree do
local entry_lua_str = tostring(entry_lua) local e = tree[_index_0]
local last_line = match(entry_lua_str, "\n([^\n]*)$") _accum_0[_len_0] = self:compile(e)
if last_line then _len_0 = _len_0 + 1
line_length = #last_line
else
line_length = line_length + #entry_lua_str
end
if i < #tree then
if line_length >= MAX_LINE then
lua:append(",\n ")
line_length = 0
else
lua:append(", ")
line_length = line_length + 2
end
end
end end
return _accum_0
end)(), ", ", ",\n ")
lua:append("}") lua:append("}")
return lua return lua
elseif "DictEntry" == _exp_0 then elseif "DictEntry" == _exp_0 then
@ -848,6 +758,8 @@ do
return LuaCode.Value(tree.source, tostring(tree[1])) return LuaCode.Value(tree.source, tostring(tree[1]))
elseif "Var" == _exp_0 then elseif "Var" == _exp_0 then
return LuaCode.Value(tree.source, string.as_lua_id(tree[1])) return LuaCode.Value(tree.source, string.as_lua_id(tree[1]))
elseif "FileChunks" == _exp_0 then
return error("Cannot convert FileChunks to a single block of lua, since each chunk's " .. "compilation depends on the earlier chunks")
else else
return error("Unknown type: " .. tostring(tree.type)) return error("Unknown type: " .. tostring(tree.type))
end end
@ -860,7 +772,23 @@ do
can_use_colon = false can_use_colon = false
end end
local _exp_0 = tree.type local _exp_0 = tree.type
if "Action" == _exp_0 then if "FileChunks" == _exp_0 then
if inline then
return nil
end
local nomsu = NomsuCode(tree.source)
nomsu:concat_append((function()
local _accum_0 = { }
local _len_0 = 1
for _index_0 = 1, #tree do
local c = tree[_index_0]
_accum_0[_len_0] = self:tree_to_nomsu(c)
_len_0 = _len_0 + 1
end
return _accum_0
end)(), "\n" .. tostring(("~"):rep(80)) .. "\n")
return nomsu
elseif "Action" == _exp_0 then
if inline then if inline then
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
@ -1221,7 +1149,6 @@ do
end end
end end
if arg and debug_getinfo(2).func ~= require then if arg and debug_getinfo(2).func ~= require then
colors = require('consolecolors')
local parser = re.compile([[ args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} {:nomsu_args: {| ("--;" ({[^;]*} ";")*)? |} :} ";"? |} !. local parser = re.compile([[ args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} {:nomsu_args: {| ("--;" ({[^;]*} ";")*)? |} :} ";"? |} !.
flag <- flag <-
{:interactive: ("-i" -> true) :} {:interactive: ("-i" -> true) :}
@ -1293,12 +1220,6 @@ OPTIONS
return info return info
end end
if info.short_src or info.source or info.linedefine or info.currentline then if info.short_src or info.source or info.linedefine or info.currentline then
do
local arg_orders = nomsu.ARG_ORDERS[info.func]
if arg_orders then
info.name = next(arg_orders)
end
end
do do
local map = nomsu.source_map[info.source] local map = nomsu.source_map[info.source]
if map then if map then
@ -1383,14 +1304,7 @@ OPTIONS
local file = FILE_CACHE[filename]:sub(tonumber(start), tonumber(stop)) local file = FILE_CACHE[filename]:sub(tonumber(start), tonumber(stop))
local err_line = get_line(file, calling_fn.currentline):sub(1, -2) local err_line = get_line(file, calling_fn.currentline):sub(1, -2)
local offending_statement = colored.bright(colored.red(err_line:match("^[ ]*(.*)"))) local offending_statement = colored.bright(colored.red(err_line:match("^[ ]*(.*)")))
do name = "action '" .. tostring(calling_fn.name) .. "'"
local arg_orders = nomsu.ARG_ORDERS[calling_fn.func]
if arg_orders then
name = "action '" .. tostring(next(arg_orders)) .. "'"
else
name = "main chunk"
end
end
line = colored.yellow(tostring(filename) .. ":" .. tostring(calling_fn.currentline) .. " in " .. tostring(name) .. "\n " .. tostring(offending_statement)) line = colored.yellow(tostring(filename) .. ":" .. tostring(calling_fn.currentline) .. " in " .. tostring(name) .. "\n " .. tostring(offending_statement))
else else
local file local file

176
nomsu.moon
View File

@ -13,17 +13,18 @@
lpeg = require 'lpeg' lpeg = require 'lpeg'
re = require 're' re = require 're'
lpeg.setmaxstack 10000 lpeg.setmaxstack 10000
{:P,:R,:V,:S,:Cg,:C,:Cp,:B,:Cmt,:Carg} = lpeg
utils = require 'utils' utils = require 'utils'
{:repr, :stringify, :min, :max, :equivalent, :set, :is_list, :sum} = utils {:repr, :stringify, :equivalent} = utils
colors = setmetatable({}, {__index:->""}) export colors, colored
export colored colors = require 'consolecolors'
colored = setmetatable({}, {__index:(_,color)-> ((msg)-> colors[color]..tostring(msg or '')..colors.reset)}) colored = setmetatable({}, {__index:(_,color)-> ((msg)-> colors[color]..tostring(msg or '')..colors.reset)})
{:insert, :remove, :concat} = table {:insert, :remove, :concat} = table
unpack or= table.unpack unpack or= table.unpack
{:match, :sub, :rep, :gsub, :format, :byte, :match, :find} = string {:match, :sub, :rep, :gsub, :format, :byte, :match, :find} = string
debug_getinfo = debug.getinfo debug_getinfo = debug.getinfo
{:NomsuCode, :LuaCode, :Source} = require "code_obj" {:NomsuCode, :LuaCode, :Source} = require "code_obj"
AST = require "nomsu_tree"
parse = require("parser")
STDIN, STDOUT, STDERR = "/dev/fd/0", "/dev/fd/1", "/dev/fd/2" STDIN, STDOUT, STDERR = "/dev/fd/0", "/dev/fd/1", "/dev/fd/2"
string.as_lua_id = (str)-> string.as_lua_id = (str)->
@ -40,15 +41,11 @@ string.as_lua_id = (str)->
return '_'..str return '_'..str
table.map = (fn)=> [fn(v) for _,v in ipairs(@)] table.map = (fn)=> [fn(v) for _,v in ipairs(@)]
table.fork = (t, values)-> setmetatable(values or {}, {__index:t})
-- TODO: -- TODO:
-- consider non-linear codegen, rather than doing thunks for things like comprehensions -- consider non-linear codegen, rather than doing thunks for things like comprehensions
-- type checking?
-- Add compiler options for optimization level (compile-fast vs. run-fast, etc.)
-- Do a pass on all actions to enforce parameters-are-nouns heuristic
-- Maybe do some sort of lazy definitions of actions that defer until they're used in code
-- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution -- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution
-- Maybe support some kind of regex action definitions like "foo %first (and %next)*"?
-- Re-implement nomsu-to-lua comment translation? -- Re-implement nomsu-to-lua comment translation?
export FILE_CACHE export FILE_CACHE
@ -84,11 +81,11 @@ all_files = (path)->
line_counter = re.compile([[ line_counter = re.compile([[
lines <- {| line (%nl line)* |} lines <- {| line (%nl line)* |}
line <- {} (!%nl .)* line <- {} (!%nl .)*
]], nl:P("\r")^-1 * P("\n")) ]], nl:lpeg.P("\r")^-1 * lpeg.P("\n"))
get_lines = re.compile([[ get_lines = re.compile([[
lines <- {| line (%nl line)* |} lines <- {| line (%nl line)* |}
line <- {[^%nl]*} line <- {[^%nl]*}
]], nl:P("\r")^-1 * P("\n")) ]], nl:lpeg.P("\r")^-1 * lpeg.P("\n"))
-- Mapping from line number -> character offset -- Mapping from line number -> character offset
export LINE_STARTS export LINE_STARTS
-- LINE_STARTS is a mapping from strings to a table that maps line number to character positions -- LINE_STARTS is a mapping from strings to a table that maps line number to character positions
@ -104,6 +101,7 @@ LINE_STARTS = setmetatable {}, {
self[k] = line_starts self[k] = line_starts
return line_starts return line_starts
} }
export pos_to_line
pos_to_line = (str, pos)-> pos_to_line = (str, pos)->
line_starts = LINE_STARTS[str] line_starts = LINE_STARTS[str]
-- Binary search for line number of position -- Binary search for line number of position
@ -127,17 +125,17 @@ do
if type(i) == 'number' then return sub(@, i, i) if type(i) == 'number' then return sub(@, i, i)
elseif type(i) == 'table' then return sub(@, i[1], i[2]) elseif type(i) == 'table' then return sub(@, i[1], i[2])
AST = require "nomsu_tree" -- List and Dict classes to provide basic equality/tostring functionality for the tables
-- used in Nomsu. This way, they retain a notion of whether they were originally lists or dicts.
_list_mt = _list_mt =
__eq:utils.equivalent __eq:equivalent
-- Could consider adding a __newindex to enforce list-ness, but would hurt performance -- Could consider adding a __newindex to enforce list-ness, but would hurt performance
__tostring: => __tostring: =>
"["..concat([repr(b) for b in *@], ", ").."]" "["..concat([repr(b) for b in *@], ", ").."]"
list = (t)-> setmetatable(t, _list_mt) list = (t)-> setmetatable(t, _list_mt)
_dict_mt = _dict_mt =
__eq:utils.equivalent __eq:equivalent
__tostring: => __tostring: =>
"{"..concat(["#{repr(k)}: #{repr(v)}" for k,v in pairs @], ", ").."}" "{"..concat(["#{repr(k)}: #{repr(v)}" for k,v in pairs @], ", ").."}"
dict = (t)-> setmetatable(t, _dict_mt) dict = (t)-> setmetatable(t, _dict_mt)
@ -147,7 +145,6 @@ NomsuCompiler = setmetatable({}, {__index: (k)=> if _self = rawget(@, "self") th
with NomsuCompiler with NomsuCompiler
._ENV = NomsuCompiler ._ENV = NomsuCompiler
.nomsu = NomsuCompiler .nomsu = NomsuCompiler
parse = require("parser")
.parse = (...)=> parse(...) .parse = (...)=> parse(...)
-- Mapping from source string (e.g. "@core/metaprogramming.nom[1:100]") to a mapping -- Mapping from source string (e.g. "@core/metaprogramming.nom[1:100]") to a mapping
@ -170,7 +167,6 @@ with NomsuCompiler
.LuaCode = LuaCode .LuaCode = LuaCode
.NomsuCode = NomsuCode .NomsuCode = NomsuCode
.Source = Source .Source = Source
.ARG_ORDERS = setmetatable({}, {__mode:"k"})
.ALIASES = setmetatable({}, {__mode:"k"}) .ALIASES = setmetatable({}, {__mode:"k"})
.LOADED = {} .LOADED = {}
.AST = AST .AST = AST
@ -226,7 +222,7 @@ with NomsuCompiler
lua\append bit_lua lua\append bit_lua
.COMPILE_ACTIONS = setmetatable { .COMPILE_ACTIONS = setmetatable {
compile_math_expr: (tree, ...)=> ["# compile math expr #"]: (tree, ...)=>
lua = LuaCode.Value(tree.source) lua = LuaCode.Value(tree.source)
for i,tok in ipairs tree for i,tok in ipairs tree
if type(tok) == 'string' if type(tok) == 'string'
@ -234,8 +230,7 @@ with NomsuCompiler
else else
tok_lua = @compile(tok) tok_lua = @compile(tok)
unless tok_lua.is_value unless tok_lua.is_value
@compile_error tok, @compile_error tok, "Non-expression value inside math expression:\n%s"
"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
@ -274,17 +269,17 @@ with NomsuCompiler
}, { }, {
__index: (stub)=> __index: (stub)=>
if math_expression\match(stub) if math_expression\match(stub)
return @compile_math_expr return @["# compile math expr #"]
} }
.fork = =>
setmetatable({COMPILE_ACTIONS:setmetatable({}, {__index:@COMPILE_ACTIONS})}, {__index:@})
.run = (to_run, source=nil)=> .run = (to_run, source=nil)=>
tree = if AST.is_syntax_tree(to_run) then tree else @parse(to_run, source or to_run.source) tree = if AST.is_syntax_tree(to_run) then tree else @parse(to_run, source or to_run.source)
if tree == nil -- Happens if pattern matches, but there are no captures, e.g. an empty string if tree == nil -- Happens if pattern matches, but there are no captures, e.g. an empty string
return nil return nil
if tree.type == "FileChunks" if tree.type == "FileChunks"
-- Each chunk's compilation is affected by the code in the previous chunks
-- (typically), so each chunk needs to compile and run before the next one
-- compiles.
ret = nil ret = nil
all_lua = {} all_lua = {}
for chunk in *tree for chunk in *tree
@ -310,28 +305,27 @@ with NomsuCompiler
return @LOADED[filename] return @LOADED[filename]
ret = nil ret = nil
for filename in all_files(filename) for filename in all_files(filename)
if @LOADED[filename] if ret = @LOADED[filename]
ret = @LOADED[filename]
continue continue
-- Check for circular import
for i,running in ipairs _running_files for i,running in ipairs _running_files
if running == filename if running == filename
loop = [_running_files[j] for j=i,#_running_files] loop = [_running_files[j] for j=i,#_running_files]
insert loop, filename insert loop, filename
error("Circular import, this loops forever: #{concat loop, " -> "}") error("Circular import, this loops forever: #{concat loop, " -> "}...")
insert _running_files, filename insert _running_files, filename
if match(filename, "%.lua$") if match(filename, "%.lua$")
file = assert(FILE_CACHE[filename], "Could not find file: #{filename}") file = assert(FILE_CACHE[filename], "Could not find file: #{filename}")
ret = @run_lua file, Source(filename, 1, #file) ret = @run_lua file, Source(filename, 1, #file)
elseif match(filename, "%.nom$") or match(filename, "^/dev/fd/[012]$") elseif match(filename, "%.nom$") or match(filename, "^/dev/fd/[012]$")
if not @skip_precompiled -- Look for precompiled version ran_lua = if not @skip_precompiled -- Look for precompiled version
lua_filename = gsub(filename, "%.nom$", ".lua") lua_filename = gsub(filename, "%.nom$", ".lua")
file = FILE_CACHE[lua_filename] if file = FILE_CACHE[lua_filename]
if file ret = @run_lua file, Source(lua_filename, 1, #file)
ret = @run_lua file, Source(filename, 1, #file) true
remove _running_files unless ran_lua
continue
file = file or FILE_CACHE[filename] file = file or FILE_CACHE[filename]
if not file if not file
error("File does not exist: #{filename}", 0) error("File does not exist: #{filename}", 0)
@ -348,11 +342,9 @@ with NomsuCompiler
lua_string = tostring(lua) lua_string = tostring(lua)
run_lua_fn, err = load(lua_string, nil and tostring(source or lua.source), "t", self) run_lua_fn, err = load(lua_string, nil and tostring(source or lua.source), "t", self)
if not run_lua_fn if not run_lua_fn
n = 1 line_numbered_lua = concat(
fn = -> [format("%3d|%s",i,line) for i, line in ipairs get_lines\match(lua_string)],
n = n + 1 "\n")
("\n%-3d|")\format(n)
line_numbered_lua = "1 |"..lua_string\gsub("\n", fn)
error("Failed to compile generated code:\n#{colored.bright colored.blue colored.onblack line_numbered_lua}\n\n#{err}", 0) error("Failed to compile generated code:\n#{colored.bright colored.blue colored.onblack line_numbered_lua}\n\n#{err}", 0)
source_key = tostring(source or lua.source) source_key = tostring(source or lua.source)
unless @source_map[source_key] unless @source_map[source_key]
@ -381,14 +373,11 @@ with NomsuCompiler
return run_lua_fn! return run_lua_fn!
.compile = (tree)=> .compile = (tree)=>
assert(LuaCode)
switch tree.type switch tree.type
when "Action" when "Action"
stub = tree.stub stub = tree.stub
if compile_action = @COMPILE_ACTIONS[stub] if compile_action = @COMPILE_ACTIONS[stub]
args = [arg for arg in *tree when type(arg) != "string"] args = [arg for arg in *tree when type(arg) != "string"]
if arg_orders = @ARG_ORDERS[stub]
args = [args[p] for p in *arg_orders]
-- 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))
@ -397,28 +386,7 @@ with NomsuCompiler
"Compile-time action:\n%s\nfailed to produce any Lua" "Compile-time action:\n%s\nfailed to produce any Lua"
return ret return ret
action = @['A'..string.as_lua_id(stub)] lua = LuaCode.Value(tree.source, "A",string.as_lua_id(stub),"(")
lua = LuaCode.Value(tree.source)
if not action and math_expression\match(stub)
-- This is a bit of a hack, but this code handles arbitrarily complex
-- math expressions like 2*x + 3^2 without having to define a single
-- action for every possibility.
for i,tok in ipairs tree
if type(tok) == 'string'
lua\append tok
else
tok_lua = @compile(tok)
unless tok_lua.is_value
@compile_error tok,
"Non-expression value inside math expression:\n%s"
if tok.type == "Action"
tok_lua\parenthesize!
lua\append tok_lua
if i < #tree
lua\append " "
return lua
args = {} args = {}
for i, tok in ipairs tree for i, tok in ipairs tree
if type(tok) == "string" then continue if type(tok) == "string" then continue
@ -428,15 +396,7 @@ with NomsuCompiler
"Cannot use:\n%s\nas an argument to %s, since it's not an expression, it produces: %s", "Cannot use:\n%s\nas an argument to %s, since it's not an expression, it produces: %s",
stub, repr arg_lua stub, repr arg_lua
insert args, arg_lua insert args, arg_lua
lua\concat_append args, ", "
if action
if arg_orders = @ARG_ORDERS[stub]
args = [args[p] for p in *arg_orders]
lua\append "A",string.as_lua_id(stub),"("
for i, arg in ipairs args
lua\append arg
if i < #args then lua\append ", "
lua\append ")" lua\append ")"
return lua return lua
@ -450,11 +410,7 @@ with NomsuCompiler
when "Block" when "Block"
lua = LuaCode(tree.source) lua = LuaCode(tree.source)
for i,line in ipairs tree lua\concat_append([@compile(line)\as_statements! for line in *tree], "\n")
line_lua = @compile(line)
if i > 1
lua\append "\n"
lua\append line_lua\as_statements!
return lua return lua
when "Text" when "Text"
@ -489,49 +445,20 @@ with NomsuCompiler
when "List" when "List"
lua = LuaCode.Value tree.source, "list{" lua = LuaCode.Value tree.source, "list{"
line_length = 0 items = {}
for i, item in ipairs tree for i, item in ipairs tree
item_lua = @compile(item) item_lua = @compile(item)
unless item_lua.is_value unless item_lua.is_value
@compile_error item, @compile_error item,
"Cannot use:\n%s\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 items[i] = item_lua
item_string = tostring(item_lua) lua\concat_append(items, ", ", ",\n ")
last_line = match(item_string, "[^\n]*$")
if match(item_string, "\n")
line_length = #last_line
else
line_length += #last_line
if i < #tree
if line_length >= MAX_LINE
lua\append ",\n "
line_length = 0
else
lua\append ", "
line_length += 2
lua\append "}" lua\append "}"
return lua return lua
when "Dict" when "Dict"
lua = LuaCode.Value tree.source, "dict{" lua = LuaCode.Value tree.source, "dict{"
line_length = 0 lua\concat_append([@compile(e) for e in *tree], ", ", ",\n ")
for i, entry in ipairs tree
entry_lua = @compile(entry)
lua\append entry_lua
entry_lua_str = tostring(entry_lua)
-- TODO: maybe make this more accurate? It's only a heuristic, so eh...
last_line = match(entry_lua_str, "\n([^\n]*)$")
if last_line
line_length = #last_line
else
line_length += #entry_lua_str
if i < #tree
if line_length >= MAX_LINE
lua\append ",\n "
line_length = 0
else
lua\append ", "
line_length += 2
lua\append "}" lua\append "}"
return lua return lua
@ -545,6 +472,7 @@ with NomsuCompiler
unless value_lua.is_value unless value_lua.is_value
@compile_error tree[2], @compile_error tree[2],
"Cannot use:\n%s\nas a dict value, since it's not an expression." "Cannot use:\n%s\nas a dict value, since it's not an expression."
-- TODO: support arbitrary words here, like operators and unicode
key_str = match(tostring(key_lua), [=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=]) key_str = match(tostring(key_lua), [=[["']([a-zA-Z_][a-zA-Z0-9_]*)['"]]=])
return if key_str return if key_str
LuaCode tree.source, key_str,"=",value_lua LuaCode tree.source, key_str,"=",value_lua
@ -589,11 +517,21 @@ with NomsuCompiler
when "Var" when "Var"
LuaCode.Value(tree.source, string.as_lua_id(tree[1])) LuaCode.Value(tree.source, string.as_lua_id(tree[1]))
when "FileChunks"
error("Cannot convert FileChunks to a single block of lua, since each chunk's "..
"compilation depends on the earlier chunks")
else else
error("Unknown type: #{tree.type}") error("Unknown type: #{tree.type}")
.tree_to_nomsu = (tree, inline=false, can_use_colon=false)=> .tree_to_nomsu = (tree, inline=false, can_use_colon=false)=>
switch tree.type switch tree.type
when "FileChunks"
return nil if inline
nomsu = NomsuCode(tree.source)
nomsu\concat_append [@tree_to_nomsu(c) for c in *tree], "\n#{("~")\rep(80)}\n"
return nomsu
when "Action" when "Action"
if inline if inline
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
@ -858,18 +796,9 @@ with NomsuCompiler
error("Unknown type: #{tree.type}") error("Unknown type: #{tree.type}")
-- Command line interface: -- Command line interface:
-- Only run this code if this file was run directly with command line arguments, and not require()'d: -- Only run this code if this file was run directly with command line arguments, and not require()'d:
if arg and debug_getinfo(2).func != require if arg and debug_getinfo(2).func != require
export colors
colors = require 'consolecolors'
parser = re.compile([[ parser = re.compile([[
args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} {:nomsu_args: {| ("--;" ({[^;]*} ";")*)? |} :} ";"? |} !. args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} {:nomsu_args: {| ("--;" ({[^;]*} ";")*)? |} :} ";"? |} !.
flag <- flag <-
@ -926,8 +855,7 @@ OPTIONS
else debug_getinfo(thread,f,what) else debug_getinfo(thread,f,what)
if not info or not info.func then return info if not info or not info.func then return info
if info.short_src or info.source or info.linedefine or info.currentline if info.short_src or info.source or info.linedefine or info.currentline
if arg_orders = nomsu.ARG_ORDERS[info.func] -- TODO: get name properly
info.name = next(arg_orders)
if map = nomsu.source_map[info.source] if map = nomsu.source_map[info.source]
if info.currentline if info.currentline
info.currentline = assert(map[info.currentline]) info.currentline = assert(map[info.currentline])
@ -981,10 +909,8 @@ OPTIONS
file = FILE_CACHE[filename]\sub(tonumber(start),tonumber(stop)) file = FILE_CACHE[filename]\sub(tonumber(start),tonumber(stop))
err_line = get_line(file, calling_fn.currentline)\sub(1,-2) err_line = get_line(file, calling_fn.currentline)\sub(1,-2)
offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)"))) offending_statement = colored.bright(colored.red(err_line\match("^[ ]*(.*)")))
if arg_orders = nomsu.ARG_ORDERS[calling_fn.func] -- TODO: get name properly
name = "action '#{next(arg_orders)}'" name = "action '#{calling_fn.name}'"
else
name = "main chunk"
line = colored.yellow("#{filename}:#{calling_fn.currentline} in #{name}\n #{offending_statement}") line = colored.yellow("#{filename}:#{calling_fn.currentline} in #{name}\n #{offending_statement}")
else else
ok, file = pcall ->FILE_CACHE[calling_fn.short_src] ok, file = pcall ->FILE_CACHE[calling_fn.short_src]

2
parser.lua
View File

@ -127,7 +127,7 @@ do
ident <- [a-zA-Z_][a-zA-Z0-9_]* ident <- [a-zA-Z_][a-zA-Z0-9_]*
comment <- "--" [^%nl]* comment <- "--" [^%nl]*
]]) ]])
local nomsu_peg = peg_tidier:match(FILE_CACHE["nomsu.peg"]) local nomsu_peg = peg_tidier:match(io.open("nomsu.peg"):read('*a'))
NOMSU_PATTERN = re.compile(nomsu_peg, NOMSU_DEFS) NOMSU_PATTERN = re.compile(nomsu_peg, NOMSU_DEFS)
end end
local parse local parse

3
parser.moon
View File

@ -67,7 +67,6 @@ NOMSU_DEFS = with {}
err_line = colored.white(err_line\sub(1, i))..colored.bright(colored.red(err_line\sub(i+1,i+1)))..colored.dim(err_line\sub(i+2,-1)) err_line = colored.white(err_line\sub(1, i))..colored.bright(colored.red(err_line\sub(i+1,i+1)))..colored.dim(err_line\sub(i+2,-1))
err_msg ..= "\n#{err_line}\n#{colored.red pointer}" err_msg ..= "\n#{err_line}\n#{colored.red pointer}"
if #next_line > 0 then err_msg ..= "\n"..colored.dim(next_line) if #next_line > 0 then err_msg ..= "\n"..colored.dim(next_line)
--error(err_msg)
seen_errors[start_pos] = err_msg seen_errors[start_pos] = err_msg
return true return true
@ -98,7 +97,7 @@ NOMSU_PATTERN = do
ident <- [a-zA-Z_][a-zA-Z0-9_]* ident <- [a-zA-Z_][a-zA-Z0-9_]*
comment <- "--" [^%nl]* comment <- "--" [^%nl]*
]] ]]
nomsu_peg = peg_tidier\match(FILE_CACHE["nomsu.peg"]) nomsu_peg = peg_tidier\match(io.open("nomsu.peg")\read('*a'))
re.compile(nomsu_peg, NOMSU_DEFS) re.compile(nomsu_peg, NOMSU_DEFS)
parse = (nomsu_code, source=nil)-> parse = (nomsu_code, source=nil)->