wrap generated with code in do block again

Author: leafo

moonscript/compile/line.lua

@@ -292,5 +292,12 @@ line_compile = {
   end,
   group = function(self, node)
     return self:stms(node[2])
+  end,
+  ["do"] = function(self, node)
+    do
+      local _with_0 = self:block()
+      _with_0:stms(node[2])
+      return _with_0
+    end
   end
 }

moonscript/compile/line.moon

@@ -163,3 +163,7 @@ line_compile =
   group: (node) =>
     @stms node[2]
 
+  do: (node) =>
+    with @block!
+      \stms node[2]
+

moonscript/transform.lua

@@ -266,7 +266,7 @@ Statement = Transformer({
   with = function(node, ret)
     local _, exp, block = unpack(node)
     local scope_name = NameProxy("with")
-    return build.group({
+    return build["do"]({
       build.assign_one(scope_name, exp),
       Run(function(self)
         return self:set("scope_var", scope_name)
@@ -692,7 +692,7 @@ Value = Transformer({
       table.remove(node, #node)
       local base_name = NameProxy("base")
       local fn_name = NameProxy("fn")
-      return value(build.block_exp({
+      return Value(build.block_exp({
         build.assign({
           names = {
             base_name

moonscript/transform.moon

@@ -159,7 +159,7 @@ Statement = Transformer {
   with: (node, ret) ->
     _, exp, block = unpack node
     scope_name = NameProxy "with"
-    build.group {
+    build["do"] {
       build.assign_one scope_name, exp
       Run => @set "scope_var", scope_name
       build.group block
@@ -406,7 +406,7 @@ Value = Transformer {
       base_name = NameProxy "base"
       fn_name = NameProxy "fn"
 
-      value build.block_exp {
+      Value build.block_exp {
         build.assign {
           names: {base_name}
           values: {node}

moonscript/types.lua

@@ -146,6 +146,12 @@ build = setmetatable({
       body
     }
   end,
+  ["do"] = function(body)
+    return {
+      "do",
+      body
+    }
+  end,
   assign_one = function(name, value)
     return build.assign({
       names = {

moonscript/types.moon

@@ -83,6 +83,8 @@ build = nil
 build = setmetatable {
   group: (body) ->
     {"group", body}
+  do: (body) ->
+    {"do", body}
   assign_one: (name, value) ->
     build.assign {
       names: {name}