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

Improvements for parenthesization of escaped nomsu.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-09 17:20:36 -08:00
parent fa3f598fc3
commit d6f33ab194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nomsu_decompiler.lua
View File

@ -265,7 +265,7 @@ tree_to_nomsu = function(tree)
local next_space = "" local next_space = ""
if tree.target then if tree.target then
local target_nomsu = recurse(tree.target) local target_nomsu = recurse(tree.target)
if (tree.target.type == "Block" or tree.target.type == "EscapedNomsu") and not target_nomsu:is_multiline() then if tree.target.type == "Block" and not target_nomsu:is_multiline() then
target_nomsu:parenthesize() target_nomsu:parenthesize()
end end
nomsu:append(target_nomsu) nomsu:append(target_nomsu)
@ -280,7 +280,7 @@ tree_to_nomsu = function(tree)
next_space = nomsu:trailing_line_len() > MAX_LINE and " \\\n.." or " " next_space = nomsu:trailing_line_len() > MAX_LINE and " \\\n.." or " "
else else
local bit_nomsu = recurse(bit) local bit_nomsu = recurse(bit)
if i < #tree and (bit.type == "Block" or bit.type == "EscapedNomsu") and not bit_nomsu:is_multiline() then if i < #tree and bit.type == "Block" and not bit_nomsu:is_multiline() then
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
@ -295,7 +295,11 @@ tree_to_nomsu = function(tree)
end end
return nomsu return nomsu
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
return NomsuCode(tree.source, "\\", recurse(tree[1])) nomsu = recurse(tree[1])
if tree[1].type == 'Block' and not nomsu:is_multiline() then
nomsu:parenthesize()
end
return NomsuCode(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)
@ -367,8 +371,6 @@ tree_to_nomsu = function(tree)
local item_nomsu = tree_to_inline_nomsu(item) local item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu:text() > MAX_LINE then if #item_nomsu:text() > MAX_LINE then
item_nomsu = recurse(item) item_nomsu = recurse(item)
elseif item.type == "Block" or item.type == "EscapedNomsu" then
item_nomsu:parenthesize()
end end
nomsu:append(item_nomsu) nomsu:append(item_nomsu)
if i < #tree then if i < #tree then

11
nomsu_decompiler.moon
View File

@ -198,7 +198,7 @@ tree_to_nomsu = (tree)->
next_space = "" next_space = ""
if tree.target if tree.target
target_nomsu = recurse(tree.target) target_nomsu = recurse(tree.target)
if (tree.target.type == "Block" or tree.target.type == "EscapedNomsu") and not target_nomsu\is_multiline! if tree.target.type == "Block" and not target_nomsu\is_multiline!
target_nomsu\parenthesize! target_nomsu\parenthesize!
nomsu\append target_nomsu nomsu\append target_nomsu
nomsu\append(target_nomsu\is_multiline! and "\n..::" or "::") nomsu\append(target_nomsu\is_multiline! and "\n..::" or "::")
@ -211,7 +211,7 @@ tree_to_nomsu = (tree)->
next_space = nomsu\trailing_line_len! > MAX_LINE and " \\\n.." or " " next_space = nomsu\trailing_line_len! > MAX_LINE and " \\\n.." or " "
else else
bit_nomsu = recurse(bit) bit_nomsu = recurse(bit)
if i < #tree and (bit.type == "Block" or bit.type == "EscapedNomsu") and not bit_nomsu\is_multiline! if i < #tree and bit.type == "Block" and not bit_nomsu\is_multiline!
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
@ -225,7 +225,10 @@ tree_to_nomsu = (tree)->
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
return NomsuCode tree.source, "\\", recurse(tree[1]) nomsu = recurse(tree[1])
if tree[1].type == 'Block' and not nomsu\is_multiline!
nomsu\parenthesize!
return NomsuCode tree.source, "\\", nomsu
when "Block" when "Block"
for i, line in ipairs tree for i, line in ipairs tree
@ -284,8 +287,6 @@ tree_to_nomsu = (tree)->
item_nomsu = tree_to_inline_nomsu(item) item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu\text! > MAX_LINE if #item_nomsu\text! > MAX_LINE
item_nomsu = recurse(item) item_nomsu = recurse(item)
elseif item.type == "Block" or item.type == "EscapedNomsu"
item_nomsu\parenthesize!
nomsu\append item_nomsu nomsu\append item_nomsu
if i < #tree if i < #tree
nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ') nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')