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

Fixed decompile issue with short actions not getting indented.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-09 17:43:06 -08:00
parent b236ad88a9
commit 6fa1cb23d1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nomsu_decompiler.lua
View File

@ -287,8 +287,12 @@ tree_to_nomsu = function(tree)
bit_nomsu:parenthesize() bit_nomsu:parenthesize()
end end
if next_space == " " and not bit_nomsu:is_multiline() and nomsu:trailing_line_len() + #bit_nomsu:text() > MAX_LINE then if next_space == " " and not bit_nomsu:is_multiline() and nomsu:trailing_line_len() + #bit_nomsu:text() > MAX_LINE then
if bit.type == 'Action' then
bit_nomsu = NomsuCode:from(bit.source, "(..)\n ", tree_to_nomsu(bit))
else
next_space = " \\\n.." next_space = " \\\n.."
end end
end
if not (next_space == " " and bit.type == "Block") then if not (next_space == " " and bit.type == "Block") then
nomsu:append(next_space) nomsu:append(next_space)
end end
@ -302,7 +306,7 @@ tree_to_nomsu = function(tree)
if tree[1].type == 'Block' and not nomsu:is_multiline() then if tree[1].type == 'Block' and not nomsu:is_multiline() then
nomsu:parenthesize() nomsu:parenthesize()
end end
return NomsuCode(tree.source, "\\", nomsu) return NomsuCode:from(tree.source, "\\", nomsu)
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
local line_nomsu = tree_to_nomsu(line) local line_nomsu = tree_to_nomsu(line)

5
nomsu_decompiler.moon
View File

@ -217,6 +217,9 @@ tree_to_nomsu = (tree)->
bit_nomsu\parenthesize! bit_nomsu\parenthesize!
if next_space == " " and not bit_nomsu\is_multiline! and nomsu\trailing_line_len! + #bit_nomsu\text! > MAX_LINE if next_space == " " and not bit_nomsu\is_multiline! and nomsu\trailing_line_len! + #bit_nomsu\text! > MAX_LINE
if bit.type == 'Action'
bit_nomsu = NomsuCode\from bit.source, "(..)\n ", tree_to_nomsu(bit)
else
next_space = " \\\n.." next_space = " \\\n.."
unless next_space == " " and bit.type == "Block" unless next_space == " " and bit.type == "Block"
nomsu\append next_space nomsu\append next_space
@ -230,7 +233,7 @@ tree_to_nomsu = (tree)->
nomsu = recurse(tree[1]) nomsu = recurse(tree[1])
if tree[1].type == 'Block' and not nomsu\is_multiline! if tree[1].type == 'Block' and not nomsu\is_multiline!
nomsu\parenthesize! nomsu\parenthesize!
return NomsuCode tree.source, "\\", nomsu return NomsuCode\from tree.source, "\\", nomsu
when "Block" when "Block"
for i, line in ipairs tree for i, line in ipairs tree