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

Added support for compile actions returning syntax trees, which will get

Browse Source 
recompiled until they produce Lua code.
This commit is contained in:
Bruce Hill 2018-09-16 17:52:59 -07:00
parent f225a48367
commit e3bf10196a
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nomsu_compiler.lua
View File

@ -617,7 +617,7 @@ do
end end
NomsuCompiler.run_lua = function(self, lua) NomsuCompiler.run_lua = function(self, lua)
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.environment) local run_lua_fn, err = load(lua_string, tostring(source or lua.source), "t", self.environment)
if not run_lua_fn then if not run_lua_fn then
local line_numbered_lua = concat((function() local line_numbered_lua = concat((function()
local _accum_0 = { } local _accum_0 = { }
@ -702,9 +702,18 @@ do
args = _accum_0 args = _accum_0
end end
local ret = compile_action(self, tree, unpack(args)) local ret = compile_action(self, tree, unpack(args))
if not ret then if ret == nil then
local info = debug.getinfo(compile_action, "S") local info = debug.getinfo(compile_action, "S")
self:compile_error(tree, "The compile-time action here (" .. tostring(stub) .. ") failed to produce any Lua", "Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(info.short_src:sub(1, 200)) .. ":" .. tostring(info.linedefined) .. " and make sure it's returning Lua code.") local filename = Source:from_string(info.source).filename
self:compile_error(tree, "The compile-time action here (" .. tostring(stub) .. ") failed to return any value.", "Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(filename) .. ":" .. tostring(info.linedefined) .. " and make sure it's returning something.")
end
if AST.is_syntax_tree(ret) then
if ret == tree then
local info = debug.getinfo(compile_action, "S")
local filename = Source:from_string(info.source).filename
self:compile_error(tree, "The compile-time action here (" .. tostring(stub) .. ") is producing an endless loop.", "Look at the implementation of (" .. tostring(stub) .. ") in " .. tostring(filename) .. ":" .. tostring(info.linedefined) .. " and make sure it's not just returning the original tree.")
end
return self:compile(ret, compile_actions)
end end
return ret return ret
end end

17
nomsu_compiler.moon
View File

@ -355,7 +355,7 @@ with NomsuCompiler
.run_lua = (lua)=> .run_lua = (lua)=>
lua_string = tostring(lua) lua_string = tostring(lua)
run_lua_fn, err = load(lua_string, nil and tostring(source or lua.source), "t", @environment) run_lua_fn, err = load(lua_string, tostring(source or lua.source), "t", @environment)
if not run_lua_fn if not run_lua_fn
line_numbered_lua = concat( line_numbered_lua = concat(
[format("%3d|%s",i,line) for i, line in ipairs Files.get_lines(lua_string)], [format("%3d|%s",i,line) for i, line in ipairs Files.get_lines(lua_string)],
@ -403,11 +403,20 @@ with NomsuCompiler
-- 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 ret == nil
info = debug.getinfo(compile_action, "S") info = debug.getinfo(compile_action, "S")
filename = Source\from_string(info.source).filename
@compile_error tree, @compile_error tree,
"The compile-time action here (#{stub}) failed to produce any Lua", "The compile-time action here (#{stub}) failed to return any value.",
"Look at the implementation of (#{stub}) in #{info.short_src\sub(1,200)}:#{info.linedefined} and make sure it's returning Lua code." "Look at the implementation of (#{stub}) in #{filename}:#{info.linedefined} and make sure it's returning something."
if AST.is_syntax_tree(ret)
if ret == tree
info = debug.getinfo(compile_action, "S")
filename = Source\from_string(info.source).filename
@compile_error tree,
"The compile-time action here (#{stub}) is producing an endless loop.",
"Look at the implementation of (#{stub}) in #{filename}:#{info.linedefined} and make sure it's not just returning the original tree."
return @compile(ret, compile_actions)
return ret return ret
lua = LuaCode.Value(tree.source) lua = LuaCode.Value(tree.source)