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

Added parentheses to prevent stupid breakage.

Browse Source
This commit is contained in:
Bruce Hill 2018-12-19 03:02:19 -08:00
parent 21a1121da6
commit 359152da17
4 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nomsu_decompiler.lua
View File

@ -73,15 +73,11 @@ tree_to_inline_nomsu = function(tree)
arg_nomsu:parenthesize() arg_nomsu:parenthesize()
end end
else else
if i > 1 and tree[i - 1] ~= "#" then
nomsu:add(" ")
end
if bit.type == "Action" or bit.type == "MethodCall" then if bit.type == "Action" or bit.type == "MethodCall" then
if i > 1 then
nomsu:add(" ")
end
arg_nomsu:parenthesize() arg_nomsu:parenthesize()
else
if i > 1 then
nomsu:add(" ")
end
end end
end end
nomsu:add(arg_nomsu) nomsu:add(arg_nomsu)
@ -264,10 +260,9 @@ tree_to_nomsu = function(tree)
if (t.type == "Action" or t.type == "MethodCall") then if (t.type == "Action" or t.type == "MethodCall") then
inline_nomsu:parenthesize() inline_nomsu:parenthesize()
end end
return inline_nomsu if t.type ~= "Text" then
end return inline_nomsu
if t.type == "Text" and #inline_nomsu:text() + 2 < MAX_LINE then end
return inline_nomsu
end end
end end
local indented = tree_to_nomsu(t) local indented = tree_to_nomsu(t)
@ -278,7 +273,23 @@ tree_to_nomsu = function(tree)
indented:parenthesize() indented:parenthesize()
end end
end end
if inline_nomsu and indented:text():match("^[^\n]*\n[^\n]*$") and nomsu:trailing_line_len() <= 8 then local indented_lines
do
local _accum_0 = { }
local _len_0 = 1
local _list_0 = indented:text():lines()
for _index_0 = 1, #_list_0 do
local line = _list_0[_index_0]
if line:match("%S") then
_accum_0[_len_0] = line
_len_0 = _len_0 + 1
end
end
indented_lines = _accum_0
end
if inline_nomsu and #indented_lines == (t.type == 'Block' and 2 or 3) and nomsu:trailing_line_len() <= 8 then
return inline_nomsu
elseif inline_nomsu and t.type == "Text" and #indented_lines <= 3 and (#inline_nomsu:text() - 2 < MAX_LINE + 4 or #inline_nomsu:text() <= space or #inline_nomsu:text() <= 8) then
return inline_nomsu return inline_nomsu
end end
return indented return indented
@ -340,7 +351,7 @@ tree_to_nomsu = function(tree)
if next_space == " " and #bit_nomsu:text() < MAX_LINE then if next_space == " " and #bit_nomsu:text() < MAX_LINE then
next_space = "\n.." next_space = "\n.."
elseif bit.type == 'Action' or bit.type == "MethodCall" then elseif bit.type == 'Action' or bit.type == "MethodCall" then
bit_nomsu = NomsuCode:from(bit.source, "(\n ", tree_to_nomsu(bit), ")") bit_nomsu = NomsuCode:from(bit.source, "(\n ", tree_to_nomsu(bit), "\n)")
else else
bit_nomsu = tree_to_nomsu(bit) bit_nomsu = tree_to_nomsu(bit)
end end
@ -401,7 +412,7 @@ tree_to_nomsu = function(tree)
if i > 1 then if i > 1 then
nomsu:add("\n") nomsu:add("\n")
if tree[i - 1].type ~= "Comment" then if tree[i - 1].type ~= "Comment" then
needs_space[i] = (line_nomsu:is_multiline() and prev_line:is_multiline()) needs_space[i] = ((line_nomsu:is_multiline() and prev_line:is_multiline()) or prev_line:text():match("%.%.[^\n]*$"))
if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then
nomsu:add("\n") nomsu:add("\n")
end end
@ -473,7 +484,7 @@ tree_to_nomsu = function(tree)
if nomsu:text():match(" $") then if nomsu:text():match(" $") then
nomsu:add("\\;") nomsu:add("\\;")
end end
return NomsuCode:from(tree.source, '"\n ', nomsu, '\n"') return NomsuCode:from(tree.source, '("\n ', nomsu, '\n")')
elseif "List" == _exp_0 or "Dict" == _exp_0 then elseif "List" == _exp_0 or "Dict" == _exp_0 then
if #tree == 0 then if #tree == 0 then
nomsu:add(tree.type == "List" and "[]" or "{}") nomsu:add(tree.type == "List" and "[]" or "{}")
@ -520,11 +531,7 @@ tree_to_nomsu = function(tree)
end end
nomsu:add(tree_to_nomsu(key)) nomsu:add(tree_to_nomsu(key))
if value then if value then
local value_nomsu = tree_to_nomsu(value) nomsu:add(" = ", recurse(value))
if (value.type == "Block" or value.type == "Action" or value.type == "MethodCall") and not value_nomsu:is_multiline() then
value_nomsu:parenthesize()
end
nomsu:add(" = ", value_nomsu)
end end
return nomsu return nomsu
elseif "Comment" == _exp_0 then elseif "Comment" == _exp_0 then

