remove redundant 'do' blocks in code generation.

spec/outputs/5.1/attrib.lua

@@ -25,20 +25,16 @@ end
 do
 	local a = f()
 	local b, c, d
-	do
-		local _obj_0, _obj_1 = f1()
-		b, c = _obj_0[1], _obj_0[2]
-		d = _obj_1[1]
-	end
+	local _obj_0, _obj_1 = f1()
+	b, c = _obj_0[1], _obj_0[2]
+	d = _obj_1[1]
 end
 do
 	local a, b, c, d
-	do
-		local _obj_0, _obj_1, _obj_2 = f()
-		a = _obj_0
-		b, c = _obj_1[1], _obj_1[2]
-		d = _obj_2[1]
-	end
+	local _obj_0, _obj_1, _obj_2 = f()
+	a = _obj_0
+	b, c = _obj_1[1], _obj_1[2]
+	d = _obj_2[1]
 end
 do
 	local a, b

spec/outputs/5.1/loops.lua

@@ -390,20 +390,18 @@ do
 				local _cond_0 = false
 				local _continue_1 = false
 				repeat
-					do
-						local _with_0 = tb
-						if _with_0 ~= nil then
-							_with_0.a = 1
-							if _with_0.b then
-								_cond_0 = true
-								_continue_1 = true
+					local _with_0 = tb
+					if _with_0 ~= nil then
+						_with_0.a = 1
+						if _with_0.b then
+							_cond_0 = true
+							_continue_1 = true
+							break
+						end
+						do
+							if _with_0.c then
 								break
 							end
-							do
-								if _with_0.c then
-									break
-								end
-							end
 						end
 					end
 					_cond_0 = true

spec/outputs/ambiguous.lua

@@ -13,11 +13,17 @@ a, b = c, d;
 (d(a))(c)
 for i = 1, 10 do
 	a = function() end
-	(print)(1)
-	a = f;
-	(print)(2)
+	do
+		(print)(1)
+	end
+	a = f
+	do
+		(print)(2)
+	end
 	if cond then
-		(print)(3)
+		do
+			(print)(3)
+		end
 	end
 	::abc::;
 	(print)(4)
@@ -40,7 +46,9 @@ do
 	end)
 end
 do
