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

Cleaning up clumping logic a little.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-30 15:12:11 -07:00
parent ab4ebdf175
commit 4f53ea5cc4
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nomsu_compiler.lua
View File

@ -1048,7 +1048,7 @@ do
local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
local should_clump local should_clump
should_clump = function(prev_line, line) should_clump = function(prev_line, line)
if prev_line and prev_line.type == "Action" and line.type == "Action" then if prev_line.type == "Action" and line.type == "Action" then
if prev_line.stub == "use %" then if prev_line.stub == "use %" then
return line.stub == "use %" return line.stub == "use %"
end end
@ -1058,11 +1058,8 @@ do
if line.stub == "test %" then if line.stub == "test %" then
return false return false
end end
if recurse(prev_line):is_multiline() then
return false
end end
end return not recurse(prev_line):is_multiline()
return true
end end
for chunk_no, chunk in ipairs(tree) do for chunk_no, chunk in ipairs(tree) do
if chunk_no > 1 then if chunk_no > 1 then

5
nomsu_compiler.moon
View File

@ -650,12 +650,11 @@ with NomsuCompiler
when "FileChunks" when "FileChunks"
nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
should_clump = (prev_line, line)-> should_clump = (prev_line, line)->
if prev_line and prev_line.type == "Action" and line.type == "Action" if prev_line.type == "Action" and line.type == "Action"
if prev_line.stub == "use %" then return line.stub == "use %" if prev_line.stub == "use %" then return line.stub == "use %"
if prev_line.stub == "test %" then return true if prev_line.stub == "test %" then return true
if line.stub == "test %" then return false if line.stub == "test %" then return false
return false if recurse(prev_line)\is_multiline! return not recurse(prev_line)\is_multiline!
return true
for chunk_no, chunk in ipairs tree for chunk_no, chunk in ipairs tree
nomsu\append "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1 nomsu\append "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1
nomsu\append pop_comments(chunk.source.start) nomsu\append pop_comments(chunk.source.start)