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

Lots of optimizations.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-20 16:23:53 -07:00
parent 14bda2fb2d
commit dec5ee8262
7 changed files with 179 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/metaprogramming.nom
View File

@ -162,7 +162,7 @@ action [help %action]:
# Compiler tools # Compiler tools
immediately: immediately:
compile [run %code] to: compile [run %code] to:
Lua value "nomsu:run(Nomsu(\(=lua "tree.source"), \(%code as lua expr)))" Lua value "nomsu:run(Nomsu(\(=lua "tostring(tree.source)"), \(%code as lua expr)))"
parse [enable debugging] as: lua> "nomsu.debug = true;" parse [enable debugging] as: lua> "nomsu.debug = true;"
parse [disable debugging] as: lua> "nomsu.debug = false;" parse [disable debugging] as: lua> "nomsu.debug = false;"
@ -184,9 +184,10 @@ immediately:
immediately: immediately:
compile [source] to: Lua value (=lua "tree.source") "tree.source" compile [source] to: Lua value (=lua "tree.source") "tree.source"
immediately: #..
action [Lua %]: Lua (=lua "tree.source") % immediately:
action [Lua value %]: Lua value (=lua "tree.source") % action [Lua %]: Lua (=lua "tree.source") %
action [Lua value %]: Lua value (=lua "tree.source") %
# Return # Return
immediately: immediately:

68
lua_obj.lua
View File

