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

10
nomsu_compiler.lua
View File

@ -687,9 +687,8 @@ do
local _exp_0 = tree.type
if "Action" == _exp_0 then
local stub = tree.stub
do
local compile_action = compile_actions[stub]
if compile_action then
if compile_action and not tree.target then
local args
do
local _accum_0 = { }
@ -719,7 +718,6 @@ do
end
return ret
end
end
local lua = LuaCode.Value(tree.source)
if tree.target then
local target_lua = self:compile(tree.target, compile_actions)
@ -929,7 +927,7 @@ do
self:compile_error(tree[2], "Can't use this as a dict value, since it's not an expression.")
end
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)
elseif sub(tostring(key_lua), 1, 1) == "[" then
return LuaCode(tree.source, "[ ", key_lua, "]=", value_lua)
@ -952,9 +950,8 @@ do
self:compile_error(key, "Can't use this as an index, since it's not an expression.")
end
local key_lua_str = tostring(key_lua)
do
local lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
if lua_id then
if lua_id and lua_id:is_lua_id() then
lua:append("." .. tostring(lua_id))
elseif sub(key_lua_str, 1, 1) == '[' then
lua:append("[ ", key_lua, " ]")
@ -962,7 +959,6 @@ do
lua:append("[", key_lua, "]")
end
end
end
return lua
elseif "Number" == _exp_0 then
return LuaCode.Value(tree.source, tostring(tree[1]))

9
nomsu_compiler.moon
View File

@ -398,7 +398,8 @@ with NomsuCompiler
switch tree.type
when "Action"
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"]
-- Force Lua to avoid tail call optimization for debugging purposes
-- TODO: use tail call?
@ -551,9 +552,8 @@ with NomsuCompiler
unless value_lua.is_value
@compile_error tree[2],
"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_]*)['"]$]=])
return if key_str
return if key_str and key_str\is_lua_id!
LuaCode tree.source, key_str,"=",value_lua
elseif sub(tostring(key_lua),1,1) == "["
-- NOTE: this *must* use a space after the [ to avoid freaking out
@ -579,7 +579,8 @@ with NomsuCompiler
@compile_error key,
"Can't use this as an index, since it's not an expression."
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}"
elseif sub(key_lua_str,1,1) == '['
-- NOTE: this *must* use a space after the [ to avoid freaking out