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

Fixed other place for clumping "'"

Browse Source
This commit is contained in:
Bruce Hill 2018-11-09 17:53:21 -08:00
parent 63c14bdbc3
commit b5a5b7f90d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nomsu_decompiler.lua
View File

@ -281,8 +281,14 @@ 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 not (next_space == " " and (type(tree[i - 1]) == 'string' and is_operator(tree[i - 1]) ~= is_operator(bit))) then local clump_words
nomsu:append(next_space) if type(tree[i - 1]) == 'string' then
clump_words = is_operator(bit) ~= is_operator(tree[i - 1])
else
clump_words = bit == "'"
end
if i > 1 and not clump_words then
nomsu:append(" ")
end end
nomsu:append(bit) nomsu:append(bit)
next_space = nomsu:trailing_line_len() > MAX_LINE and " \\\n.." or " " next_space = nomsu:trailing_line_len() > MAX_LINE and " \\\n.." or " "

6
nomsu_decompiler.moon
View File

@ -209,8 +209,10 @@ tree_to_nomsu = (tree)->
for i,bit in ipairs tree for i,bit in ipairs tree
if type(bit) == "string" if type(bit) == "string"
unless next_space == " " and (type(tree[i-1]) == 'string' and is_operator(tree[i-1]) != is_operator(bit)) clump_words = if type(tree[i-1]) == 'string'
nomsu\append next_space is_operator(bit) != is_operator(tree[i-1])
else bit == "'"
nomsu\append " " if i > 1 and not clump_words
nomsu\append bit nomsu\append 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