remove redundant 'do' blocks in code generation.

1 files changed, 71 insertions, 105 deletions

diff --git a/spec/outputs/with.lua b/spec/outputs/with.lua
index 304d26e..b2a1c3b 100644
--- a/spec/outputs/with.lua
+++ b/spec/outputs/with.lua
@@ -9,24 +9,20 @@ do
         end
 end
 do
-        do
-                local _with_0 = leaf
-                _with_0.world()
-                _with_0.world(1, 2, 3)
-                local g = _with_0.what.is.this
-                _with_0.hi(1, 2, 3)
-                _with_0:hi(1, 2).world(2323)
-                _with_0:hi("yeah", "man")
-                _with_0.world = 200
-        end
+        local _with_0 = leaf
+        _with_0.world()
+        _with_0.world(1, 2, 3)
+        local g = _with_0.what.is.this
+        _with_0.hi(1, 2, 3)
+        _with_0:hi(1, 2).world(2323)
+        _with_0:hi("yeah", "man")
+        _with_0.world = 200
 end
 do
         local zyzyzy
-        do
-                local _with_0 = something
-                _with_0.set_state("hello world")
-                zyzyzy = _with_0
-        end
+        local _with_0 = something
+        _with_0.set_state("hello world")
+        zyzyzy = _with_0
 end
 do
         local x = 5 + (function()
@@ -45,12 +41,10 @@ do
         }
 end
 do
-        do
-                local _with_0 = foo
-                local _ = _with_0:prop("something").hello
-                _with_0.prop:send(one)
-                _with_0.prop:send(one)
-        end
+        local _with_0 = foo
+        local _ = _with_0:prop("something").hello
+        _with_0.prop:send(one)
+        _with_0.prop:send(one)
 end
 do
         do
@@ -79,69 +73,49 @@ do
                 return a
         end)())
         local p
-        do
-                local _with_0 = 1
-                hello().x, world().y = _with_0, 2
-                print(a + b)
-                p = _with_0
-        end
+        local _with_0 = 1
+        hello().x, world().y = _with_0, 2
+        print(a + b)
+        p = _with_0
 end
 do
         local x = "hello"
         x:upper()
 end
 do
-        do
-                local k = "jo"
-                print(k:upper())
-        end
+        local k = "jo"
+        print(k:upper())
 end
 do
-        do
-                local a, b, c = "", "", ""
-                print(a:upper())
-        end
+        local a, b, c = "", "", ""
+        print(a:upper())
 end
 do
         local a = "bunk"
-        do
-                local b, c
-                a, b, c = "", "", ""
-                print(a:upper())
-        end
+        local b, c
+        a, b, c = "", "", ""
+        print(a:upper())
 end
 do
-        do
-                local _with_0 = j
-                print(_with_0:upper())
-        end
+        local _with_0 = j
+        print(_with_0:upper())
 end
 do
-        do
-                local _with_0 = "jo"
-                k.j = _with_0
-                print(_with_0:upper())
-        end
+        local _with_0 = "jo"
+        k.j = _with_0
+        print(_with_0:upper())
 end
 do
-        do
-                local _with_0 = a
-                print(_with_0.b)
-                do
-                        local _with_1 = _with_0.c
-                        print(_with_1.d)
-                end
-        end
+        local _with_0 = a
+        print(_with_0.b)
+        local _with_1 = _with_0.c
+        print(_with_1.d)
 end
 do
-        do
-                local _with_0 = a
-                do
-                        local _with_1 = 2
-                        _with_0.b = _with_1
-                        print(_with_1.c)
-                end
-        end
+        local _with_0 = a
+        local _with_1 = 2
+        _with_0.b = _with_1
+        print(_with_1.c)
 end
 do
         local _
@@ -151,43 +125,37 @@ do
         end
 end
 do
-        do
-                local _with_0 = tb
-                _with_0.x = item.field:func(123)
-        end
+        local _with_0 = tb
+        _with_0.x = item.field:func(123)
 end
 do
-        do
-                local _with_0 = dad
-                _with_0["if"]("yes")
-                local y = _with_0["end"].of["function"]
-        end
+        local _with_0 = dad
+        _with_0["if"]("yes")
+        local y = _with_0["end"].of["function"]
 end
 do
+        local _with_0 = tb
         do
-                local _with_0 = tb
-                do
-                        local _obj_0 = _with_0[2]
-                        if _obj_0 ~= nil then
-                                _with_0[1] = _obj_0:func()
-                        end
-                end
-                _with_0["%a-b-c%"] = 123
-                _with_0[ [[x y z]]] = _with_0[var]
-                print(_with_0[_with_0[3]])
-                do
-                        local _with_1 = _with_0[4]
-                        _with_1[1] = 1
+                local _obj_0 = _with_0[2]
+                if _obj_0 ~= nil then
+                        _with_0[1] = _obj_0:func()
                 end
-                _with_0[#_with_0 + 1] = "abc"
-                _with_0[#_with_0 + 1] = {
-                        type = "hello",
-                        {
-                                name = "xyz",
-                                value = 998
-                        }
-                }
         end
+        _with_0["%a-b-c%"] = 123
+        _with_0[ [[x y z]]] = _with_0[var]
+        print(_with_0[_with_0[3]])
+        do
+                local _with_1 = _with_0[4]
+                _with_1[1] = 1
+        end
+        _with_0[#_with_0 + 1] = "abc"
+        _with_0[#_with_0 + 1] = {
+                type = "hello",
+                {
+                        name = "xyz",
+                        value = 998
+                }
+        }
 end
 do
         do
@@ -204,16 +172,14 @@ do
         end
 end
 do
-        do
-                local mask = SolidRect({
-                        width = w,
-                        height = h,
-                        color = 0x66000000
-                })
-                if mask ~= nil then
-                        mask.touchEnabled = true
-                        mask.swallowTouches = true
-                end
+        local mask = SolidRect({
+                width = w,
+                height = h,
+                color = 0x66000000
+        })
+        if mask ~= nil then
+                mask.touchEnabled = true
+                mask.swallowTouches = true
         end
 end
 return nil