From 21004f1fb9b2f6129a231a6c8d99179f0d6e3edf Mon Sep 17 00:00:00 2001 From: Li Jin Date: Mon, 25 Mar 2024 08:25:06 +0800 Subject: remove one more redundant 'do' block from destructuring. --- spec/outputs/5.1/attrib.lua | 12 +-- spec/outputs/assign.lua | 12 +-- spec/outputs/attrib.lua | 12 +-- spec/outputs/backcall.lua | 14 ++- spec/outputs/codes_from_doc.lua | 104 +++++++----------- spec/outputs/codes_from_doc_zh.lua | 104 +++++++----------- spec/outputs/cond.lua | 6 +- spec/outputs/destructure.lua | 198 ++++++++++++++--------------------- spec/outputs/import.lua | 12 +-- spec/outputs/lists.lua | 16 ++- spec/outputs/local.lua | 6 +- spec/outputs/metatable.lua | 24 ++--- spec/outputs/unicode/assign.lua | 12 +-- spec/outputs/unicode/backcall.lua | 14 ++- spec/outputs/unicode/cond.lua | 6 +- spec/outputs/unicode/destructure.lua | 198 ++++++++++++++--------------------- spec/outputs/unicode/import.lua | 12 +-- spec/outputs/unicode/local.lua | 6 +- spec/outputs/unicode/metatable.lua | 24 ++--- 19 files changed, 303 insertions(+), 489 deletions(-) (limited to 'spec') diff --git a/spec/outputs/5.1/attrib.lua b/spec/outputs/5.1/attrib.lua index 0edaf0e..9cacd97 100644 --- a/spec/outputs/5.1/attrib.lua +++ b/spec/outputs/5.1/attrib.lua @@ -38,13 +38,11 @@ do end do local a, b - do - local _obj_0 = { - 2, - 3 - } - a, b = _obj_0[1], _obj_0[2] - end + local _obj_0 = { + 2, + 3 + } + a, b = _obj_0[1], _obj_0[2] end local _anon_func_0 = function(_close_1, error, f, _arg_0, ...) do diff --git a/spec/outputs/assign.lua b/spec/outputs/assign.lua index 61b0843..5552f73 100644 --- a/spec/outputs/assign.lua +++ b/spec/outputs/assign.lua @@ -53,15 +53,11 @@ return _(function() do local a, b if "a" == c then - do - local _obj_0 = tb - a, b = _obj_0[1], _obj_0[2] - end + local _obj_0 = tb + a, b = _obj_0[1], _obj_0[2] elseif "b" == c then - do - local _obj_0 = f() - a, b = _obj_0[1], _obj_0[2] - end + local _obj_0 = f() + a, b = _obj_0[1], _obj_0[2] end end if x then diff --git a/spec/outputs/attrib.lua b/spec/outputs/attrib.lua index f6b0784..626944e 100644 --- a/spec/outputs/attrib.lua +++ b/spec/outputs/attrib.lua @@ -27,13 +27,11 @@ do end do local a, b - do - local _obj_0 = { - 2, - 3 - } - a, b = _obj_0[1], _obj_0[2] - end + local _obj_0 = { + 2, + 3 + } + a, b = _obj_0[1], _obj_0[2] end do local v = (function() diff --git a/spec/outputs/backcall.lua b/spec/outputs/backcall.lua index 38e5754..cb8b2b7 100644 --- a/spec/outputs/backcall.lua +++ b/spec/outputs/backcall.lua @@ -80,15 +80,13 @@ end do local result, msg do - do - local _obj_0 = receiveAsync("filename.txt", function(data) - print(data) - return processAsync(data, function(info) - return check(info) - end) + local _obj_0 = receiveAsync("filename.txt", function(data) + print(data) + return processAsync(data, function(info) + return check(info) end) - result, msg = _obj_0.result, _obj_0.msg - end + end) + result, msg = _obj_0.result, _obj_0.msg end print(result, msg) local totalSize = reduce(((function() diff --git a/spec/outputs/codes_from_doc.lua b/spec/outputs/codes_from_doc.lua index 1f593db..ca54086 100644 --- a/spec/outputs/codes_from_doc.lua +++ b/spec/outputs/codes_from_doc.lua @@ -359,10 +359,8 @@ do C, Ct, Cmt = _obj_0.C, _obj_0.Ct, _obj_0.Cmt end local one, two, ch - do - local _obj_0 = require("export") - one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] - end + local _obj_0 = require("export") + one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] end local _module_0 = { } local a, b, c = 1, 2, 3 @@ -527,36 +525,26 @@ local obj2 = { local first, second = obj2.numbers[1], obj2.numbers[2] print(first, second, color) local first, second, color -do - local _obj_0 = obj2 - first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color -end +local _obj_0 = obj2 +first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color local concat, insert -do - local _obj_0 = table - concat, insert = _obj_0.concat, _obj_0.insert -end +local _obj_0 = table +concat, insert = _obj_0.concat, _obj_0.insert local mix, max, rand -do - local _obj_0 = math - mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random -end +local _obj_0 = math +mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random local name, job -do - local _obj_0 = person - name, job = _obj_0.name, _obj_0.job - if name == nil then - name = "nameless" - end - if job == nil then - job = "jobless" - end +local _obj_0 = person +name, job = _obj_0.name, _obj_0.job +if name == nil then + name = "nameless" end -local two, four -do - local _obj_0 = items - two, four = _obj_0[2], _obj_0[4] +if job == nil then + job = "jobless" end +local two, four +local _obj_0 = items +two, four = _obj_0[2], _obj_0[4] local tuples = { { "hello", @@ -647,10 +635,8 @@ local _ = setmetatable({ }, { end }) local a, b, c, d -do - local _obj_0 = tb - a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] -end +local _obj_0 = tb +a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] local some_string = "Here is a string\n that has a line break in it." print("I am " .. tostring(math.random() * 100) .. "% sure.") local integer = 1000000 @@ -2360,10 +2346,8 @@ do C, Ct, Cmt = _obj_0.C, _obj_0.Ct, _obj_0.Cmt end local one, two, ch - do - local _obj_0 = require("export") - one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] - end + local _obj_0 = require("export") + one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] end local _module_0 = { } local a, b, c = 1, 2, 3 @@ -2528,36 +2512,26 @@ local obj2 = { local first, second = obj2.numbers[1], obj2.numbers[2] print(first, second, color) local first, second, color -do - local _obj_0 = obj2 - first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color -end +local _obj_0 = obj2 +first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color local concat, insert -do - local _obj_0 = table - concat, insert = _obj_0.concat, _obj_0.insert -end +local _obj_0 = table +concat, insert = _obj_0.concat, _obj_0.insert local mix, max, rand -do - local _obj_0 = math - mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random -end +local _obj_0 = math +mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random local name, job -do - local _obj_0 = person - name, job = _obj_0.name, _obj_0.job - if name == nil then - name = "nameless" - end - if job == nil then - job = "jobless" - end +local _obj_0 = person +name, job = _obj_0.name, _obj_0.job +if name == nil then + name = "nameless" end -local two, four -do - local _obj_0 = items - two, four = _obj_0[2], _obj_0[4] +if job == nil then + job = "jobless" end +local two, four +local _obj_0 = items +two, four = _obj_0[2], _obj_0[4] local tuples = { { "hello", @@ -2648,10 +2622,8 @@ local _ = setmetatable({ }, { end }) local a, b, c, d -do - local _obj_0 = tb - a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] -end +local _obj_0 = tb +a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] local some_string = "Here is a string\n that has a line break in it." print("I am " .. tostring(math.random() * 100) .. "% sure.") local integer = 1000000 diff --git a/spec/outputs/codes_from_doc_zh.lua b/spec/outputs/codes_from_doc_zh.lua index fff0bdd..dfa6efd 100644 --- a/spec/outputs/codes_from_doc_zh.lua +++ b/spec/outputs/codes_from_doc_zh.lua @@ -359,10 +359,8 @@ do C, Ct, Cmt = _obj_0.C, _obj_0.Ct, _obj_0.Cmt end local one, two, ch - do - local _obj_0 = require("export") - one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] - end + local _obj_0 = require("export") + one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] end local _module_0 = { } local a, b, c = 1, 2, 3 @@ -527,36 +525,26 @@ local obj2 = { local first, second = obj2.numbers[1], obj2.numbers[2] print(first, second, color) local first, second, color -do - local _obj_0 = obj2 - first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color -end +local _obj_0 = obj2 +first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color local concat, insert -do - local _obj_0 = table - concat, insert = _obj_0.concat, _obj_0.insert -end +local _obj_0 = table +concat, insert = _obj_0.concat, _obj_0.insert local mix, max, rand -do - local _obj_0 = math - mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random -end +local _obj_0 = math +mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random local name, job -do - local _obj_0 = person - name, job = _obj_0.name, _obj_0.job - if name == nil then - name = "nameless" - end - if job == nil then - job = "jobless" - end +local _obj_0 = person +name, job = _obj_0.name, _obj_0.job +if name == nil then + name = "nameless" end -local two, four -do - local _obj_0 = items - two, four = _obj_0[2], _obj_0[4] +if job == nil then + job = "jobless" end +local two, four +local _obj_0 = items +two, four = _obj_0[2], _obj_0[4] local tuples = { { "hello", @@ -647,10 +635,8 @@ local _ = setmetatable({ }, { end }) local a, b, c, d -do - local _obj_0 = tb - a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] -end +local _obj_0 = tb +a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] local some_string = "这是一个字符串\n 并包括一个换行。" print("我有" .. tostring(math.random() * 100) .. "%的把握。") local integer = 1000000 @@ -2354,10 +2340,8 @@ do C, Ct, Cmt = _obj_0.C, _obj_0.Ct, _obj_0.Cmt end local one, two, ch - do - local _obj_0 = require("export") - one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] - end + local _obj_0 = require("export") + one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1] end local _module_0 = { } local a, b, c = 1, 2, 3 @@ -2522,36 +2506,26 @@ local obj2 = { local first, second = obj2.numbers[1], obj2.numbers[2] print(first, second, color) local first, second, color -do - local _obj_0 = obj2 - first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color -end +local _obj_0 = obj2 +first, second, color = _obj_0.numbers[1], _obj_0.numbers[2], _obj_0.properties.color local concat, insert -do - local _obj_0 = table - concat, insert = _obj_0.concat, _obj_0.insert -end +local _obj_0 = table +concat, insert = _obj_0.concat, _obj_0.insert local mix, max, rand -do - local _obj_0 = math - mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random -end +local _obj_0 = math +mix, max, rand = _obj_0.mix, _obj_0.max, _obj_0.random local name, job -do - local _obj_0 = person - name, job = _obj_0.name, _obj_0.job - if name == nil then - name = "nameless" - end - if job == nil then - job = "jobless" - end +local _obj_0 = person +name, job = _obj_0.name, _obj_0.job +if name == nil then + name = "nameless" end -local two, four -do - local _obj_0 = items - two, four = _obj_0[2], _obj_0[4] +if job == nil then + job = "jobless" end +local two, four +local _obj_0 = items +two, four = _obj_0[2], _obj_0[4] local tuples = { { "hello", @@ -2642,10 +2616,8 @@ local _ = setmetatable({ }, { end }) local a, b, c, d -do - local _obj_0 = tb - a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] -end +local _obj_0 = tb +a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2] local some_string = "这是一个字符串\n 并包括一个换行。" print("我有" .. tostring(math.random() * 100) .. "%的把握。") local integer = 1000000 diff --git a/spec/outputs/cond.lua b/spec/outputs/cond.lua index 5a5aae5..083419a 100644 --- a/spec/outputs/cond.lua +++ b/spec/outputs/cond.lua @@ -318,10 +318,8 @@ do if _des_0 then _M = _des_0 local Thing = _M.Thing - do - local _obj_0 = _M - a, b = _obj_0.a, _obj_0.b - end + local _obj_0 = _M + a, b = _obj_0.a, _obj_0.b end end end diff --git a/spec/outputs/destructure.lua b/spec/outputs/destructure.lua index 224ed2d..2d0d46f 100644 --- a/spec/outputs/destructure.lua +++ b/spec/outputs/destructure.lua @@ -10,10 +10,8 @@ do a, b, c = _obj_0[1][1], _obj_0[2], _obj_0[3][1] end local hello, world - do - local _obj_0 = value - hello, world = _obj_0.hello, _obj_0.world - end + local _obj_0 = value + hello, world = _obj_0.hello, _obj_0.world end do local no, thing @@ -49,17 +47,13 @@ do end do c = nil - do - local _obj_0 = tbl - a, b = _obj_0.a, _obj_0.b - end + local _obj_0 = tbl + a, b = _obj_0.a, _obj_0.b end do a = tbl - do - local _obj_0 = _ - b, c = _obj_0.b, _obj_0.c - end + local _obj_0 = _ + b, c = _obj_0.b, _obj_0.c end do b = _ @@ -88,17 +82,13 @@ do end do local c, e - do - local _obj_0 = tb - c, e = _obj_0.a.b, _obj_0.a.d - end + local _obj_0 = tb + c, e = _obj_0.a.b, _obj_0.a.d end do local c, e, f - do - local _obj_0 = tb - c, e, f = _obj_0.a[1].b, _obj_0.a[2].d, _obj_0.a[3] - end + local _obj_0 = tb + c, e, f = _obj_0.a[1].b, _obj_0.a[2].d, _obj_0.a[3] end do self.world = x[1] @@ -169,10 +159,8 @@ do end do local a, b, c - do - local _obj_0 = z - a, b, c = _obj_0[1], _obj_0[2], _obj_0[3] - end + local _obj_0 = z + a, b, c = _obj_0[1], _obj_0[2], _obj_0[3] end local _ _ = function(z) @@ -189,21 +177,17 @@ do end do local a, b, c - do - local _obj_0 = thing - a, b, c = _obj_0["if"][1], _obj_0["if"][2], _obj_0["if"][3] - end + local _obj_0 = thing + a, b, c = _obj_0["if"][1], _obj_0["if"][2], _obj_0["if"][3] end do local a, b if true then - do - local _obj_0 = { - a = "Hello", - b = "World" - } - a, b = _obj_0.a, _obj_0.b - end + local _obj_0 = { + a = "Hello", + b = "World" + } + a, b = _obj_0.a, _obj_0.b end local days, hours, mins, secs do @@ -305,41 +289,33 @@ do end end end - do - local _tmp_0 - do - local _obj_0 = getmetatable(tb) - _tmp_0 = _obj_0.func + local _tmp_0 + local _obj_0 = getmetatable(tb) + _tmp_0 = _obj_0.func + if _tmp_0 == nil then + local _obj_1 = item + if _obj_1 ~= nil then + _tmp_0 = _obj_1.defVal end - if _tmp_0 == nil then - local _obj_0 = item - if _obj_0 ~= nil then - _tmp_0 = _obj_0.defVal - end - end - a.b(function() - return 123 - end).c = _tmp_0 end + a.b(function() + return 123 + end).c = _tmp_0 end do local mt, subFunc - do - local _obj_0 = getmetatable(tb.x) - mt, subFunc = _obj_0, _obj_0.__sub - if mt == nil then - mt = { } - end + local _obj_0 = getmetatable(tb.x) + mt, subFunc = _obj_0, _obj_0.__sub + if mt == nil then + mt = { } end end do local mt, subFunc - do - local _obj_0 = tb - mt, subFunc = getmetatable(_obj_0.x), getmetatable(_obj_0.x).__sub - if mt == nil then - mt = { } - end + local _obj_0 = tb + mt, subFunc = getmetatable(_obj_0.x), getmetatable(_obj_0.x).__sub + if mt == nil then + mt = { } end end do @@ -386,31 +362,25 @@ do end do local a, b - do - local _obj_0 = tb - a, b = _obj_0[2], _obj_0[4] - end + local _obj_0 = tb + a, b = _obj_0[2], _obj_0[4] end do local a, b - do - local _obj_0 = tb - a, b = _obj_0[1], _obj_0[3] - end + local _obj_0 = tb + a, b = _obj_0[1], _obj_0[3] end do - do - local _obj_0 = x.x.x - local _tmp_0, _tmp_1 = _obj_0.x, _obj_0.y - if _tmp_0 == nil then - _tmp_0 = 1 - end - if _tmp_1 == nil then - _tmp_1 = 2 - end - a.b = _tmp_0 - a.c = _tmp_1 + local _obj_0 = x.x.x + local _tmp_0, _tmp_1 = _obj_0.x, _obj_0.y + if _tmp_0 == nil then + _tmp_0 = 1 end + if _tmp_1 == nil then + _tmp_1 = 2 + end + a.b = _tmp_0 + a.c = _tmp_1 end do local width, height @@ -419,15 +389,13 @@ do width, height = _obj_0.width, _obj_0.height end local x, y - do - local _obj_0 = point - x, y = _obj_0.x, _obj_0.y - if x == nil then - x = 0.0 - end - if y == nil then - y = 0.0 - end + local _obj_0 = point + x, y = _obj_0.x, _obj_0.y + if x == nil then + x = 0.0 + end + if y == nil then + y = 0.0 end end do @@ -451,29 +419,25 @@ do end do local v1, v2, v3, v4 - do - local _obj_0 = tb - local _tmp_0, _tmp_1 = 1 + 1, self.x - v1, v2, v3, v4 = _obj_0[ [["abc"]]], _obj_0[_tmp_0][1], _obj_0[_tmp_0][2], _obj_0[_tmp_1] - if v1 == nil then - v1 = 111 - end - if v2 == nil then - v2 = 222 - end - if v3 == nil then - v3 = 333 - end - if v4 == nil then - v4 = 444 - end + local _obj_0 = tb + local _tmp_0, _tmp_1 = 1 + 1, self.x + v1, v2, v3, v4 = _obj_0[ [["abc"]]], _obj_0[_tmp_0][1], _obj_0[_tmp_0][2], _obj_0[_tmp_1] + if v1 == nil then + v1 = 111 end - local v5, v6, v7 - do - local _obj_0 = tb2 - local _tmp_2, _tmp_3 = func(), func2() - v5, v6, v7 = _obj_0['x-y-z'], _obj_0[_tmp_2][_tmp_3], _obj_0[_tmp_2][1] + if v2 == nil then + v2 = 222 + end + if v3 == nil then + v3 = 333 + end + if v4 == nil then + v4 = 444 end + local v5, v6, v7 + local _obj_1 = tb2 + local _tmp_2, _tmp_3 = func(), func2() + v5, v6, v7 = _obj_1['x-y-z'], _obj_1[_tmp_2][_tmp_3], _obj_1[_tmp_2][1] end do local value, value_meta @@ -512,16 +476,12 @@ do end do local tb = { } - do - local _tmp_0 = c() - local v2 = tb[_tmp_0] - end + local _tmp_0 = c() + local v2 = tb[_tmp_0] local v1 - do - local _obj_0 = getmetatable(tb) - local _tmp_1 = a + b - v1 = _obj_0[_tmp_1] - end + local _obj_0 = getmetatable(tb) + local _tmp_1 = a + b + v1 = _obj_0[_tmp_1] end do local add, field diff --git a/spec/outputs/import.lua b/spec/outputs/import.lua index ffe688b..83c99e2 100644 --- a/spec/outputs/import.lua +++ b/spec/outputs/import.lua @@ -149,10 +149,8 @@ do end do local func, ifVar - do - local _obj_1 = require("org.package.module") - func, ifVar = _obj_1["function"], _obj_1["if"] - end + local _obj_1 = require("org.package.module") + func, ifVar = _obj_1["function"], _obj_1["if"] end do local b = getmetatable(require("m")).__gc @@ -165,8 +163,6 @@ do end local d = require("m").c local g, i - do - local _obj_1 = require("m") - g, i = _obj_1[1], getmetatable(_obj_1[2]).__close - end + local _obj_1 = require("m") + g, i = _obj_1[1], getmetatable(_obj_1[2]).__close end diff --git a/spec/outputs/lists.lua b/spec/outputs/lists.lua index e2d512d..48ec9c8 100644 --- a/spec/outputs/lists.lua +++ b/spec/outputs/lists.lua @@ -318,15 +318,13 @@ end do a, b = hello[1], hello[2] local name, job - do - local _obj_0 = person - name, job = _obj_0[1], _obj_0[2] - if name == nil then - name = "nameless" - end - if job == nil then - job = "jobless" - end + local _obj_0 = person + name, job = _obj_0[1], _obj_0[2] + if name == nil then + name = "nameless" + end + if job == nil then + job = "jobless" end end return nil diff --git a/spec/outputs/local.lua b/spec/outputs/local.lua index 5d215e0..c5b3931 100644 --- a/spec/outputs/local.lua +++ b/spec/outputs/local.lua @@ -55,10 +55,8 @@ do k = 10 end x = 100 - do - local _obj_0 = y - a, b, c = _obj_0.a, _obj_0.b, _obj_0.c - end + local _obj_0 = y + a, b, c = _obj_0.a, _obj_0.b, _obj_0.c end do local a, b, c, d diff --git a/spec/outputs/metatable.lua b/spec/outputs/metatable.lua index 78de433..6af10e5 100644 --- a/spec/outputs/metatable.lua +++ b/spec/outputs/metatable.lua @@ -51,15 +51,11 @@ do local _obj_0, _obj_1 x, _obj_0, _obj_1 = 123, a.b.c, func() new, var = _obj_0.new, _obj_0.var - do - local _obj_2 = getmetatable(_obj_0) - close, closeA = _obj_2.__close, _obj_2.__close - end + local _obj_2 = getmetatable(_obj_0) + close, closeA = _obj_2.__close, _obj_2.__close num = _obj_1.num - do - local _obj_2 = getmetatable(_obj_1) - add, sub = _obj_2.__add, _obj_2.__sub - end + local _obj_3 = getmetatable(_obj_1) + add, sub = _obj_3.__add, _obj_3.__sub end setmetatable(a.b, { }) x.abc = 123 @@ -107,17 +103,13 @@ index = getmetatable(a).__index index = getmetatable(a).__index do local ctor, update - do - local _obj_0 = getmetatable(a) - ctor, update = _obj_0.new, _obj_0.update - end + local _obj_0 = getmetatable(a) + ctor, update = _obj_0.new, _obj_0.update end do local ctor, update - do - local _obj_0 = getmetatable(a) - ctor, update = _obj_0.new, _obj_0.update - end + local _obj_0 = getmetatable(a) + ctor, update = _obj_0.new, _obj_0.update end local tb = { } do diff --git a/spec/outputs/unicode/assign.lua b/spec/outputs/unicode/assign.lua index 16ece1a..cb53159 100644 --- a/spec/outputs/unicode/assign.lua +++ b/spec/outputs/unicode/assign.lua @@ -54,15 +54,11 @@ return __u65e0_u6548_u53d8_u91cf(function() local _u5143_u7d20a, _u5143_u7d20b local _exp_0 = _u5bf9_u8c61c if "a" == _exp_0 then - do - local _obj_0 = _u5b57_u5178 - _u5143_u7d20a, _u5143_u7d20b = _obj_0[1], _obj_0[2] - end + local _obj_0 = _u5b57_u5178 + _u5143_u7d20a, _u5143_u7d20b = _obj_0[1], _obj_0[2] elseif "b" == _exp_0 then - do - local _obj_0 = _u51fd_u6570() - _u5143_u7d20a, _u5143_u7d20b = _obj_0[1], _obj_0[2] - end + local _obj_0 = _u51fd_u6570() + _u5143_u7d20a, _u5143_u7d20b = _obj_0[1], _obj_0[2] end end do diff --git a/spec/outputs/unicode/backcall.lua b/spec/outputs/unicode/backcall.lua index f4bd5a3..85d7592 100644 --- a/spec/outputs/unicode/backcall.lua +++ b/spec/outputs/unicode/backcall.lua @@ -82,15 +82,13 @@ end do local _u7ed3_u679c, _u6d88_u606f do - do - local _obj_0 = _u5f02_u6b65_u63a5_u6536("文件名.txt", function(_u6570_u636e) - _u6253_u5370(_u6570_u636e) - return _u5f02_u6b65_u5904_u7406(_u6570_u636e, function(_u4fe1_u606f) - return _u68c0_u67e5(_u4fe1_u606f) - end) + local _obj_0 = _u5f02_u6b65_u63a5_u6536("文件名.txt", function(_u6570_u636e) + _u6253_u5370(_u6570_u636e) + return _u5f02_u6b65_u5904_u7406(_u6570_u636e, function(_u4fe1_u606f) + return _u68c0_u67e5(_u4fe1_u606f) end) - _u7ed3_u679c, _u6d88_u606f = _obj_0["结果"], _obj_0["消息"] - end + end) + _u7ed3_u679c, _u6d88_u606f = _obj_0["结果"], _obj_0["消息"] end _u6253_u5370(_u7ed3_u679c, _u6d88_u606f) local _u603b_u5927_u5c0f = _u5408_u5e76(((function() diff --git a/spec/outputs/unicode/cond.lua b/spec/outputs/unicode/cond.lua index 2b5af8a..7229001 100644 --- a/spec/outputs/unicode/cond.lua +++ b/spec/outputs/unicode/cond.lua @@ -320,10 +320,8 @@ do __u6a21_u5757 = _des_0 local _u4e1c_u897f = __u6a21_u5757["东西"] local a_u529f_u80fd, b_u529f_u80fd - do - local _obj_0 = __u6a21_u5757 - a_u529f_u80fd, b_u529f_u80fd = _obj_0["a功能"], _obj_0["b功能"] - end + local _obj_0 = __u6a21_u5757 + a_u529f_u80fd, b_u529f_u80fd = _obj_0["a功能"], _obj_0["b功能"] end end end diff --git a/spec/outputs/unicode/destructure.lua b/spec/outputs/unicode/destructure.lua index 7263d49..e1cd6ae 100644 --- a/spec/outputs/unicode/destructure.lua +++ b/spec/outputs/unicode/destructure.lua @@ -10,10 +10,8 @@ do _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0[1][1], _obj_0[2], _obj_0[3][1] end local _u4f60_u597d, _u4e16_u754c - do - local _obj_0 = _u503c - _u4f60_u597d, _u4e16_u754c = _obj_0["你好"], _obj_0["世界"] - end + local _obj_0 = _u503c + _u4f60_u597d, _u4e16_u754c = _obj_0["你好"], _obj_0["世界"] end do local _u5426, _u4e1c_u897f @@ -50,17 +48,13 @@ do end do _u53d8_u91cfc = nil - do - local _obj_0 = _u8868 - _u5b57_u6bb5a, _u5b57_u6bb5b = _obj_0["字段a"], _obj_0["字段b"] - end + local _obj_0 = _u8868 + _u5b57_u6bb5a, _u5b57_u6bb5b = _obj_0["字段a"], _obj_0["字段b"] end do local _u53d8_u91cfa = _u8868 - do - local _obj_0 = __u65e0_u6548_u53d8_u91cf - _u5b57_u6bb5b, _u5b57_u6bb5c = _obj_0["字段b"], _obj_0["字段c"] - end + local _obj_0 = __u65e0_u6548_u53d8_u91cf + _u5b57_u6bb5b, _u5b57_u6bb5c = _obj_0["字段b"], _obj_0["字段c"] end do _u53d8_u91cfb = __u65e0_u6548_u53d8_u91cf @@ -89,17 +83,13 @@ do end do local _u53d8_u91cfc, _u53d8_u91cfe - do - local _obj_0 = _u5bf9_u8c61tb - _u53d8_u91cfc, _u53d8_u91cfe = _obj_0["字段a"]["字段b"], _obj_0["字段a"]["字段d"] - end + local _obj_0 = _u5bf9_u8c61tb + _u53d8_u91cfc, _u53d8_u91cfe = _obj_0["字段a"]["字段b"], _obj_0["字段a"]["字段d"] end do local _u53d8_u91cfc, _u53d8_u91cfe, _u5143_u7d20f - do - local _obj_0 = _u5bf9_u8c61tb - _u53d8_u91cfc, _u53d8_u91cfe, _u5143_u7d20f = _obj_0["字段a"][1]["字段b"], _obj_0["字段a"][2]["字段d"], _obj_0["字段a"][3] - end + local _obj_0 = _u5bf9_u8c61tb + _u53d8_u91cfc, _u53d8_u91cfe, _u5143_u7d20f = _obj_0["字段a"][1]["字段b"], _obj_0["字段a"][2]["字段d"], _obj_0["字段a"][3] end do self["世界"] = _u53d8_u91cfx[1] @@ -165,10 +155,8 @@ do end do local _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c - do - local _obj_0 = _u53d8_u91cfz - _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0[1], _obj_0[2], _obj_0[3] - end + local _obj_0 = _u53d8_u91cfz + _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0[1], _obj_0[2], _obj_0[3] end local _ _ = function(_u53c2_u6570z) @@ -178,10 +166,8 @@ do local _u53d8_u91cfz = "〇〇" _ = function(_u53c2_u6570k) local _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c - do - local _obj_0 = _u53c2_u6570z - _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0[1], _obj_0[2], _obj_0[3] - end + local _obj_0 = _u53c2_u6570z + _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0[1], _obj_0[2], _obj_0[3] end end do @@ -189,21 +175,17 @@ do end do local _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c - do - local _obj_0 = _u4e1c_u897f - _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0["如果"][1], _obj_0["如果"][2], _obj_0["如果"][3] - end + local _obj_0 = _u4e1c_u897f + _u5143_u7d20a, _u5143_u7d20b, _u5143_u7d20c = _obj_0["如果"][1], _obj_0["如果"][2], _obj_0["如果"][3] end do local _u5b57_u6bb5a, _u5b57_u6bb5b if true then - do - local _obj_0 = { - ["字段a"] = "你好", - ["字段b"] = "世界" - } - _u5b57_u6bb5a, _u5b57_u6bb5b = _obj_0["字段a"], _obj_0["字段b"] - end + local _obj_0 = { + ["字段a"] = "你好", + ["字段b"] = "世界" + } + _u5b57_u6bb5a, _u5b57_u6bb5b = _obj_0["字段a"], _obj_0["字段b"] end local _u5929, _u5c0f_u65f6, _u5206_u949f, _u79d2 do @@ -311,41 +293,33 @@ do end end end - do - local _tmp_0 - do - local _obj_0 = getmetatable(_u5bf9_u8c61tb) - _tmp_0 = _obj_0["函数"] + local _tmp_0 + local _obj_0 = getmetatable(_u5bf9_u8c61tb) + _tmp_0 = _obj_0["函数"] + if _tmp_0 == nil then + local _obj_1 = _u9879_u76ee + if _obj_1 ~= nil then + _tmp_0 = _obj_1["默认值"] end - if _tmp_0 == nil then - local _obj_0 = _u9879_u76ee - if _obj_0 ~= nil then - _tmp_0 = _obj_0["默认值"] - end - end - a_u5bf9_u8c61["b字段"](function() - return 123 - end)["字段c"] = _tmp_0 end + a_u5bf9_u8c61["b字段"](function() + return 123 + end)["字段c"] = _tmp_0 end do local _u5143_u8868, _u51cf_u51fd_u6570 - do - local _obj_0 = getmetatable(_u5bf9_u8c61tb["字段x"]) - _u5143_u8868, _u51cf_u51fd_u6570 = _obj_0, _obj_0.__sub - if _u5143_u8868 == nil then - _u5143_u8868 = { } - end + local _obj_0 = getmetatable(_u5bf9_u8c61tb["字段x"]) + _u5143_u8868, _u51cf_u51fd_u6570 = _obj_0, _obj_0.__sub + if _u5143_u8868 == nil then + _u5143_u8868 = { } end end do local _u5143_u8868, _u51cf_u51fd_u6570 - do - local _obj_0 = _u5bf9_u8c61tb - _u5143_u8868, _u51cf_u51fd_u6570 = getmetatable(_obj_0["x字段"]), getmetatable(_obj_0["x字段"]).__sub - if _u5143_u8868 == nil then - _u5143_u8868 = { } - end + local _obj_0 = _u5bf9_u8c61tb + _u5143_u8868, _u51cf_u51fd_u6570 = getmetatable(_obj_0["x字段"]), getmetatable(_obj_0["x字段"]).__sub + if _u5143_u8868 == nil then + _u5143_u8868 = { } end end do @@ -380,24 +354,20 @@ do end do local a_u5143_u7d20, b_u5143_u7d20 - do - local _obj_0 = _u5bf9_u8c61tb - a_u5143_u7d20, b_u5143_u7d20 = _obj_0[2], _obj_0[4] - end + local _obj_0 = _u5bf9_u8c61tb + a_u5143_u7d20, b_u5143_u7d20 = _obj_0[2], _obj_0[4] end do - do - local _obj_0 = _u5bf9_u8c61x["字段x"]["字段x"] - local _tmp_0, _tmp_1 = _obj_0["字段x"], _obj_0["y字段"] - if _tmp_0 == nil then - _tmp_0 = 1 - end - if _tmp_1 == nil then - _tmp_1 = 2 - end - _u5bf9_u8c61a["字段b"] = _tmp_0 - a_u5bf9_u8c61["c字段"] = _tmp_1 + local _obj_0 = _u5bf9_u8c61x["字段x"]["字段x"] + local _tmp_0, _tmp_1 = _obj_0["字段x"], _obj_0["y字段"] + if _tmp_0 == nil then + _tmp_0 = 1 end + if _tmp_1 == nil then + _tmp_1 = 2 + end + _u5bf9_u8c61a["字段b"] = _tmp_0 + a_u5bf9_u8c61["c字段"] = _tmp_1 end do local _u5bbd, _u9ad8 @@ -406,15 +376,13 @@ do _u5bbd, _u9ad8 = _obj_0["宽"], _obj_0["高"] end local x_u5750_u6807, y_u5750_u6807 - do - local _obj_0 = _u70b9 - x_u5750_u6807, y_u5750_u6807 = _obj_0["x坐标"], _obj_0["y坐标"] - if x_u5750_u6807 == nil then - x_u5750_u6807 = 0.0 - end - if y_u5750_u6807 == nil then - y_u5750_u6807 = 0.0 - end + local _obj_0 = _u70b9 + x_u5750_u6807, y_u5750_u6807 = _obj_0["x坐标"], _obj_0["y坐标"] + if x_u5750_u6807 == nil then + x_u5750_u6807 = 0.0 + end + if y_u5750_u6807 == nil then + y_u5750_u6807 = 0.0 end end do @@ -438,29 +406,25 @@ do end do local _u53d8_u91cfv1, _u53d8_u91cfv2, _u53d8_u91cfv3, _u53d8_u91cfv4 - do - local _obj_0 = _u5bf9_u8c61tb - local _tmp_0, _tmp_1 = 1 + 1, self.x - _u53d8_u91cfv1, _u53d8_u91cfv2, _u53d8_u91cfv3, _u53d8_u91cfv4 = _obj_0[ [["abc"]]], _obj_0[_tmp_0][1], _obj_0[_tmp_0][2], _obj_0[_tmp_1] - if _u53d8_u91cfv1 == nil then - _u53d8_u91cfv1 = 111 - end - if _u53d8_u91cfv2 == nil then - _u53d8_u91cfv2 = 222 - end - if _u53d8_u91cfv3 == nil then - _u53d8_u91cfv3 = 333 - end - if _u53d8_u91cfv4 == nil then - _u53d8_u91cfv4 = 444 - end + local _obj_0 = _u5bf9_u8c61tb + local _tmp_0, _tmp_1 = 1 + 1, self.x + _u53d8_u91cfv1, _u53d8_u91cfv2, _u53d8_u91cfv3, _u53d8_u91cfv4 = _obj_0[ [["abc"]]], _obj_0[_tmp_0][1], _obj_0[_tmp_0][2], _obj_0[_tmp_1] + if _u53d8_u91cfv1 == nil then + _u53d8_u91cfv1 = 111 end - local _u53d8_u91cfv5, _u53d8_u91cfv6, _u53d8_u91cfv7 - do - local _obj_0 = _u5bf9_u8c61tb2 - local _tmp_2, _tmp_3 = _u51fd_u6570(), _u51fd_u65702() - _u53d8_u91cfv5, _u53d8_u91cfv6, _u53d8_u91cfv7 = _obj_0['x-y-z'], _obj_0[_tmp_2][_tmp_3], _obj_0[_tmp_2][1] + if _u53d8_u91cfv2 == nil then + _u53d8_u91cfv2 = 222 + end + if _u53d8_u91cfv3 == nil then + _u53d8_u91cfv3 = 333 + end + if _u53d8_u91cfv4 == nil then + _u53d8_u91cfv4 = 444 end + local _u53d8_u91cfv5, _u53d8_u91cfv6, _u53d8_u91cfv7 + local _obj_1 = _u5bf9_u8c61tb2 + local _tmp_2, _tmp_3 = _u51fd_u6570(), _u51fd_u65702() + _u53d8_u91cfv5, _u53d8_u91cfv6, _u53d8_u91cfv7 = _obj_1['x-y-z'], _obj_1[_tmp_2][_tmp_3], _obj_1[_tmp_2][1] end do local _u503c, _u5143_u503c @@ -499,16 +463,12 @@ do end do local _u5bf9_u8c61tb = { } - do - local _tmp_0 = _u51fd_u6570c() - local _u53d8_u91cfv2 = _u5bf9_u8c61tb[_tmp_0] - end + local _tmp_0 = _u51fd_u6570c() + local _u53d8_u91cfv2 = _u5bf9_u8c61tb[_tmp_0] local _u53d8_u91cfv1 - do - local _obj_0 = getmetatable(_u5bf9_u8c61tb) - local _tmp_1 = _u53d8_u91cfa + _u53d8_u91cfb - _u53d8_u91cfv1 = _obj_0[_tmp_1] - end + local _obj_0 = getmetatable(_u5bf9_u8c61tb) + local _tmp_1 = _u53d8_u91cfa + _u53d8_u91cfb + _u53d8_u91cfv1 = _obj_0[_tmp_1] end do local add, _u5b57_u6bb5 diff --git a/spec/outputs/unicode/import.lua b/spec/outputs/unicode/import.lua index e4aec89..7c31ceb 100644 --- a/spec/outputs/unicode/import.lua +++ b/spec/outputs/unicode/import.lua @@ -87,10 +87,8 @@ do end do local _u51fd_u6570, _u5982_u679c_u53d8_u91cf - do - local _obj_1 = require("组织.包.模块") - _u51fd_u6570, _u5982_u679c_u53d8_u91cf = _obj_1["函数体"], _obj_1["如果"] - end + local _obj_1 = require("组织.包.模块") + _u51fd_u6570, _u5982_u679c_u53d8_u91cf = _obj_1["函数体"], _obj_1["如果"] end do local _u53d8_u91cfb = getmetatable(require("块")).__gc @@ -103,8 +101,6 @@ do end local _u53d8_u91cfd = require("块")["字段c"] local _u5143_u7d20g, _u53d8_u91cfi - do - local _obj_1 = require("块") - _u5143_u7d20g, _u53d8_u91cfi = _obj_1[1], getmetatable(_obj_1[2]).__close - end + local _obj_1 = require("块") + _u5143_u7d20g, _u53d8_u91cfi = _obj_1[1], getmetatable(_obj_1[2]).__close end diff --git a/spec/outputs/unicode/local.lua b/spec/outputs/unicode/local.lua index 4b4b366..194fd06 100644 --- a/spec/outputs/unicode/local.lua +++ b/spec/outputs/unicode/local.lua @@ -55,10 +55,8 @@ do _u53d8_u91cfk = 10 end _u53d8_u91cfx = 100 - do - local _obj_0 = _u53d8_u91cfy - _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc = _obj_0[1], _obj_0[2], _obj_0[3] - end + local _obj_0 = _u53d8_u91cfy + _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc = _obj_0[1], _obj_0[2], _obj_0[3] end do local _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc, _u53d8_u91cfd diff --git a/spec/outputs/unicode/metatable.lua b/spec/outputs/unicode/metatable.lua index c7c8730..ca48d0d 100644 --- a/spec/outputs/unicode/metatable.lua +++ b/spec/outputs/unicode/metatable.lua @@ -51,15 +51,11 @@ do local _obj_0, _obj_1 _u53d8_u91cfx, _obj_0, _obj_1 = 123, _u53d8_u91cfa["变量b"]["变量c"], _u51fd_u6570() _u65b0, _u53d8_u91cf = _obj_0["新"], _obj_0["变量"] - do - local _obj_2 = getmetatable(_obj_0) - close, _u5173_u95edA = _obj_2.__close, _obj_2.__close - end + local _obj_2 = getmetatable(_obj_0) + close, _u5173_u95edA = _obj_2.__close, _obj_2.__close num = _obj_1.num - do - local _obj_2 = getmetatable(_obj_1) - add, sub = _obj_2.__add, _obj_2.__sub - end + local _obj_3 = getmetatable(_obj_1) + add, sub = _obj_3.__add, _obj_3.__sub end setmetatable(_u53d8_u91cfa["变量b"], { }) _u53d8_u91cfx.abc = 123 @@ -108,17 +104,13 @@ local _u7d22_u5f15 = getmetatable(_u53d8_u91cfa).__index index = getmetatable(_u53d8_u91cfa).__index do local _u6784_u9020, _u66f4_u65b0 - do - local _obj_0 = getmetatable(_u53d8_u91cfa) - _u6784_u9020, _u66f4_u65b0 = _obj_0["新"], _obj_0["更新"] - end + local _obj_0 = getmetatable(_u53d8_u91cfa) + _u6784_u9020, _u66f4_u65b0 = _obj_0["新"], _obj_0["更新"] end do local _u6784_u9020, _u66f4_u65b0 - do - local _obj_0 = getmetatable(_u53d8_u91cfa) - _u6784_u9020, _u66f4_u65b0 = _obj_0["新"], _obj_0["更新"] - end + local _obj_0 = getmetatable(_u53d8_u91cfa) + _u6784_u9020, _u66f4_u65b0 = _obj_0["新"], _obj_0["更新"] end local _u8868 = { } do -- cgit v1.2.3-55-g6feb