30
nomsu_decompiler.moon
View File

@ -50,11 +50,9 @@ tree_to_inline_nomsu = (tree)->
unless i == #tree unless i == #tree
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
else else
nomsu\add " " if i > 1 and tree[i-1] != "#"
if bit.type == "Action" or bit.type == "MethodCall" if bit.type == "Action" or bit.type == "MethodCall"
nomsu\add " " if i > 1
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
else
nomsu\add " " if i > 1
nomsu\add arg_nomsu nomsu\add arg_nomsu
return nomsu return nomsu
@ -203,16 +201,19 @@ tree_to_nomsu = (tree)->
if #inline_nomsu\text! <= space or #inline_nomsu\text! <= 8 if #inline_nomsu\text! <= space or #inline_nomsu\text! <= 8
if (t.type == "Action" or t.type == "MethodCall") if (t.type == "Action" or t.type == "MethodCall")
inline_nomsu\parenthesize! inline_nomsu\parenthesize!
return inline_nomsu if t.type != "Text"
if t.type == "Text" and #inline_nomsu\text! + 2 < MAX_LINE return inline_nomsu
return inline_nomsu
indented = tree_to_nomsu(t) indented = tree_to_nomsu(t)
if t.type == "Action" or t.type == "MethodCall" if t.type == "Action" or t.type == "MethodCall"
if indented\is_multiline! if indented\is_multiline!
return NomsuCode\from(t.source, "(\n ", indented, "\n)") return NomsuCode\from(t.source, "(\n ", indented, "\n)")
else else
indented\parenthesize! indented\parenthesize!
if inline_nomsu and indented\text!\match("^[^\n]*\n[^\n]*$") and nomsu\trailing_line_len! <= 8 indented_lines = [line for line in *indented\text!\lines! when line\match("%S")]
if inline_nomsu and #indented_lines == (t.type == 'Block' and 2 or 3) and nomsu\trailing_line_len! <= 8
return inline_nomsu
elseif inline_nomsu and t.type == "Text" and #indented_lines <= 3 and
(#inline_nomsu\text! - 2 < MAX_LINE + 4 or #inline_nomsu\text! <= space or #inline_nomsu\text! <= 8)
return inline_nomsu return inline_nomsu
return indented return indented
@ -266,7 +267,7 @@ tree_to_nomsu = (tree)->
if next_space == " " and #bit_nomsu\text! < MAX_LINE if next_space == " " and #bit_nomsu\text! < MAX_LINE
next_space = "\n.." next_space = "\n.."
elseif bit.type == 'Action' or bit.type == "MethodCall" elseif bit.type == 'Action' or bit.type == "MethodCall"
bit_nomsu = NomsuCode\from bit.source, "(\n ", tree_to_nomsu(bit), ")" bit_nomsu = NomsuCode\from bit.source, "(\n ", tree_to_nomsu(bit), "\n)"
else else
bit_nomsu = tree_to_nomsu(bit) bit_nomsu = tree_to_nomsu(bit)
@ -316,9 +317,11 @@ tree_to_nomsu = (tree)->
if i > 1 if i > 1
nomsu\add "\n" nomsu\add "\n"
-- Rule of thumb: add a blank line between two lines if both are -- Rule of thumb: add a blank line between two lines if both are
-- multi-line non-comments, or if a comment comes after a non-comment. -- multi-line non-comments, or if a comment comes after a non-comment,
-- or if the last line starts with ".."
if tree[i-1].type != "Comment" if tree[i-1].type != "Comment"
needs_space[i] = (line_nomsu\is_multiline! and prev_line\is_multiline!) needs_space[i] = ((line_nomsu\is_multiline! and prev_line\is_multiline!) or
prev_line\text!\match("%.%.[^\n]*$"))
if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1]
nomsu\add "\n" nomsu\add "\n"
nomsu\add line_nomsu nomsu\add line_nomsu
@ -370,7 +373,7 @@ tree_to_nomsu = (tree)->
add_text(tree) add_text(tree)
if nomsu\text!\match(" $") if nomsu\text!\match(" $")
nomsu\add "\\;" nomsu\add "\\;"
return NomsuCode\from(tree.source, '"\n ', nomsu, '\n"') return NomsuCode\from(tree.source, '("\n ', nomsu, '\n")')
when "List", "Dict" when "List", "Dict"
if #tree == 0 if #tree == 0
@ -407,10 +410,7 @@ tree_to_nomsu = (tree)->
key = {type:"Index", source:key.source, key} key = {type:"Index", source:key.source, key}
nomsu\add tree_to_nomsu(key) nomsu\add tree_to_nomsu(key)
if value if value
value_nomsu = tree_to_nomsu(value) nomsu\add " = ", recurse(value)
if (value.type == "Block" or value.type == "Action" or value.type == "MethodCall") and not value_nomsu\is_multiline!
value_nomsu\parenthesize!
nomsu\add " = ", value_nomsu
return nomsu return nomsu
when "Comment" when "Comment"

