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

Fix for no-arg functioncalls of expressions (e.g. $fn()), and line

Browse Source 
wrapping of list/dicts.
This commit is contained in:
Bruce Hill 2019-01-07 21:39:23 -08:00
parent 5f961d32c4
commit 80167c9df2
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nomsu_decompiler.lua
View File

@ -49,9 +49,10 @@ tree_to_inline_nomsu = function(tree)
local _exp_0 = tree.type local _exp_0 = tree.type
if "Action" == _exp_0 then if "Action" == _exp_0 then
local nomsu = NomsuCode:from(tree.source) local nomsu = NomsuCode:from(tree.source)
local num_args = 0 local num_args, num_words = 0, 0
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == "string" then if type(bit) == "string" then
num_words = num_words + 1
local clump_words local clump_words
if type(tree[i - 1]) == 'string' then if type(tree[i - 1]) == 'string' then
clump_words = is_operator(bit) ~= is_operator(tree[i - 1]) clump_words = is_operator(bit) ~= is_operator(tree[i - 1])
@ -83,6 +84,9 @@ tree_to_inline_nomsu = function(tree)
nomsu:add(arg_nomsu) nomsu:add(arg_nomsu)
end end
end end
if num_args == 1 and num_words == 0 then
nomsu:append("()")
end
return nomsu return nomsu
elseif "MethodCall" == _exp_0 then elseif "MethodCall" == _exp_0 then
local target_nomsu = tree_to_inline_nomsu(tree[1]) local target_nomsu = tree_to_inline_nomsu(tree[1])
@ -355,11 +359,12 @@ tree_to_nomsu = function(tree)
elseif "Action" == _exp_0 then elseif "Action" == _exp_0 then
local next_space = "" local next_space = ""
local word_buffer = { } local word_buffer = { }
local num_args = 0 local num_args, num_words = 0, 0
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
local _continue_0 = false local _continue_0 = false
repeat repeat
if type(bit) == "string" then if type(bit) == "string" then
num_words = num_words + 1
if #word_buffer > 0 and is_operator(bit) == is_operator(word_buffer[#word_buffer]) then if #word_buffer > 0 and is_operator(bit) == is_operator(word_buffer[#word_buffer]) then
table.insert(word_buffer, " ") table.insert(word_buffer, " ")
end end
@ -425,6 +430,12 @@ tree_to_nomsu = function(tree)
nomsu:add(next_space, words) nomsu:add(next_space, words)
next_space = " " next_space = " "
end end
if num_args == 1 and num_words == 0 then
if next_space ~= " " then
nomsu:append(next_space)
end
nomsu:append("()")
end
return nomsu return nomsu
elseif "MethodCall" == _exp_0 then elseif "MethodCall" == _exp_0 then
local target_nomsu = recurse(tree[1]) local target_nomsu = recurse(tree[1])
@ -575,7 +586,7 @@ tree_to_nomsu = function(tree)
end end
else else
item_nomsu = tree_to_inline_nomsu(item) item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu:text() > MAX_LINE then if nomsu:trailing_line_len() + #item_nomsu:text() > MAX_LINE then
if i > 1 then if i > 1 then
sep = '\n' sep = '\n'
end end

14
nomsu_decompiler.moon
View File

@ -33,9 +33,10 @@ tree_to_inline_nomsu = (tree)->
switch tree.type switch tree.type
when "Action" when "Action"
nomsu = NomsuCode\from(tree.source) nomsu = NomsuCode\from(tree.source)
num_args = 0 num_args, num_words = 0, 0
for i,bit in ipairs tree for i,bit in ipairs tree
if type(bit) == "string" if type(bit) == "string"
num_words += 1
clump_words = if type(tree[i-1]) == 'string' clump_words = if type(tree[i-1]) == 'string'
is_operator(bit) != is_operator(tree[i-1]) is_operator(bit) != is_operator(tree[i-1])
else bit == "'" else bit == "'"
@ -54,6 +55,8 @@ tree_to_inline_nomsu = (tree)->
if bit.type == "Action" or bit.type == "MethodCall" if bit.type == "Action" or bit.type == "MethodCall"
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
nomsu\add arg_nomsu nomsu\add arg_nomsu
if num_args == 1 and num_words == 0
nomsu\append "()"
return nomsu return nomsu
when "MethodCall" when "MethodCall"
@ -253,10 +256,11 @@ tree_to_nomsu = (tree)->
when "Action" when "Action"
next_space = "" next_space = ""
word_buffer = {} word_buffer = {}
num_args = 0 num_args, num_words = 0, 0
for i,bit in ipairs tree for i,bit in ipairs tree
-- TODO: properly wrap super long chains of words -- TODO: properly wrap super long chains of words
if type(bit) == "string" if type(bit) == "string"
num_words += 1
if #word_buffer > 0 and is_operator(bit) == is_operator(word_buffer[#word_buffer]) if #word_buffer > 0 and is_operator(bit) == is_operator(word_buffer[#word_buffer])
table.insert word_buffer, " " table.insert word_buffer, " "
table.insert word_buffer, bit table.insert word_buffer, bit
@ -314,6 +318,10 @@ tree_to_nomsu = (tree)->
nomsu\add next_space, words nomsu\add next_space, words
next_space = " " next_space = " "
if num_args == 1 and num_words == 0
if next_space != " "
nomsu\append next_space
nomsu\append "()"
return nomsu return nomsu
when "MethodCall" when "MethodCall"
@ -439,7 +447,7 @@ tree_to_nomsu = (tree)->
sep = '\n' if i > 1 sep = '\n' if i > 1
else else
item_nomsu = tree_to_inline_nomsu(item) item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu\text! > MAX_LINE if nomsu\trailing_line_len! + #item_nomsu\text! > MAX_LINE
sep = '\n' if i > 1 sep = '\n' if i > 1
item_nomsu = tree_to_nomsu(item) item_nomsu = tree_to_nomsu(item)
nomsu\add sep nomsu\add sep