8 files changed, 57 insertions, 74 deletions

diff --git a/spec/outputs/unicode/assign.lua b/spec/outputs/unicode/assign.lua
index d4ad56a..e00d016 100644
--- a/spec/outputs/unicode/assign.lua
+++ b/spec/outputs/unicode/assign.lua
@@ -43,10 +43,8 @@ do
         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/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/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 b14f571..b4e78cd 100644
--- a/spec/outputs/unicode/macro.lua
+++ b/spec/outputs/unicode/macro.lua
@@ -216,17 +216,15 @@ do
 end
 local _ = require('下划线')
 local _anon_func_0 = function(_)
-        do
-                local _call_0 = (_({
-                        1,
-                        2,
-                        3,
-                        4,
-                        -2,
-                        3
-                }))
-                return _call_0["链"](_call_0)
-        end
+        local _call_0 = (_({
+                1,
+                2,
+                3,
+                4,
+                -2,
+                3
+        }))
+        return _call_0["链"](_call_0)
 end
 local _call_0 = ((function()
         local _call_0 = ((function()
@@ -241,17 +239,15 @@ local _call_0 = ((function()
 end)())
 local _u7ed3_u679ca = _call_0["取值"](_call_0)
 local _anon_func_1 = function(_)
-        do
-                local _call_1 = (_({
-                        1,
-                        2,
-                        3,
-                        4,
-                        -2,
-                        3
-                }))
-                return _call_1["链"](_call_1)
-        end
+        local _call_1 = (_({
+                1,
+                2,
+                3,
+                4,
+                -2,
+                3
+        }))
+        return _call_1["链"](_call_1)
 end
 do
         local _call_1 = ((function()
@@ -270,10 +266,8 @@ do
         end)
 end
 local _anon_func_2 = function(_u539f_u70b9)
-        do
-                local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
-                return _call_1["父节点"](_call_1)
-        end
+        local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
+        return _call_1["父节点"](_call_1)
 end
 local _call_1 = ((function()
         local _call_1 = ((function()
@@ -365,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/syntax.lua b/spec/outputs/unicode/syntax.lua
index 1984f40..a13302b 100644
--- a/spec/outputs/unicode/syntax.lua
+++ b/spec/outputs/unicode/syntax.lua
@@ -286,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/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(...)