From 4f53ea5cc47ad58680bff1981cf111ef6b169af3 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 30 Jul 2018 15:12:11 -0700 Subject: [PATCH] Cleaning up clumping logic a little. --- nomsu_compiler.lua | 7 ++----- nomsu_compiler.moon | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua index c338e8e..6692fe3 100644 --- a/nomsu_compiler.lua +++ b/nomsu_compiler.lua @@ -1048,7 +1048,7 @@ do local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) local should_clump 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 return line.stub == "use %" end @@ -1058,11 +1058,8 @@ do if line.stub == "test %" then return false end - if recurse(prev_line):is_multiline() then - return false - end end - return true + return not recurse(prev_line):is_multiline() end for chunk_no, chunk in ipairs(tree) do if chunk_no > 1 then diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon index b48a8f7..0b3ae7c 100644 --- a/nomsu_compiler.moon +++ b/nomsu_compiler.moon @@ -650,12 +650,11 @@ with NomsuCompiler when "FileChunks" nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) 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 == "test %" then return true if line.stub == "test %" then return false - return false if recurse(prev_line)\is_multiline! - return true + return not recurse(prev_line)\is_multiline! for chunk_no, chunk in ipairs tree nomsu\append "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1 nomsu\append pop_comments(chunk.source.start)