-	print(123)
+	do
+		print(123)
+	end
 end
 do
 	f({
@@ -97,18 +105,16 @@ do
 		nums = _accum_0
 	end
 	local objects
-	do
-		local _accum_0 = { }
-		local _len_0 = 1
-		local _list_0 = items
-		for _index_0 = 1, #_list_0 do
-			local item = _list_0[_index_0]
-			_accum_0[_len_0] = {
-				name = item
-			}
-			_len_0 = _len_0 + 1
-		end
-		objects = _accum_0
+	local _accum_0 = { }
+	local _len_0 = 1
+	local _list_0 = items
+	for _index_0 = 1, #_list_0 do
+		local item = _list_0[_index_0]
+		_accum_0[_len_0] = {
+			name = item
+		}
+		_len_0 = _len_0 + 1
 	end
+	objects = _accum_0
 end
 return nil

spec/outputs/assign.lua

@@ -72,27 +72,21 @@ return _(function()
 	do
 		local a
 		if x then
-			do
-				local _exp_0 = y
-				if 1 == _exp_0 then
-					do
-						local _obj_0, _obj_1 = f()
-						b[#b + 1] = _obj_1
-						a = _obj_0
-					end
-				end
+			local _exp_0 = y
+			if 1 == _exp_0 then
+				local _obj_0, _obj_1 = f()
+				b[#b + 1] = _obj_1
+				a = _obj_0
 			end
 		end
 	end
 	do
 		local a
 		local b
 		if x then
-			do
-				local _obj_0, _obj_1 = f()
-				a = _obj_0
-				b = _obj_1[1]
-			end
+			local _obj_0, _obj_1 = f()
+			a = _obj_0
+			b = _obj_1[1]
 		else
 			a = 123
 			b = tb[1]
@@ -101,33 +95,25 @@ return _(function()
 	do
 		local a, c
 		if x then
-			do
-				local _exp_0 = y
-				if 1 == _exp_0 then
-					do
-						local _obj_0, _obj_1, _obj_2, _obj_3 = f()
-						b[#b + 1] = _obj_1
-						a, c, getmetatable(d).__add = _obj_0, _obj_2, _obj_3
-					end
-				end
+			local _exp_0 = y
+			if 1 == _exp_0 then
+				local _obj_0, _obj_1, _obj_2, _obj_3 = f()
+				b[#b + 1] = _obj_1
+				a, c, getmetatable(d).__add = _obj_0, _obj_2, _obj_3
 			end
 		elseif x2 then
 			if y2 then
-				do
-					local _obj_0, _obj_1, _obj_2, _obj_3 = f1()
-					b[#b + 1] = _obj_1
-					a, c, getmetatable(d).__add = _obj_0, _obj_2, _obj_3
-				end
+				local _obj_0, _obj_1, _obj_2, _obj_3 = f1()
+				b[#b + 1] = _obj_1
+				a, c, getmetatable(d).__add = _obj_0, _obj_2, _obj_3
 			end
 		else
 			print("hello")
 			do
 				print(123)
-				do
-					local _obj_0, _obj_1, _obj_2 = f2()
-					b[#b + 1] = _obj_0
-					a, c, getmetatable(d).__add = 1, _obj_1, _obj_2
-				end
+				local _obj_0, _obj_1, _obj_2 = f2()
+				b[#b + 1] = _obj_0
+				a, c, getmetatable(d).__add = 1, _obj_1, _obj_2
 			end
 		end
 	end

spec/outputs/attrib.lua

@@ -14,20 +14,16 @@ end
 do
 	local a <const> = f()
 	local b, c, d
-	do
-		local _obj_0, _obj_1 = f1()
-		b, c = _obj_0[1], _obj_0[2]
-		d = _obj_1[1]
-	end
+	local _obj_0, _obj_1 = f1()
+	b, c = _obj_0[1], _obj_0[2]
+	d = _obj_1[1]
 end
 do
 	local a, b, c, d
-	do
-		local _obj_0, _obj_1, _obj_2 = f()
-		a = _obj_0
-		b, c = _obj_1[1], _obj_1[2]
-		d = _obj_2[1]
-	end
+	local _obj_0, _obj_1, _obj_2 = f()
+	a = _obj_0
+	b, c = _obj_1[1], _obj_1[2]
+	d = _obj_2[1]
 end
 do
 	local a, b

spec/outputs/backcall.lua

@@ -31,19 +31,17 @@ do
 	end)())
 end
 do
-	do
-		local _obj_0 = http
-		if _obj_0 ~= nil then
-			_obj_0.get("ajaxtest", function(data)
-				body[".result"]:html(data)
-				return http.post("ajaxprocess", data, function(processed)
-					body[".result"]:append(processed)
-					return setTimeout(1000, function()
-						return print("done")
-					end)
+	local _obj_0 = http
+	if _obj_0 ~= nil then
+		_obj_0.get("ajaxtest", function(data)
+			body[".result"]:html(data)
+			return http.post("ajaxprocess", data, function(processed)
+				body[".result"]:append(processed)
+				return setTimeout(1000, function()
+					return print("done")
 				end)
 			end)
-		end
+		end)
 	end
 end
 do

spec/outputs/bubbling.lua

@@ -109,15 +109,13 @@ _ = function(...)
 		a = _accum_0
 	end
 	local b
-	do
-		local _accum_0 = { }
-		local _len_0 = 1
-		for i = 1, 10 do
-			_accum_0[_len_0] = function(...)
-				return print(...)
-			end
-			_len_0 = _len_0 + 1
+	local _accum_0 = { }
+	local _len_0 = 1
+	for i = 1, 10 do
+		_accum_0[_len_0] = function(...)
+			return print(...)
 		end
-		b = _accum_0
+		_len_0 = _len_0 + 1
 	end
+	b = _accum_0
 end

spec/outputs/class.lua

@@ -496,30 +496,28 @@ print("hello")
 local yyy
 yyy = function()
 	local Cool
-	do
-		local _class_0
-		local _base_0 = { }
-		if _base_0.__index == nil then
-			_base_0.__index = _base_0
-		end
-		_class_0 = setmetatable({
-			__init = function() end,
-			__base = _base_0,
-			__name = "Cool"
-		}, {
-			__index = _base_0,
-			__call = function(cls, ...)
-				local _self_0 = setmetatable({ }, _base_0)
-				cls.__init(_self_0, ...)
-				return _self_0
-			end
-		})
-		_base_0.__class = _class_0
-		local self = _class_0;
-		_ = nil
-		Cool = _class_0
-		return _class_0
+	local _class_0
+	local _base_0 = { }
+	if _base_0.__index == nil then
+		_base_0.__index = _base_0
 	end
+	_class_0 = setmetatable({
+		__init = function() end,
+		__base = _base_0,
+		__name = "Cool"
+	}, {
+		__index = _base_0,
+		__call = function(cls, ...)
+			local _self_0 = setmetatable({ }, _base_0)
+			cls.__init(_self_0, ...)
+			return _self_0
+		end
+	})
+	_base_0.__class = _class_0
+	local self = _class_0;
+	_ = nil
+	Cool = _class_0
+	return _class_0
 end
 do
 	local _class_0