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

Fix for codegen of Set-style dicts.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-12 14:08:42 -08:00
parent a84242b849
commit 367cfa19db
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nomsu_decompiler.lua
View File

@ -149,9 +149,8 @@ tree_to_inline_nomsu = function(tree)
if key.type == "Action" or key.type == "Block" then if key.type == "Action" or key.type == "Block" then
nomsu:parenthesize() nomsu:parenthesize()
end end
assert(value.type ~= "Block", "Didn't expect to find a Block as a value in a dict")
nomsu:append(": ")
if value then if value then
nomsu:append(": ")
local value_nomsu = tree_to_inline_nomsu(value) local value_nomsu = tree_to_inline_nomsu(value)
if value.type == "Block" then if value.type == "Block" then
value_nomsu:parenthesize() value_nomsu:parenthesize()
@ -442,11 +441,13 @@ tree_to_nomsu = function(tree)
if key.type == "Block" then if key.type == "Block" then
nomsu:parenthesize() nomsu:parenthesize()
end end
local value_nomsu = tree_to_nomsu(value) if value then
if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu:is_multiline() then local value_nomsu = tree_to_nomsu(value)
value_nomsu:parenthesize() if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu:is_multiline() then
value_nomsu:parenthesize()
end
nomsu:append(": ", value_nomsu)
end end
nomsu:append(": ", value_nomsu)
return nomsu return nomsu
elseif "Comment" == _exp_0 then elseif "Comment" == _exp_0 then
nomsu:append("#", (tree[1]:gsub("\n", "\n "))) nomsu:append("#", (tree[1]:gsub("\n", "\n ")))

12
nomsu_decompiler.moon
View File

@ -107,9 +107,8 @@ tree_to_inline_nomsu = (tree)->
NomsuCode\from(key.source, key[1]) NomsuCode\from(key.source, key[1])
else tree_to_inline_nomsu(key) else tree_to_inline_nomsu(key)
nomsu\parenthesize! if key.type == "Action" or key.type == "Block" nomsu\parenthesize! if key.type == "Action" or key.type == "Block"
assert(value.type != "Block", "Didn't expect to find a Block as a value in a dict")
nomsu\append ": "
if value if value
nomsu\append ": "
value_nomsu = tree_to_inline_nomsu(value) value_nomsu = tree_to_inline_nomsu(value)
value_nomsu\parenthesize! if value.type == "Block" value_nomsu\parenthesize! if value.type == "Block"
nomsu\append value_nomsu nomsu\append value_nomsu
@ -345,10 +344,11 @@ tree_to_nomsu = (tree)->
NomsuCode\from(key.source, key[1]) NomsuCode\from(key.source, key[1])
else tree_to_inline_nomsu(key) else tree_to_inline_nomsu(key)
nomsu\parenthesize! if key.type == "Block" nomsu\parenthesize! if key.type == "Block"
value_nomsu = tree_to_nomsu(value) if value
if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu\is_multiline! value_nomsu = tree_to_nomsu(value)
value_nomsu\parenthesize! if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu\is_multiline!
nomsu\append ": ", value_nomsu value_nomsu\parenthesize!
nomsu\append ": ", value_nomsu
return nomsu return nomsu
when "Comment" when "Comment"