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

Fixed tree_to_nomsu for method calls that span lines.

Browse Source
This commit is contained in:
Bruce Hill 2018-09-10 16:29:04 -07:00
parent 7c6047254e
commit 989e133a57
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nomsu_compiler.lua
View File

@ -1059,7 +1059,19 @@ do
local pos, next_space = tree.source.start, '' local pos, next_space = tree.source.start, ''
local nomsu = NomsuCode(tree.source, pop_comments(pos)) local nomsu = NomsuCode(tree.source, pop_comments(pos))
if tree.target then if tree.target then
nomsu:append(self:tree_to_nomsu(tree.target), "::") if tree.target.type == "Block" then
nomsu:append(recurse(tree.target, #nomsu:match('[^\n]*$')))
pos = tree.target.source.stop
next_space = inline and "::" or "\n..::"
else
local target_nomsu = recurse(tree.target, #nomsu:match('[^\n]*$'))
if tree.target.type == "Action" and not target_nomsu:is_multiline() then
target_nomsu:parenthesize()
end
nomsu:append(target_nomsu)
pos = tree.target.source.stop
next_space = target_nomsu:is_multiline() and "\n..::" or "::"
end
end end
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if next_space == "\n.." or (next_space == " " and nomsu:trailing_line_len() > MAX_LINE) then if next_space == "\n.." or (next_space == " " and nomsu:trailing_line_len() > MAX_LINE) then

13
nomsu_compiler.moon
View File

@ -675,7 +675,18 @@ with NomsuCompiler
pos, next_space = tree.source.start, '' pos, next_space = tree.source.start, ''
nomsu = NomsuCode(tree.source, pop_comments(pos)) nomsu = NomsuCode(tree.source, pop_comments(pos))
if tree.target if tree.target
nomsu\append @tree_to_nomsu(tree.target), "::" if tree.target.type == "Block"
nomsu\append(recurse(tree.target, #nomsu\match('[^\n]*$')))
pos = tree.target.source.stop
next_space = inline and "::" or "\n..::"
else
target_nomsu = recurse(tree.target, #nomsu\match('[^\n]*$'))
if tree.target.type == "Action" and not target_nomsu\is_multiline!
target_nomsu\parenthesize!
nomsu\append target_nomsu
pos = tree.target.source.stop
next_space = target_nomsu\is_multiline! and "\n..::" or "::"
for i,bit in ipairs tree for i,bit in ipairs tree
if next_space == "\n.." or (next_space == " " and nomsu\trailing_line_len! > MAX_LINE) if next_space == "\n.." or (next_space == " " and nomsu\trailing_line_len! > MAX_LINE)
nomsu\append "\n", pop_comments(pos), '..' nomsu\append "\n", pop_comments(pos), '..'