@ -12,6 +12,9 @@ Source = immutable({
}, { }, {
name = "Source", name = "Source",
__new = function(self, filename, start, stop) __new = function(self, filename, start, stop)
if not start then
start, stop = 1, #FILE_CACHE[filename]
end
if stop then if stop then
assert(start <= stop, "Invalid range: " .. tostring(start) .. ", " .. tostring(stop)) assert(start <= stop, "Invalid range: " .. tostring(start) .. ", " .. tostring(stop))
end end
@ -158,6 +161,12 @@ do
self.source = Source(self.source, 1, #self + 1) self.source = Source(self.source, 1, #self + 1)
end end
end end
assert(self.source == nil or Source:is_instance(self.source))
local _list_0 = self.bits
for _index_0 = 1, #_list_0 do
local b = _list_0[_index_0]
assert(not Source:is_instance(b))
end
end, end,
__base = _base_0, __base = _base_0,
__name = "Code" __name = "Code"
@ -215,22 +224,25 @@ do
end end
removals[var] = true removals[var] = true
end end
local remove_from local stack = {
remove_from = function(self) self
for i = #self.free_vars, 1, -1 do }
if removals[self.free_vars[i]] then while #stack > 0 do
remove(self.free_vars, i) local lua
lua, stack[#stack] = stack[#stack], nil
for i = #lua.free_vars, 1, -1 do
if removals[lua.free_vars[i]] then
remove(lua.free_vars, i)
end end
end end
local _list_0 = self.bits local _list_0 = lua.bits
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local b = _list_0[_index_0] local b = _list_0[_index_0]
if type(b) ~= 'string' then if type(b) ~= 'string' then
remove_from(b) stack[#stack + 1] = b
end end
end end
end end
remove_from(self)
self.__str = nil self.__str = nil
end, end,
convert_to_statements = function(self, prefix, suffix) convert_to_statements = function(self, prefix, suffix)
@ -282,6 +294,19 @@ do
return self:prepend("local " .. tostring(concat(to_declare, ", ")) .. ";\n") return self:prepend("local " .. tostring(concat(to_declare, ", ")) .. ";\n")
end end
end, end,
stringify = function(self)
if self.__str == nil then
local buff = { }
for i, b in ipairs(self.bits) do
if type(b) ~= 'string' then
b = b:stringify()
end
buff[#buff + 1] = b
end
self.__str = concat(buff, "")
end
return self.__str
end,
__tostring = function(self) __tostring = function(self)
if self.__str == nil then if self.__str == nil then
local buff = { } local buff = { }
@ -329,32 +354,31 @@ do
self.__str = nil self.__str = nil
end, end,
make_offset_table = function(self) make_offset_table = function(self)
local lua_chunkname = tostring(self.source) .. ".lua" local lua_to_nomsu, nomsu_to_lua = { }, { }
local lua_str = tostring(self)
local metadata = {
nomsu_filename = self.source.filename,
lua_filename = lua_chunkname,
lua_file = lua_str,
lua_to_nomsu = { },
nomsu_to_lua = { }
}
local walk local walk
walk = function(lua, pos) walk = function(lua, pos)
local _list_0 = lua.bits local _list_0 = lua.bits
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local b = _list_0[_index_0] local b = _list_0[_index_0]
if type(b) == 'string' then if type(b) == 'string' then
local output = Source(lua_chunkname, pos, pos + #b) if lua.source then
metadata.lua_to_nomsu[output] = lua.source lua_to_nomsu[pos] = lua.source.start
metadata.nomsu_to_lua[lua.source] = output nomsu_to_lua[lua.source.start] = pos
end
else else
walk(b, pos, pos + #b) walk(b, pos)
end end
pos = pos + #b pos = pos + #b
end end
end end
walk(self, 1) walk(self, 1)
return lua_str, metadata return {
nomsu_filename = self.source.filename,
lua_filename = tostring(self.source) .. ".lua",
lua_file = self:stringify(),
lua_to_nomsu = lua_to_nomsu,
nomsu_to_lua = nomsu_to_lua
}
end, end,
parenthesize = function(self) parenthesize = function(self)
if self.is_value then if self.is_value then

52
lua_obj.moon
View File

@ -6,6 +6,8 @@ export LINE_STARTS
Source = immutable {"filename","start","stop"}, { Source = immutable {"filename","start","stop"}, {
name:"Source" name:"Source"
__new: (filename, start, stop)=> __new: (filename, start, stop)=>
if not start
start, stop = 1, #FILE_CACHE[filename]
if stop then assert(start <= stop, "Invalid range: #{start}, #{stop}") if stop then assert(start <= stop, "Invalid range: #{start}, #{stop}")
return filename, start, stop return filename, start, stop
__tostring: => __tostring: =>
@ -69,6 +71,9 @@ class Code
@source = Source(filename, tonumber(start), tonumber(stop)) @source = Source(filename, tonumber(start), tonumber(stop))
else else
@source = Source(@source, 1, #self+1) @source = Source(@source, 1, #self+1)
assert(@source == nil or Source\is_instance(@source))
for b in *@bits
assert(not Source\is_instance(b))
clone: => clone: =>
cls = @__class cls = @__class
@ -144,14 +149,16 @@ class Lua extends Code
elseif type(var) != 'string' elseif type(var) != 'string'
var = tostring(var) var = tostring(var)
removals[var] = true removals[var] = true
remove_from = =>
for i=#@free_vars,1,-1 stack = {self}
if removals[@free_vars[i]] while #stack > 0
remove @free_vars, i lua, stack[#stack] = stack[#stack], nil
for b in *@bits for i=#lua.free_vars,1,-1
if removals[lua.free_vars[i]]
remove lua.free_vars, i
for b in *lua.bits
if type(b) != 'string' if type(b) != 'string'
remove_from b stack[#stack+1] = b
remove_from self
@__str = nil @__str = nil
convert_to_statements: (prefix="", suffix=";")=> convert_to_statements: (prefix="", suffix=";")=>
@ -178,6 +185,15 @@ class Lua extends Code
if #to_declare > 0 if #to_declare > 0
@prepend "local #{concat to_declare, ", "};\n" @prepend "local #{concat to_declare, ", "};\n"
stringify: =>
if @__str == nil
buff = {}
for i,b in ipairs @bits
if type(b) != 'string'
b = b\stringify!
buff[#buff+1] = b
@__str = concat(buff, "")
return @__str
__tostring: => __tostring: =>
if @__str == nil if @__str == nil
buff = {} buff = {}
@ -218,24 +234,22 @@ class Lua extends Code
make_offset_table: => make_offset_table: =>
-- Return a mapping from output (lua) character number to input (nomsu) character number -- Return a mapping from output (lua) character number to input (nomsu) character number
lua_chunkname = tostring(@source)..".lua" lua_to_nomsu, nomsu_to_lua = {}, {}
lua_str = tostring(self)
metadata = {
nomsu_filename:@source.filename
lua_filename:lua_chunkname, lua_file:lua_str
lua_to_nomsu: {}, nomsu_to_lua: {}
}
walk = (lua, pos)-> walk = (lua, pos)->
for b in *lua.bits for b in *lua.bits
if type(b) == 'string' if type(b) == 'string'
output = Source(lua_chunkname, pos, pos+#b) if lua.source
metadata.lua_to_nomsu[output] = lua.source lua_to_nomsu[pos] = lua.source.start
metadata.nomsu_to_lua[lua.source] = output nomsu_to_lua[lua.source.start] = pos
else else
walk b, pos, pos+#b walk b, pos
pos += #b pos += #b
walk self, 1 walk self, 1
return lua_str, metadata return {
nomsu_filename:@source.filename
lua_filename:tostring(@source)..".lua", lua_file:@stringify!
:lua_to_nomsu, :nomsu_to_lua
}
parenthesize: => parenthesize: =>
if @is_value if @is_value

92
nomsu.lua
View File

@ -41,16 +41,10 @@ FILE_CACHE = setmetatable({ }, {
if not (file) then if not (file) then
return nil return nil
end end
local code = file:read("a"):sub(1, -2) local contents = file:read("a"):sub(1, -2)
file:close() file:close()
local source = Source(filename, 1, #code) self[filename] = contents
if filename:match("%.nom$") then return contents
code = Nomsu(source, code)
elseif filename:match("%.lua$") then
code = Lua(source, code)
end
self[filename] = code
return code
end end
}) })
local line_counter = re.compile([[ lines <- {| line (%nl line)* |} local line_counter = re.compile([[ lines <- {| line (%nl line)* |}
@ -188,7 +182,10 @@ setmetatable(NOMSU_DEFS, {
if type(value) == 'table' then if type(value) == 'table' then
error("Not a tuple: " .. tostring(repr(value))) error("Not a tuple: " .. tostring(repr(value)))
end end
local source = lpeg.userdata.source_code.source:sub(start, stop - 1) local source = lpeg.userdata.source_code.source
start = start + (source.start - 1)
stop = stop + (source.start - 1)
source = Source(source.filename, start, stop - 1)
local node = Types[key](value, source) local node = Types[key](value, source)
return node return node
end end
@ -330,8 +327,8 @@ do
if type(nomsu_code) == 'string' then if type(nomsu_code) == 'string' then
_nomsu_chunk_counter = _nomsu_chunk_counter + 1 _nomsu_chunk_counter = _nomsu_chunk_counter + 1
local filename = "<nomsu chunk #" .. tostring(_nomsu_chunk_counter) .. ">.nom" local filename = "<nomsu chunk #" .. tostring(_nomsu_chunk_counter) .. ">.nom"
nomsu_code = Nomsu(filename, nomsu_code)
FILE_CACHE[filename] = nomsu_code FILE_CACHE[filename] = nomsu_code
nomsu_code = Nomsu(filename, nomsu_code)
end end
local userdata = { local userdata = {
source_code = nomsu_code, source_code = nomsu_code,
@ -382,21 +379,21 @@ do
end end
if filename:match(".*%.lua") then if filename:match(".*%.lua") then
local file = assert(FILE_CACHE[filename], "Could not find file: " .. tostring(filename)) local file = assert(FILE_CACHE[filename], "Could not find file: " .. tostring(filename))
return self:run_lua(file) return self:run_lua(Lua(Source(filename), file))
end end
if filename:match(".*%.nom") then if filename:match(".*%.nom") then
if not self.skip_precompiled then if not self.skip_precompiled then
local lua_filename = filename:gsub("%.nom$", ".lua") local lua_filename = filename:gsub("%.nom$", ".lua")
local file = FILE_CACHE[lua_filename] local file = FILE_CACHE[lua_filename]
if file then if file then
return self:run_lua(file) return self:run_lua(Lua(Source(filename), file))
end end
end end
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
return self:run(file, compile_fn) return self:run(Nomsu(Source(filename), file), compile_fn)
else else
return error("Invalid filetype for " .. tostring(filename), 0) return error("Invalid filetype for " .. tostring(filename), 0)
end end
@ -427,8 +424,7 @@ do
end, end,
run_lua = function(self, lua) run_lua = function(self, 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)")
local lua_string, metadata = lua:make_offset_table() local lua_string = lua:stringify()
LUA_METADATA[metadata.lua_filename] = metadata
if rawget(FILE_CACHE, lua.source.filename) == nil then if rawget(FILE_CACHE, lua.source.filename) == nil then
FILE_CACHE[lua.source.filename] = lua_string FILE_CACHE[lua.source.filename] = lua_string
end end
@ -950,7 +946,7 @@ do
tree_with_replaced_vars = function(self, tree, replacements) tree_with_replaced_vars = function(self, tree, replacements)
return self:tree_map(tree, function(t) return self:tree_map(tree, function(t)
if t.type == "Var" then if t.type == "Var" then
local id = tostring(t:as_lua(self)) local id = t:as_lua(self):stringify()
if replacements[id] ~= nil then if replacements[id] ~= nil then
return replacements[id] return replacements[id]
end end
@ -1050,12 +1046,13 @@ do
nomsu:run_lua(lua) nomsu:run_lua(lua)
return Lua(self.source, "if IMMEDIATE then\n", lua, "\nend") return Lua(self.source, "if IMMEDIATE then\n", lua, "\nend")
end) end)
self:define_compile_action("Lua %source %code", get_line_no(), function(self, _source, _code) local add_lua_bits
if _code.type ~= "Text" then add_lua_bits = function(lua, code)
return Lua.Value(_source, "Lua(", repr(_code.source), ", ", nomsu:tree_to_lua(_code), ")") if code.type ~= "Text" then
lua:append(", ", code:as_lua(nomsu))
return
end end
local lua = Lua.Value(_source, "Lua(", repr(_code.source)) local _list_0 = code.value
local _list_0 = _code.value
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local bit = _list_0[_index_0] local bit = _list_0[_index_0]
lua:append(", ") lua:append(", ")
@ -1065,40 +1062,39 @@ do
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
local line, src = bit.source:get_line(), bit.source:get_text() local line, src = bit.source:get_line(), bit.source:get_text()
error(tostring(line) .. ": Cannot use " .. tostring(colored.yellow(src)) .. " as a string interpolation value, since it's not an expression.", 0) error(tostring(line) .. ": Cannot use " .. tostring(colored.yellow(src)) .. " as a string interpolation value, since it's not an expression.")
end end
lua:append(bit_lua) lua:append(bit_lua)
end end
end end
end
self:define_compile_action("Lua %code", get_line_no(), function(self, _code)
local lua = Lua.Value(self.source, "Lua(", tostring(_code.source))
add_lua_bits(lua, _code)
lua:append(")")
return lua
end)
self:define_compile_action("Lua %source %code", get_line_no(), function(self, _source, _code)
local lua = Lua.Value(self.source, "Lua(", _source:as_lua(nomsu))
add_lua_bits(lua, _code)
lua:append(")")
return lua
end)
self:define_compile_action("Lua value %code", get_line_no(), function(self, _code)
local lua = Lua.Value(self.source, "Lua.Value(", tostring(_code.source))
add_lua_bits(lua, _code)
lua:append(")") lua:append(")")
return lua return lua
end) end)
self:define_compile_action("Lua value %source %code", get_line_no(), function(self, _source, _code) self:define_compile_action("Lua value %source %code", get_line_no(), function(self, _source, _code)
if _code.type ~= "Text" then local lua = Lua.Value(self.source, "Lua.Value(", _source:as_lua(nomsu))
return Lua.Value(_source, "Lua.Value(", repr(_code.source), ", ", nomsu:tree_to_lua(_code), ")") add_lua_bits(lua, _code)
end
local lua = Lua.Value(_source, "Lua.Value(", repr(_code.source))
local _list_0 = _code.value
for _index_0 = 1, #_list_0 do
local bit = _list_0[_index_0]
lua:append(", ")
if type(bit) == "string" then
lua:append(repr(bit))
else
local bit_lua = nomsu:tree_to_lua(bit)
if not (bit_lua.is_value) then
local line, src = bit.source:get_line(), bit.source:get_text()
error(tostring(line) .. ": Cannot use " .. tostring(colored.yellow(src)) .. " as a string interpolation value, since it's not an expression.", 0)
end
lua:append(bit_lua)
end
end
lua:append(")") lua:append(")")
return lua return lua
end) end)
self:define_compile_action("lua> %code", get_line_no(), function(self, _code) self:define_compile_action("lua> %code", get_line_no(), function(self, _code)
if _code.type ~= "Text" then if _code.type ~= "Text" then
return Lua.Value(self.source, "nomsu:run_lua(Lua(", repr(_code.source), ", ", repr(tostring(nomsu:tree_to_lua(_code))), "))") return Lua.Value(self.source, "nomsu:run_lua(Lua(", repr(_code.source), ", ", repr(nomsu:tree_to_lua(_code):stringify()), "))")
end end
local lua = Lua(_code.source) local lua = Lua(_code.source)
local _list_0 = _code.value local _list_0 = _code.value
@ -1119,7 +1115,7 @@ do
end) end)
self:define_compile_action("=lua %code", get_line_no(), function(self, _code) self:define_compile_action("=lua %code", get_line_no(), function(self, _code)
if _code.type ~= "Text" then if _code.type ~= "Text" then
return Lua.Value(self.source, "nomsu:run_lua(Lua(", repr(_code.source), ", ", repr(tostring(nomsu:tree_to_lua(_code))), "))") return Lua.Value(self.source, "nomsu:run_lua(Lua(", repr(_code.source), ", ", repr(nomsu:tree_to_lua(_code):stringify()), "))")
end end
local lua = Lua.Value(self.source) local lua = Lua.Value(self.source)
local _list_0 = _code.value local _list_0 = _code.value
@ -1363,11 +1359,11 @@ if arg and debug_getinfo(2).func ~= require then
if args.flags["-p"] then if args.flags["-p"] then
nomsu.environment.print = function() end nomsu.environment.print = function() end
compile_fn = function(code) compile_fn = function(code)
return io.output():write("local IMMEDIATE = true;\n" .. tostring(code)) return io.output():write("local IMMEDIATE = true;\n" .. (code:stringify()))
end end
elseif args.output then elseif args.output then
compile_fn = function(code) compile_fn = function(code)
return io.open(args.output, 'w'):write("local IMMEDIATE = true;\n" .. tostring(code)) return io.open(args.output, 'w'):write("local IMMEDIATE = true;\n" .. (code:stringify()))
end end
end end
if args.input:match(".*%.lua") then if args.input:match(".*%.lua") then
@ -1422,10 +1418,8 @@ if arg and debug_getinfo(2).func ~= require then
return nil return nil
end end
end end
local nomsu_file = FILE_CACHE["nomsu.moon"] local nomsu_source = FILE_CACHE["nomsu.moon"]
local nomsu_source = nomsu_file:read("a")
local _, line_table = to_lua(nomsu_source) local _, line_table = to_lua(nomsu_source)
nomsu_file:close()
local level = 2 local level = 2
while true do while true do
local _continue_0 = false local _continue_0 = false

95
nomsu.moon
View File

@ -42,20 +42,15 @@ debug_getinfo = debug.getinfo
-- Re-implement nomsu-to-lua comment translation -- Re-implement nomsu-to-lua comment translation
export FILE_CACHE export FILE_CACHE
-- FILE_CACHE is a map from filename (string) -> file contents (Lua or Nomsu object) -- FILE_CACHE is a map from filename (string) -> string of file contents
FILE_CACHE = setmetatable {}, { FILE_CACHE = setmetatable {}, {
__index: (filename)=> __index: (filename)=>
file = io.open(filename) file = io.open(filename)
return nil unless file return nil unless file
code = file\read("a")\sub(1,-2) -- Lua appends trailing newline for no apparent reason. contents = file\read("a")\sub(1,-2) -- Lua appends trailing newline for no apparent reason.
file\close! file\close!
source = Source(filename, 1, #code) self[filename] = contents
if filename\match("%.nom$") return contents
code = Nomsu(source, code)
elseif filename\match("%.lua$")
code = Lua(source, code)
self[filename] = code
return code
} }
line_counter = re.compile([[ line_counter = re.compile([[
@ -173,7 +168,11 @@ NOMSU_DEFS = with {}
setmetatable(NOMSU_DEFS, {__index:(key)=> setmetatable(NOMSU_DEFS, {__index:(key)=>
make_node = (start, value, stop)-> make_node = (start, value, stop)->
if type(value) == 'table' then error("Not a tuple: #{repr value}")-- = Tuple(value) if type(value) == 'table' then error("Not a tuple: #{repr value}")-- = Tuple(value)
source = lpeg.userdata.source_code.source\sub(start,stop-1) --source = lpeg.userdata.source_code.source\sub(start,stop-1)
source = lpeg.userdata.source_code.source
start += source.start-1
stop += source.start-1
source = Source(source.filename, start, stop-1)
node = Types[key](value, source) node = Types[key](value, source)
return node return node
self[key] = make_node self[key] = make_node
@ -299,8 +298,8 @@ class NomsuCompiler
if type(nomsu_code) == 'string' if type(nomsu_code) == 'string'
_nomsu_chunk_counter += 1 _nomsu_chunk_counter += 1
filename = "<nomsu chunk ##{_nomsu_chunk_counter}>.nom" filename = "<nomsu chunk ##{_nomsu_chunk_counter}>.nom"
nomsu_code = Nomsu(filename, nomsu_code)
FILE_CACHE[filename] = nomsu_code FILE_CACHE[filename] = nomsu_code
nomsu_code = Nomsu(filename, nomsu_code)
userdata = { userdata = {
source_code:nomsu_code, indent_stack: {""} source_code:nomsu_code, indent_stack: {""}
} }
@ -338,17 +337,17 @@ class NomsuCompiler
if filename\match(".*%.lua") if filename\match(".*%.lua")
file = assert(FILE_CACHE[filename], "Could not find file: #{filename}") file = assert(FILE_CACHE[filename], "Could not find file: #{filename}")
return @run_lua(file) return @run_lua(Lua(Source(filename), file))
if filename\match(".*%.nom") if filename\match(".*%.nom")
if not @skip_precompiled -- Look for precompiled version if not @skip_precompiled -- Look for precompiled version
lua_filename = filename\gsub("%.nom$", ".lua") lua_filename = filename\gsub("%.nom$", ".lua")
file = FILE_CACHE[lua_filename] file = FILE_CACHE[lua_filename]
if file if file
return @run_lua(file) return @run_lua(Lua(Source(filename), file))
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)
return @run(file, compile_fn) return @run(Nomsu(Source(filename), file), compile_fn)
else else
error("Invalid filetype for #{filename}", 0) error("Invalid filetype for #{filename}", 0)
@ -366,8 +365,9 @@ class NomsuCompiler
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, metadata = lua\make_offset_table! lua_string = lua\stringify!
LUA_METADATA[metadata.lua_filename] = metadata --metadata = lua\make_offset_table!
--LUA_METADATA[metadata.lua_filename] = metadata
if rawget(FILE_CACHE, lua.source.filename) == nil if rawget(FILE_CACHE, lua.source.filename) == nil
FILE_CACHE[lua.source.filename] = lua_string FILE_CACHE[lua.source.filename] = lua_string
if rawget(FILE_CACHE, lua.source) == nil if rawget(FILE_CACHE, lua.source) == nil
@ -739,7 +739,7 @@ class NomsuCompiler
tree_with_replaced_vars: (tree, replacements)=> tree_with_replaced_vars: (tree, replacements)=>
return @tree_map tree, (t)-> return @tree_map tree, (t)->
if t.type == "Var" if t.type == "Var"
id = tostring(t\as_lua(self)) id = t\as_lua(self)\stringify!
if replacements[id] != nil if replacements[id] != nil
return replacements[id] return replacements[id]
@ -803,12 +803,11 @@ class NomsuCompiler
nomsu\run_lua(lua) nomsu\run_lua(lua)
return Lua(@source, "if IMMEDIATE then\n", lua, "\nend") return Lua(@source, "if IMMEDIATE then\n", lua, "\nend")
@define_compile_action "Lua %source %code", get_line_no!, (_source, _code)=> add_lua_bits = (lua, code)->
if _code.type != "Text" if code.type != "Text"
return Lua.Value(_source, "Lua(", repr(_code.source),", ",nomsu\tree_to_lua(_code),")") lua\append ", ", code\as_lua(nomsu)
return
lua = Lua.Value(_source, "Lua(", repr(_code.source)) for bit in *code.value
for bit in *_code.value
lua\append ", " lua\append ", "
if type(bit) == "string" if type(bit) == "string"
lua\append repr(bit) lua\append repr(bit)
@ -816,33 +815,37 @@ class NomsuCompiler
bit_lua = nomsu\tree_to_lua bit bit_lua = nomsu\tree_to_lua bit
unless bit_lua.is_value unless bit_lua.is_value
line, src = bit.source\get_line!, bit.source\get_text! line, src = bit.source\get_line!, bit.source\get_text!
error "#{line}: Cannot use #{colored.yellow src} as a string interpolation value, since it's not an expression.", 0 error "#{line}: Cannot use #{colored.yellow src} as a string interpolation value, since it's not an expression."
lua\append bit_lua lua\append bit_lua
@define_compile_action "Lua %code", get_line_no!, (_code)=>
lua = Lua.Value(@source, "Lua(", tostring(_code.source))
add_lua_bits(lua, _code)
lua\append ")"
return lua
@define_compile_action "Lua %source %code", get_line_no!, (_source, _code)=>
lua = Lua.Value(@source, "Lua(", _source\as_lua(nomsu))
add_lua_bits(lua, _code)
lua\append ")"
return lua
@define_compile_action "Lua value %code", get_line_no!, (_code)=>
lua = Lua.Value(@source, "Lua.Value(", tostring(_code.source))
add_lua_bits(lua, _code)
lua\append ")" lua\append ")"
return lua return lua
@define_compile_action "Lua value %source %code", get_line_no!, (_source, _code)=> @define_compile_action "Lua value %source %code", get_line_no!, (_source, _code)=>
if _code.type != "Text" lua = Lua.Value(@source, "Lua.Value(", _source\as_lua(nomsu))
return Lua.Value(_source, "Lua.Value(", repr(_code.source),", ",nomsu\tree_to_lua(_code),")") add_lua_bits(lua, _code)
lua = Lua.Value(_source, "Lua.Value(", repr(_code.source))
for bit in *_code.value
lua\append ", "
if type(bit) == "string"
lua\append repr(bit)
else
bit_lua = nomsu\tree_to_lua bit
unless bit_lua.is_value
line, src = bit.source\get_line!, bit.source\get_text!
error "#{line}: Cannot use #{colored.yellow src} as a string interpolation value, since it's not an expression.", 0
lua\append bit_lua
lua\append ")" lua\append ")"
return lua return lua
@define_compile_action "lua> %code", get_line_no!, (_code)=> @define_compile_action "lua> %code", get_line_no!, (_code)=>
if _code.type != "Text" if _code.type != "Text"
return Lua.Value @source, "nomsu:run_lua(Lua(",repr(_code.source), return Lua.Value @source, "nomsu:run_lua(Lua(",repr(_code.source),
", ",repr(tostring(nomsu\tree_to_lua(_code))),"))" ", ",repr(nomsu\tree_to_lua(_code)\stringify!),"))"
lua = Lua(_code.source) lua = Lua(_code.source)
for bit in *_code.value for bit in *_code.value
@ -859,7 +862,7 @@ class NomsuCompiler
@define_compile_action "=lua %code", get_line_no!, (_code)=> @define_compile_action "=lua %code", get_line_no!, (_code)=>
if _code.type != "Text" if _code.type != "Text"
return Lua.Value @source, "nomsu:run_lua(Lua(",repr(_code.source), return Lua.Value @source, "nomsu:run_lua(Lua(",repr(_code.source),
", ",repr(tostring(nomsu\tree_to_lua(_code))),"))" ", ",repr(nomsu\tree_to_lua(_code)\stringify!),"))"
lua = Lua.Value(@source) lua = Lua.Value(@source)
for bit in *_code.value for bit in *_code.value
@ -951,10 +954,10 @@ if arg and debug_getinfo(2).func != require
if args.flags["-p"] if args.flags["-p"]
nomsu.environment.print = -> nomsu.environment.print = ->
compile_fn = (code)-> compile_fn = (code)->
io.output!\write("local IMMEDIATE = true;\n"..tostring(code)) io.output!\write("local IMMEDIATE = true;\n"..(code\stringify!))
elseif args.output elseif args.output
compile_fn = (code)-> compile_fn = (code)->
io.open(args.output, 'w')\write("local IMMEDIATE = true;\n"..tostring(code)) io.open(args.output, 'w')\write("local IMMEDIATE = true;\n"..(code\stringify!))
if args.input\match(".*%.lua") if args.input\match(".*%.lua")
dofile(args.input)(nomsu, {}) dofile(args.input)(nomsu, {})
@ -996,10 +999,8 @@ if arg and debug_getinfo(2).func != require
ok, to_lua = pcall -> require('moonscript.base').to_lua ok, to_lua = pcall -> require('moonscript.base').to_lua
if not ok then to_lua = -> nil if not ok then to_lua = -> nil
nomsu_file = FILE_CACHE["nomsu.moon"] nomsu_source = FILE_CACHE["nomsu.moon"]
nomsu_source = nomsu_file\read("a")
_, line_table = to_lua(nomsu_source) _, line_table = to_lua(nomsu_source)
nomsu_file\close!
level = 2 level = 2
while true while true
@ -1046,7 +1047,11 @@ if arg and debug_getinfo(2).func != require
-- for both APIs -- for both APIs
-- TODO: revert back to old error handler -- TODO: revert back to old error handler
--ProFi = require 'ProFi'
--ProFi\start()
--require('ldt').guard run --require('ldt').guard run
xpcall(run, err_hand) xpcall(run, err_hand)
--ProFi\stop()
--ProFi\writeReport( 'MyProfilingReport.txt' )
return NomsuCompiler return NomsuCompiler

2
nomsu_tree.lua
View File

@ -131,7 +131,7 @@ Tree("Action", {
end end
args = new_args args = new_args
end end
local ret = action(Lua(self.source), unpack(args)) local ret = action(self, unpack(args))
return ret return ret
end end
local lua = Lua.Value(self.source) local lua = Lua.Value(self.source)

2
nomsu_tree.moon
View File

@ -79,7 +79,7 @@ Tree "Action",
new_args = [args[p-1] for p in *metadata.arg_orders[stub]] new_args = [args[p-1] for p in *metadata.arg_orders[stub]]
args = new_args args = new_args
-- Force Lua to avoid tail call optimization for debugging purposes -- Force Lua to avoid tail call optimization for debugging purposes
ret = action(Lua(@source), unpack(args)) ret = action(self, unpack(args))
return ret return ret
lua = Lua.Value(@source) lua = Lua.Value(@source)