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

Fixes for actions with targets colliding with compiler actions, and lua

Browse Source 
keywords as dict keys.
This commit is contained in:
Bruce Hill 2018-09-26 13:58:29 -07:00
parent dcff9ecfcf
commit 8a8940c9bc
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
nomsu_compiler.lua
View File

@ -687,38 +687,36 @@ do
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
do local compile_action = compile_actions[stub]
local compile_action = compile_actions[stub] if compile_action and not tree.target then
if compile_action then local args
local args do
do local _accum_0 = { }
local _accum_0 = { } local _len_0 = 1
local _len_0 = 1 for _index_0 = 1, #tree do
for _index_0 = 1, #tree do local arg = tree[_index_0]
local arg = tree[_index_0] if type(arg) ~= "string" then
if type(arg) ~= "string" then _accum_0[_len_0] = arg
_accum_0[_len_0] = arg _len_0 = _len_0 + 1
_len_0 = _len_0 + 1
end
end end
args = _accum_0
end end
local ret = compile_action(self, tree, unpack(args)) args = _accum_0
if ret == nil then end
local ret = compile_action(self, tree, unpack(args))
if ret == nil 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) .. ") 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 info = debug.getinfo(compile_action, "S")
local filename = Source:from_string(info.source).filename 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.") 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 end
if AST.is_syntax_tree(ret) then return self:compile(ret, compile_actions)
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
return ret
end end
return ret
end end
local lua = LuaCode.Value(tree.source) local lua = LuaCode.Value(tree.source)
if tree.target then if tree.target then
@ -929,7 +927,7 @@ do
self:compile_error(tree[2], "Can't use this as a dict value, since it's not an expression.") self:compile_error(tree[2], "Can't use this as a dict value, since it's not an expression.")
end end
local key_str = match(tostring(key_lua), [=[^["']([a-zA-Z_][a-zA-Z0-9_]*)['"]$]=]) local key_str = match(tostring(key_lua), [=[^["']([a-zA-Z_][a-zA-Z0-9_]*)['"]$]=])
if key_str then if key_str and key_str:is_lua_id() then
return LuaCode(tree.source, key_str, "=", value_lua) return LuaCode(tree.source, key_str, "=", value_lua)
elseif sub(tostring(key_lua), 1, 1) == "[" then elseif sub(tostring(key_lua), 1, 1) == "[" then
return LuaCode(tree.source, "[ ", key_lua, "]=", value_lua) return LuaCode(tree.source, "[ ", key_lua, "]=", value_lua)
@ -952,15 +950,13 @@ do
self:compile_error(key, "Can't use this as an index, since it's not an expression.") self:compile_error(key, "Can't use this as an index, since it's not an expression.")
end end
local key_lua_str = tostring(key_lua) local key_lua_str = tostring(key_lua)
do local lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
local lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$") if lua_id and lua_id:is_lua_id() then
if lua_id then lua:append("." .. tostring(lua_id))
lua:append("." .. tostring(lua_id)) elseif sub(key_lua_str, 1, 1) == '[' then
elseif sub(key_lua_str, 1, 1) == '[' then lua:append("[ ", key_lua, " ]")
lua:append("[ ", key_lua, " ]") else
else lua:append("[", key_lua, "]")
lua:append("[", key_lua, "]")
end
end end
end end
return lua return lua

9
nomsu_compiler.moon
View File

@ -398,7 +398,8 @@ with NomsuCompiler
switch tree.type switch tree.type
when "Action" when "Action"
stub = tree.stub stub = tree.stub
if compile_action = compile_actions[stub] compile_action = compile_actions[stub]
if compile_action and not tree.target
args = [arg for arg in *tree when type(arg) != "string"] args = [arg for arg in *tree when type(arg) != "string"]
-- 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?
@ -551,9 +552,8 @@ with NomsuCompiler
unless value_lua.is_value unless value_lua.is_value
@compile_error tree[2], @compile_error tree[2],
"Can't use this as a dict value, since it's not an expression." "Can't use this as 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 and key_str\is_lua_id!
LuaCode tree.source, key_str,"=",value_lua LuaCode tree.source, key_str,"=",value_lua
elseif sub(tostring(key_lua),1,1) == "[" elseif sub(tostring(key_lua),1,1) == "["
-- NOTE: this *must* use a space after the [ to avoid freaking out -- NOTE: this *must* use a space after the [ to avoid freaking out
@ -579,7 +579,8 @@ with NomsuCompiler
@compile_error key, @compile_error key,
"Can't use this as an index, since it's not an expression." "Can't use this as an index, since it's not an expression."
key_lua_str = tostring(key_lua) key_lua_str = tostring(key_lua)
if lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$") lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
if lua_id and lua_id\is_lua_id!
lua\append ".#{lua_id}" lua\append ".#{lua_id}"
elseif sub(key_lua_str,1,1) == '[' elseif sub(key_lua_str,1,1) == '['
-- NOTE: this *must* use a space after the [ to avoid freaking out -- NOTE: this *must* use a space after the [ to avoid freaking out