14 files changed, 144 insertions, 127 deletions

diff --git a/spec/outputs/unicode/assign.lua b/spec/outputs/unicode/assign.lua
index bf43953..e00d016 100644
--- a/spec/outputs/unicode/assign.lua
+++ b/spec/outputs/unicode/assign.lua
@@ -36,17 +36,15 @@ local _u53d8_u91cfx
 do
         local _u51fd_u6570 = _u83b7_u53d6_u5904_u7406_u51fd_u6570()
         if _u51fd_u6570 then
-                do
+                _u53d8_u91cfx = ((function()
                         _u51fd_u6570()
-                        _u53d8_u91cfx = 123
-                end
+                        return 123
+                end)())
         end
 end
 local _anon_func_0 = function(_u6253_u5370)
-        do
-                _u6253_u5370(123)
-                return { }
-        end
+        _u6253_u5370(123)
+        return { }
 end
 return __u65e0_u6548_u53d8_u91cf(function()
         setmetatable(a_u53d8_u91cf, _anon_func_0(_u6253_u5370))
diff --git a/spec/outputs/unicode/attrib.lua b/spec/outputs/unicode/attrib.lua
index 1c48de4..5e5bb99 100644
--- a/spec/outputs/unicode/attrib.lua
+++ b/spec/outputs/unicode/attrib.lua
@@ -48,17 +48,21 @@ do
         end
         local _u5173_u95ed_u53d8_u91cfb
         if not false then
-                if _u6761_u4ef6x then
-                        _u5173_u95ed_u53d8_u91cfb = 1
-                end
+                _u5173_u95ed_u53d8_u91cfb = ((function()
+                        if _u6761_u4ef6x then
+                                return 1
+                        end
+                end)())
         end
         local _close_0 <close> = _u5173_u95ed_u53d8_u91cfb
         local _u5e38_u91cfc
         if true then
-                local _exp_0 = _u6761_u4ef6x
-                if "abc" == _exp_0 then
-                        _u5e38_u91cfc = 998
-                end
+                _u5e38_u91cfc = ((function()
+                        local _exp_0 = _u6761_u4ef6x
+                        if "abc" == _exp_0 then
+                                return 998
+                        end
+                end)())
         end
         local _u5173_u95ed_u53d8_u91cfd
         if (function()
diff --git a/spec/outputs/unicode/comprehension.lua b/spec/outputs/unicode/comprehension.lua
index 60e490f..92bce69 100644
--- a/spec/outputs/unicode/comprehension.lua
+++ b/spec/outputs/unicode/comprehension.lua
@@ -243,8 +243,11 @@ end
 do
         local _accum_0 = { }
         local _len_0 = 1
+        local _min_0 = 1 + 2
         local _max_0 = 3 + 4
-        for _index_0 = 1 + 2, _max_0 < 0 and #_u5217_u8868 + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #_u5217_u8868 + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #_u5217_u8868 + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                 local _u9879_u76ee = _u5217_u8868[_index_0]
                 _accum_0[_len_0] = _u9879_u76ee
                 _len_0 = _len_0 + 1
@@ -254,8 +257,11 @@ end
 do
         local _accum_0 = { }
         local _len_0 = 1
+        local _min_0 = _u4f60_u597d() * 4
         local _max_0 = 2 - _u4e1c_u897f[4]
-        for _index_0 = _u4f60_u597d() * 4, _max_0 < 0 and #_u5217_u8868 + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #_u5217_u8868 + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #_u5217_u8868 + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                 local _u9879_u76ee = _u5217_u8868[_index_0]
                 _accum_0[_len_0] = _u9879_u76ee
                 _len_0 = _len_0 + 1
diff --git a/spec/outputs/unicode/cond.lua b/spec/outputs/unicode/cond.lua
index 7229001..5e86228 100644
--- a/spec/outputs/unicode/cond.lua
+++ b/spec/outputs/unicode/cond.lua
@@ -314,15 +314,13 @@ do
         end
 end
 do
-        do
-                local _des_0 = { }
-                if _des_0 then
-                        __u6a21_u5757 = _des_0
-                        local _u4e1c_u897f = __u6a21_u5757["东西"]
-                        local a_u529f_u80fd, b_u529f_u80fd
-                        local _obj_0 = __u6a21_u5757
-                        a_u529f_u80fd, b_u529f_u80fd = _obj_0["a功能"], _obj_0["b功能"]
-                end
+        local _des_0 = { }
+        if _des_0 then
+                __u6a21_u5757 = _des_0
+                local _u4e1c_u897f = __u6a21_u5757["东西"]
+                local a_u529f_u80fd, b_u529f_u80fd
+                local _obj_0 = __u6a21_u5757
+                a_u529f_u80fd, b_u529f_u80fd = _obj_0["a功能"], _obj_0["b功能"]
         end
 end
 do
diff --git a/spec/outputs/unicode/do.lua b/spec/outputs/unicode/do.lua
index f9c3079..7bf1da3 100644
--- a/spec/outputs/unicode/do.lua
+++ b/spec/outputs/unicode/do.lua
@@ -32,10 +32,10 @@ local _u53d8_u91cft = {
 }
 return function(_u53c2_u6570y, _u53c2_u6570k)
         if _u53c2_u6570y == nil then
-                do
+                _u53c2_u6570y = ((function()
                         _u53d8_u91cfx = 10 + 2
-                        _u53c2_u6570y = _u53d8_u91cfx
-                end
+                        return _u53d8_u91cfx
+                end)())
         end
         if _u53c2_u6570k == nil then
                 do
diff --git a/spec/outputs/unicode/lists.lua b/spec/outputs/unicode/lists.lua
index aafd516..3bf6f50 100644
--- a/spec/outputs/unicode/lists.lua
+++ b/spec/outputs/unicode/lists.lua
@@ -229,31 +229,36 @@ _u53d8_u91cfx = {
         6,
         7
 }
-local _max_0 = -5
-for _index_0 = 2, _max_0 < 0 and #_u53d8_u91cfx + _max_0 or _max_0, 2 do
+local _max_0 = #_u53d8_u91cfx + -5 + 1
+for _index_0 = 2, _max_0, 2 do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
-local _max_1 = 3
-for _index_0 = 1, _max_1 < 0 and #_u53d8_u91cfx + _max_1 or _max_1 do
+for _index_0 = 1, 3 do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 2, #_u53d8_u91cfx do
+local _max_1 = #_u53d8_u91cfx
+for _index_0 = 2, _max_1 do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 1, #_u53d8_u91cfx, 2 do
+local _max_2 = #_u53d8_u91cfx
+for _index_0 = 1, _max_2, 2 do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 2, #_u53d8_u91cfx, 2 do
+local _max_3 = #_u53d8_u91cfx
+for _index_0 = 2, _max_3, 2 do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
 local _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc = 1, 5, 2
-local _max_2 = _u53d8_u91cfb
-for _index_0 = _u53d8_u91cfa, _max_2 < 0 and #_u53d8_u91cfx + _max_2 or _max_2, _u53d8_u91cfc do
+local _min_0 = _u53d8_u91cfa
+local _max_4 = _u53d8_u91cfb
+_min_0 = _min_0 < 0 and #_u53d8_u91cfx + _min_0 + 1 or _min_0
+_max_4 = _max_4 < 0 and #_u53d8_u91cfx + _max_4 + 1 or _max_4
+for _index_0 = _min_0, _max_4, _u53d8_u91cfc do
         local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
         _u6253_u5370(_u53d8_u91cfy)
 end
diff --git a/spec/outputs/unicode/loops.lua b/spec/outputs/unicode/loops.lua
index 8379993..27bbe2e 100644
--- a/spec/outputs/unicode/loops.lua
+++ b/spec/outputs/unicode/loops.lua
@@ -60,8 +60,8 @@ do
                 local _u53d8_u91cfy = _u4f60_u597d[_index_0]
                 if _u53d8_u91cfy % 2 == 0 then
                         _accum_0[_len_0] = _u53d8_u91cfy
+                        _len_0 = _len_0 + 1
                 end
-                _len_0 = _len_0 + 1
         end
         _u53d8_u91cfx = _accum_0
 end
@@ -132,13 +132,11 @@ do
 end
 do
         local _accum_0 = { }
-        local _len_0 = 1
         local _list_2 = 3
         for _index_0 = 1, #_list_2 do
                 local _u4e1c_u897f = _list_2[_index_0]
                 _u53d8_u91cfy = "你好"
                 break
-                _len_0 = _len_0 + 1
         end
         _u53d8_u91cfx = _accum_0
 end
diff --git a/spec/outputs/unicode/macro.lua b/spec/outputs/unicode/macro.lua
index e2195e4..b4e78cd 100644
--- a/spec/outputs/unicode/macro.lua
+++ b/spec/outputs/unicode/macro.lua
@@ -167,13 +167,11 @@ end
 do
         local _u53d8_u91cfa = 8
         _u53d8_u91cfa = (function()
-                local _u53d8_u91cfa
-                _u53d8_u91cfa = 1
+                local _u53d8_u91cfa = 1
                 return _u53d8_u91cfa + 1
         end)()
         _u53d8_u91cfa = _u53d8_u91cfa + (function()
-                local _u53d8_u91cfa
-                _u53d8_u91cfa = 1
+                local _u53d8_u91cfa = 1
                 return _u53d8_u91cfa + 1
         end)()
         _u6253_u5370(_u53d8_u91cfa)
@@ -217,24 +215,8 @@ do
 -- 这有个注释
 end
 local _ = require('下划线')
-local _call_0 = (_({
-        1,
-        2,
-        3,
-        4,
-        -2,
-        3
-}))
-_call_0 = _call_0["链"](_call_0)
-_call_0 = _call_0["映射"](_call_0, function(self)
-        return self * 2
-end)
-_call_0 = _call_0["过滤"](_call_0, function(self)
-        return self > 3
-end)
-local _u7ed3_u679ca = _call_0["取值"](_call_0)
-do
-        local _call_1 = (_({
+local _anon_func_0 = function(_)
+        local _call_0 = (_({
                 1,
                 2,
                 3,
@@ -242,27 +224,70 @@ do
                 -2,
                 3
         }))
-        _call_1 = _call_1["链"](_call_1)
-        _call_1 = _call_1["映射"](_call_1, function(self)
-                return self * 2
-        end)
-        _call_1 = _call_1["过滤"](_call_1, function(self)
+        return _call_0["链"](_call_0)
+end
+local _call_0 = ((function()
+        local _call_0 = ((function()
+                local _call_0 = (_anon_func_0(_))
+                return _call_0["映射"](_call_0, function(self)
+                        return self * 2
+                end)
+        end)())
+        return _call_0["过滤"](_call_0, function(self)
                 return self > 3
         end)
+end)())
+local _u7ed3_u679ca = _call_0["取值"](_call_0)
+local _anon_func_1 = function(_)
+        local _call_1 = (_({
+                1,
+                2,
+                3,
+                4,
+                -2,
+                3
+        }))
+        return _call_1["链"](_call_1)
+end
+do
+        local _call_1 = ((function()
+                local _call_1 = ((function()
+                        local _call_1 = (_anon_func_1(_))
+                        return _call_1["映射"](_call_1, function(self)
+                                return self * 2
+                        end)
+                end)())
+                return _call_1["过滤"](_call_1, function(self)
+                        return self > 3
+                end)
+        end)())
         _call_1["每一个"](_call_1, function(self)
                 return _u6253_u5370(self)
         end)
 end
-local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
-_call_1 = _call_1["父节点"](_call_1)
-_call_1 = _call_1["后代"](_call_1)
-_call_1 = _call_1["选择启用"](_call_1)
-_call_1 = _call_1["选择可见"](_call_1)
-_call_1 = _call_1["标签等于"](_call_1, "fx")
-_call_1 = _call_1["其中"](_call_1, function(x)
-        local _call_2 = x["名称"]
-        return _call_2["结尾为"](_call_2, "(克隆)")
-end)
+local _anon_func_2 = function(_u539f_u70b9)
+        local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
+        return _call_1["父节点"](_call_1)
+end
+local _call_1 = ((function()
+        local _call_1 = ((function()
+                local _call_1 = ((function()
+                        local _call_1 = ((function()
+                                local _call_1 = ((function()
+                                        local _call_1 = (_anon_func_2(_u539f_u70b9))
+                                        return _call_1["后代"](_call_1)
+                                end)())
+                                return _call_1["选择启用"](_call_1)
+                        end)())
+                        return _call_1["选择可见"](_call_1)
+                end)())
+                return _call_1["标签等于"](_call_1, "fx")
+        end)())
+        return _call_1["其中"](_call_1, function(x)
+                local _call_2 = x["名称"]
+                return _call_2["结尾为"](_call_2, "(克隆)")
+        end)
+end)())
 _u7ed3_u679c = _call_1["摧毁"](_call_1)
 do
         do
@@ -334,10 +359,8 @@ local _1
 _1 = function()
         _u6253_u5370(1)
         local _accum_0 = { }
-        local _len_0 = 1
         while false do
                 break
-                _len_0 = _len_0 + 1
         end
         return _accum_0
 end
diff --git a/spec/outputs/unicode/multiline_chain.lua b/spec/outputs/unicode/multiline_chain.lua
index c1da13f..61e7057 100644
--- a/spec/outputs/unicode/multiline_chain.lua
+++ b/spec/outputs/unicode/multiline_chain.lua
@@ -59,10 +59,8 @@ _u51fd_u6570 = function()
         return _accum_0
 end
 local _anon_func_0 = function(_u53d8_u91cfa)
-        do
-                local _call_1 = _u53d8_u91cfa
-                return (_call_1["变量b"](_call_1, 123))["变量c"]("abc")
-        end
+        local _call_1 = _u53d8_u91cfa
+        return (_call_1["变量b"](_call_1, 123))["变量c"]("abc")
 end
 local _u51fd_u65701
 _u51fd_u65701 = function()
diff --git a/spec/outputs/unicode/plus.lua b/spec/outputs/unicode/plus.lua
index 75e4aac..adce62e 100644
--- a/spec/outputs/unicode/plus.lua
+++ b/spec/outputs/unicode/plus.lua
@@ -67,7 +67,6 @@ _u80cc_u5305 = {
 local _u5f00_u59cb = {
         ["东西"] = "冷"
 }
-local _u6d17_u6fa1
-_u6d17_u6fa1 = {
+local _u6d17_u6fa1 = {
         ["在"] = "火"
 }
diff --git a/spec/outputs/unicode/syntax.lua b/spec/outputs/unicode/syntax.lua
index ea97bb9..a13302b 100644
--- a/spec/outputs/unicode/syntax.lua
+++ b/spec/outputs/unicode/syntax.lua
@@ -258,9 +258,11 @@ _u53d8_u91cfx = 0
 local _list_0 = _u503c
 for _index_0 = 1, #_list_0 do
         local _u53d8_u91cfv = _list_0[_index_0]
-        if ntype(_u53d8_u91cfv) == "函数定义" then
-                _ = _u53d8_u91cfx + 1
-        end
+        _ = ((function()
+                if ntype(_u53d8_u91cfv) == "函数定义" then
+                        return _u53d8_u91cfx + 1
+                end
+        end)())
 end
 _u4f60_u597d = {
         ["某物"] = _u4e16_u754c,
@@ -284,10 +286,8 @@ _ = 5 - _u4ec0_u4e48(_u65e0_u804a)
 _u4ec0_u4e48(_u65e0_u804a - 5)
 _u53d8_u91cfx = _u4f60_u597d - _u4e16_u754c - _u67d0_u7269
 local _anon_func_0 = function(_u4ec0_u4e48)
-        do
-                local _call_8 = _u4ec0_u4e48
-                return _call_8["酷"](_call_8, 100)
-        end
+        local _call_8 = _u4ec0_u4e48
+        return _call_8["酷"](_call_8, 100)
 end
 (function(_u67d0_u7269)
         if _u67d0_u7269 == nil then
diff --git a/spec/outputs/unicode/try_catch.lua b/spec/outputs/unicode/try_catch.lua
index 22f29f9..f8c7849 100644
--- a/spec/outputs/unicode/try_catch.lua
+++ b/spec/outputs/unicode/try_catch.lua
@@ -32,11 +32,13 @@ pcall(function()
         return _u8868["函数"]()
 end)
 pcall(function()
-        return _u8868["函数"]()
+        return (_u8868["函数"]())
 end)
 pcall(function()
-        local _call_0 = _u8868
-        return _call_0["函数"](_call_0, 1, 2, 3)
+        return ((function()
+                local _call_0 = _u8868
+                return _call_0["函数"](_call_0, 1, 2, 3)
+        end)())
 end)
 pcall(function()
         return _u8868["函数"](1)
@@ -52,7 +54,7 @@ end)) then
         _u6253_u5370("好的")
 end
 if xpcall(function()
-        return _u51fd_u6570(1)
+        return (_u51fd_u6570(1))
 end, function(_u9519_u8bef)
         return _u6253_u5370(_u9519_u8bef)
 end) then
diff --git a/spec/outputs/unicode/vararg.lua b/spec/outputs/unicode/vararg.lua
index b837006..fc894ff 100644
--- a/spec/outputs/unicode/vararg.lua
+++ b/spec/outputs/unicode/vararg.lua
@@ -125,14 +125,10 @@ local _anon_func_11 = function(_u9879_u76ee, ...)
         return _tbl_0
 end
 local _anon_func_12 = function(_u51fd_u6570)
-        do
-                return _u51fd_u6570()
-        end
+        return _u51fd_u6570()
 end
 local _anon_func_13 = function(_u51fd_u6570, ...)
-        do
-                return _u51fd_u6570(...)
-        end
+        return _u51fd_u6570(...)
 end
 local _anon_func_14 = function(_u51fd_u6570)
         local _accum_0 = { }
@@ -195,15 +191,11 @@ local _anon_func_23 = function(_u51fd_u6570, ...)
         return nil
 end
 local _anon_func_24 = function(_u6253_u5370, select, ...)
-        do
-                _u6253_u5370(select("#", ...))
-                return _u6253_u5370(...)
-        end
+        _u6253_u5370(select("#", ...))
+        return _u6253_u5370(...)
 end
 local _anon_func_25 = function(_u6253_u5370, ...)
-        do
-                return _u6253_u5370(...)
-        end
+        return _u6253_u5370(...)
 end
 local _anon_func_26 = function(_u53d8_u91cfx, _u8868, _u88682)
         if 1 == _u53d8_u91cfx then
@@ -214,9 +206,7 @@ local _anon_func_26 = function(_u53d8_u91cfx, _u8868, _u88682)
         end
 end
 local _anon_func_27 = function(_u6253_u5370, ...)
-        do
-                return _u6253_u5370(...)
-        end
+        return _u6253_u5370(...)
 end
 local _anon_func_28 = function(_u6761_u4ef6)
         if _u6761_u4ef6 then
@@ -224,10 +214,8 @@ local _anon_func_28 = function(_u6761_u4ef6)
         end
 end
 local _anon_func_29 = function(_u6253_u5370, _arg_0, ...)
-        do
-                local _u8868 = _arg_0
-                return _u6253_u5370(...)
-        end
+        local _u8868 = _arg_0
+        return _u6253_u5370(...)
 end
 local _u8fde_u63a5
 _u8fde_u63a5 = function(...)
diff --git a/spec/outputs/unicode/with.lua b/spec/outputs/unicode/with.lua
index 7a5ba00..3a32a27 100644
--- a/spec/outputs/unicode/with.lua
+++ b/spec/outputs/unicode/with.lua
@@ -161,17 +161,15 @@ do
         }
 end
 do
-        do
-                local _with_0 = _u5b9e_u5fc3_u77e9_u5f62({
-                        ["宽"] = w,
-                        ["高"] = h,
-                        ["颜色"] = 0x66000000
-                })
-                _u63a9_u7801 = _with_0
-                if _with_0 ~= nil then
-                        _with_0["触摸启用"] = true
-                        _with_0["吞噬触摸"] = true
-                end
+        local _with_0 = _u5b9e_u5fc3_u77e9_u5f62({
+                ["宽"] = w,
+                ["高"] = h,
+                ["颜色"] = 0x66000000
+        })
+        _u63a9_u7801 = _with_0
+        if _with_0 ~= nil then
+                _with_0["触摸启用"] = true
+                _with_0["吞噬触摸"] = true
         end
 end
 do