2
parser.lua
View File

@ -60,7 +60,7 @@ local peg_tidier = re.compile([[ file <- %nl* {~ (captured_def/line) (%nl+ (c
captured_def <- captured_def <-
({ident} (" "*) "(" {ident} ")" (" "*) "<-" {[^%nl]* (%nl+ " "+ [^%nl]*)*}) -> ({ident} (" "*) "(" {ident} ")" (" "*) "<-" {[^%nl]* (%nl+ " "+ [^%nl]*)*}) ->
"%1 <- ({| {:type:''->'%2':} {:start:{}:} "%1 <- ({| {:type:''->'%2':} {:start:{}:}
%3 (%3)
{:stop:{}:} |} %%userdata) -> Tree" {:stop:{}:} |} %%userdata) -> Tree"
]]) ]])
local make_parser local make_parser

2
parser.moon
View File

@ -52,7 +52,7 @@ peg_tidier = re.compile [[
captured_def <- captured_def <-
({ident} (" "*) "(" {ident} ")" (" "*) "<-" {[^%nl]* (%nl+ " "+ [^%nl]*)*}) -> ({ident} (" "*) "(" {ident} ")" (" "*) "<-" {[^%nl]* (%nl+ " "+ [^%nl]*)*}) ->
"%1 <- ({| {:type:''->'%2':} {:start:{}:} "%1 <- ({| {:type:''->'%2':} {:start:{}:}
%3 (%3)
{:stop:{}:} |} %%userdata) -> Tree" {:stop:{}:} |} %%userdata) -> Tree"
]] ]]