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

Fixed word clumping with linebreaks.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-09 19:32:13 -08:00
parent b5a5b7f90d
commit 771007bc4d
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nomsu_decompiler.lua
View File

@ -281,16 +281,18 @@ tree_to_nomsu = function(tree)
end end
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == "string" then if type(bit) == "string" then
if next_space == " " then
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])
else else
clump_words = bit == "'" clump_words = bit == "'"
end end
if i > 1 and not clump_words then if clump_words then
nomsu:append(" ") next_space = ""
end end
nomsu:append(bit) end
nomsu:append(next_space, bit)
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)

5
nomsu_decompiler.moon
View File

@ -209,11 +209,12 @@ tree_to_nomsu = (tree)->
for i,bit in ipairs tree for i,bit in ipairs tree
if type(bit) == "string" if type(bit) == "string"
if next_space == " "
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 == "'"
nomsu\append " " if i > 1 and not clump_words next_space = "" if clump_words
nomsu\append bit nomsu\append next_space, bit
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)