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

Fixed improperly handling locals of a block.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-25 18:07:41 -08:00
parent 6668918b2e
commit fb22ba11ac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nomsu.lua
View File

@ -897,14 +897,15 @@ do
local lua = self:tree_to_lua(arg) local lua = self:tree_to_lua(arg)
if #tree.value == 1 and lua.expr and not lua.statements then if #tree.value == 1 and lua.expr and not lua.statements then
return { return {
expr = lua.expr expr = lua.expr,
locals = lua.locals
} }
end end
if lua.locals then if lua.locals then
local _list_1 = lua.locals local _list_1 = lua.locals
for _index_1 = 1, #_list_1 do for _index_1 = 1, #_list_1 do
local l = _list_1[_index_1] local l = _list_1[_index_1]
locals[l] = true table.insert(locals, l)
end end
end end
if lua.statements then if lua.statements then

4
nomsu.moon
View File

@ -642,9 +642,9 @@ class NomsuCompiler
for arg in *tree.value for arg in *tree.value
lua = @tree_to_lua arg lua = @tree_to_lua arg
if #tree.value == 1 and lua.expr and not lua.statements if #tree.value == 1 and lua.expr and not lua.statements
return expr:lua.expr return {expr:lua.expr, locals:lua.locals}
if lua.locals if lua.locals
for l in *lua.locals do locals[l] = true for l in *lua.locals do table.insert(locals, l)
if lua.statements then insert lua_bits, lua.statements if lua.statements then insert lua_bits, lua.statements
elseif lua.expr then insert lua_bits, "#{lua.expr};" elseif lua.expr then insert lua_bits, "#{lua.expr};"
utils.deduplicate(locals) utils.deduplicate(locals)