Fix for nomsu codegen of blocks, particularly nested mutli-blocks like:

(do: if (yes) (: say "hi"); say "done")

2 files changed, 30 insertions, 13 deletions

diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua
index b4702ed..16dbd88 100644
--- a/nomsu_compiler.lua
+++ b/nomsu_compiler.lua
@@ -787,6 +787,7 @@ do
     recurse = function(t, opts)
       opts = opts or { }
       opts.consumed_comments = options.consumed_comments
+      opts.inside_multiblock = opts.inside_multiblock or options.inside_multiblock
       return self:tree_to_nomsu(t, opts)
     end
     local _exp_0 = tree.type
@@ -822,13 +823,23 @@ do
             if not (arg_nomsu) then
               return nil
             end
-            if not (i == 1 or (bit.type == "Block" and not (#bit > 1 or i < #tree))) then
-              nomsu:append(" ")
-            end
-            if bit.type == "Action" or (bit.type == "Block" and (#bit > 1 or i < #tree)) then
-              arg_nomsu:parenthesize()
+            if bit.type == "Block" then
+              if i == 1 or i < #tree or (options.inside_multiblock and #bit > 1) then
+                if i > 1 then
+                  nomsu:append(" ")
+                end
+                arg_nomsu:parenthesize()
+              end
+              nomsu:append(arg_nomsu)
+            else
+              if i > 1 then
+                nomsu:append(" ")
+              end
+              if bit.type == "Action" then
+                arg_nomsu:parenthesize()
+              end
+              nomsu:append(arg_nomsu)
             end
-            nomsu:append(arg_nomsu)
           end
         end
         return nomsu
@@ -911,7 +922,8 @@ do
         for i, line in ipairs(tree) do
           nomsu:append(i == 1 and " " or "; ")
           nomsu:append(assert(recurse(line, {
-            inline = true
+            inline = true,
+            inside_multiblock = true
           })))
         end
         return nomsu
diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon
index 5b9b3f6..e4521f2 100644
--- a/nomsu_compiler.moon
+++ b/nomsu_compiler.moon
@@ -509,6 +509,7 @@ with NomsuCompiler
         recurse = (t, opts)->
             opts or= {}
             opts.consumed_comments = options.consumed_comments
+            opts.inside_multiblock or= options.inside_multiblock
             return @tree_to_nomsu(t, opts)
 
         switch tree.type
@@ -532,11 +533,15 @@ with NomsuCompiler
                         else
                             arg_nomsu = recurse(bit,inline:true)
                             return nil unless arg_nomsu
-                            unless i == 1 or (bit.type == "Block" and not (#bit > 1 or i < #tree))
-                                nomsu\append " "
-                            if bit.type == "Action" or (bit.type == "Block" and (#bit > 1 or i < #tree))
-                                arg_nomsu\parenthesize!
-                            nomsu\append arg_nomsu
+                            if bit.type == "Block"
+                                if i == 1 or i < #tree or (options.inside_multiblock and #bit > 1)
+                                    nomsu\append " " if i > 1
+                                    arg_nomsu\parenthesize!
+                                nomsu\append arg_nomsu
+                            else
+                                nomsu\append " " if i > 1
+                                arg_nomsu\parenthesize! if bit.type == "Action"
+                                nomsu\append arg_nomsu
                     return nomsu
                 else
                     pos = tree.source.start
@@ -596,7 +601,7 @@ with NomsuCompiler
                     nomsu = NomsuCode(tree.source, ":")
                     for i,line in ipairs tree
                         nomsu\append(i == 1 and " " or "; ")
-                        nomsu\append assert(recurse(line, inline:true))
+                        nomsu\append assert(recurse(line, inline:true, inside_multiblock:true))
                     return nomsu
                 nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
                 for i, line in ipairs tree