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

Fix for some bad codegen with ((`$x)'s foo)

Browse Source
This commit is contained in:
Bruce Hill 2019-03-20 16:40:32 -07:00
parent 938adbfe44
commit b44afbf417
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nomsu_decompiler.lua
View File

@ -28,7 +28,7 @@ is_identifier = function(s)
end end
local can_be_unary local can_be_unary
can_be_unary = function(t) can_be_unary = function(t)
return t.type == "Action" and #t == 2 and is_operator(t[1]) and type(t[2]) ~= 'string' and t[2].type ~= "Block" return t.type == "Action" and #t == 2 and is_operator(t[1]) and type(t[2]) ~= 'string' and t[2].type ~= "Block" and not (t[2].type == "Number" and t[1] == "-")
end end
local inline_escaper = re.compile("{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", { local inline_escaper = re.compile("{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", {
utf8_char = utf8_char_patt, utf8_char = utf8_char_patt,
@ -72,7 +72,7 @@ tree_to_inline_nomsu = function(tree)
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 == "'" and type(tree[i - 1]) ~= 'string' clump_words = bit == "'"
end end
if i > 1 and not clump_words then if i > 1 and not clump_words then
nomsu:add(" ") nomsu:add(" ")
@ -81,6 +81,9 @@ tree_to_inline_nomsu = function(tree)
else else
num_args = num_args + 1 num_args = num_args + 1
local arg_nomsu = tree_to_inline_nomsu(bit) local arg_nomsu = tree_to_inline_nomsu(bit)
if tree[i + 1] == "'" and bit.type == "Action" and can_be_unary(bit) then
arg_nomsu:parenthesize()
end
if bit.type == "Block" then if bit.type == "Block" then
if i ~= #tree then if i ~= #tree then
if i > 1 then if i > 1 then
@ -426,6 +429,9 @@ tree_to_nomsu = function(tree)
end end
num_args = num_args + 1 num_args = num_args + 1
local bit_nomsu = recurse(bit, i) local bit_nomsu = recurse(bit, i)
if tree[i + 1] == "'" and bit.type == "Action" and not bit_nomsu:is_multiline() and can_be_unary(bit) then
bit_nomsu:parenthesize()
end
if bit.type == "Block" then if bit.type == "Block" then
if not bit_nomsu:is_multiline() and (#bit_nomsu:text() > nomsu:trailing_line_len() * GOLDEN_RATIO and #bit_nomsu:text() > 8) or #bit_nomsu:text() + nomsu:trailing_line_len() > MAX_LINE then if not bit_nomsu:is_multiline() and (#bit_nomsu:text() > nomsu:trailing_line_len() * GOLDEN_RATIO and #bit_nomsu:text() > 8) or #bit_nomsu:text() + nomsu:trailing_line_len() > MAX_LINE then
bit_nomsu = tree_to_nomsu(bit) bit_nomsu = tree_to_nomsu(bit)
@ -588,6 +594,8 @@ tree_to_nomsu = function(tree)
end end
elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain" then elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
elseif bit.type == "Action" and can_be_unary(bit) then
interp_nomsu:parenthesize()
end end
end end
nomsu:add(interp_nomsu) nomsu:add(interp_nomsu)

10
nomsu_decompiler.moon
View File

@ -23,7 +23,7 @@ is_identifier = (s)->
return type(s) == 'string' and not not identifier_patt\match(s) return type(s) == 'string' and not not identifier_patt\match(s)
can_be_unary = (t)-> can_be_unary = (t)->
t.type == "Action" and #t == 2 and is_operator(t[1]) and type(t[2]) != 'string' and t[2].type != "Block" t.type == "Action" and #t == 2 and is_operator(t[1]) and type(t[2]) != 'string' and t[2].type != "Block" and not (t[2].type == "Number" and t[1] == "-")
inline_escaper = re.compile("{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", {utf8_char: utf8_char_patt, escape:(=> ("\\%03d")\format(@byte!))}) inline_escaper = re.compile("{~ (%utf8_char / ('\"' -> '\\\"') / ('\n' -> '\\n') / ('\t' -> '\\t') / ('\b' -> '\\b') / ('\a' -> '\\a') / ('\v' -> '\\v') / ('\f' -> '\\f') / ('\r' -> '\\r') / ('\\' -> '\\\\') / ([^ -~] -> escape) / .)* ~}", {utf8_char: utf8_char_patt, escape:(=> ("\\%03d")\format(@byte!))})
inline_escape = (s)-> inline_escape = (s)->
@ -52,12 +52,14 @@ tree_to_inline_nomsu = (tree)->
num_words += 1 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 == "'" and type(tree[i-1]) != 'string' else bit == "'"
nomsu\add " " if i > 1 and not clump_words nomsu\add " " if i > 1 and not clump_words
nomsu\add bit nomsu\add bit
else else
num_args += 1 num_args += 1
arg_nomsu = tree_to_inline_nomsu(bit) arg_nomsu = tree_to_inline_nomsu(bit)
if tree[i+1] == "'" and bit.type == "Action" and can_be_unary(bit)
arg_nomsu\parenthesize!
if bit.type == "Block" if bit.type == "Block"
if i != #tree if i != #tree
nomsu\add " " if i > 1 nomsu\add " " if i > 1
@ -312,6 +314,8 @@ tree_to_nomsu = (tree)->
num_args += 1 num_args += 1
bit_nomsu = recurse(bit, i) bit_nomsu = recurse(bit, i)
if tree[i+1] == "'" and bit.type == "Action" and not bit_nomsu\is_multiline! and can_be_unary(bit)
bit_nomsu\parenthesize!
if bit.type == "Block" if bit.type == "Block"
-- Rule of thumb: nontrivial one-liner block arguments should be no more -- Rule of thumb: nontrivial one-liner block arguments should be no more
-- than golden ratio * the length of the proceeding part of the line -- than golden ratio * the length of the proceeding part of the line
@ -452,6 +456,8 @@ tree_to_nomsu = (tree)->
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain" elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
elseif bit.type == "Action" and can_be_unary(bit)
interp_nomsu\parenthesize!
nomsu\add interp_nomsu nomsu\add interp_nomsu
if interp_nomsu\is_multiline! and bit.type == "Block" if interp_nomsu\is_multiline! and bit.type == "Block"
nomsu\add "\n.." nomsu\add "\n.."