From 5604bbbb80bfcedb4a9085b90864e221f8104b33 Mon Sep 17 00:00:00 2001 From: Li Jin Date: Wed, 28 May 2025 18:20:16 +0800 Subject: Added `try!` syntax. --- spec/inputs/try_catch.yue | 122 +++++++++++++- spec/outputs/5.1/try_catch.lua | 265 +++++++++++++++++++++++++++++- spec/outputs/assign.lua | 6 +- spec/outputs/codes_from_doc.lua | 100 ++++++++++++ spec/outputs/codes_from_doc_zh.lua | 100 ++++++++++++ spec/outputs/try_catch.lua | 266 ++++++++++++++++++++++++++++++- spec/outputs/unicode/assign.lua | 6 +- spec/outputs/unicode/macro.lua | 46 +++--- spec/outputs/unicode/multiline_chain.lua | 6 +- spec/outputs/unicode/syntax.lua | 6 +- spec/outputs/unicode/vararg.lua | 28 +--- spec/outputs/upvalue_func.lua | 48 +++--- spec/outputs/vararg.lua | 28 +--- 13 files changed, 912 insertions(+), 115 deletions(-) (limited to 'spec') diff --git a/spec/inputs/try_catch.yue b/spec/inputs/try_catch.yue index 4e05bc6..f2583b7 100644 --- a/spec/inputs/try_catch.yue +++ b/spec/inputs/try_catch.yue @@ -62,6 +62,126 @@ f = -> do <- x local tb, a, b, c - f = -> try tb.f a, b, c + f1 = -> try tb.f a, b, c + + do + f1 = -> do + ok, ... = try func! + ... + + do + local func + a, b, c = try! func! + + do + a, b, c = try! func! + + do + a = (try! func!) ?? "default" + + do + f try! func! + + do + f try! + print 123 + func! + catch e + print e + e nil + +do + try + func 1, 2, 3 + catch err + print err + + try func 1, 2, 3 + catch err + print err + + try + print "trying" + func 1, 2, 3 + + do + success, result = try + func 1, 2, 3 + catch err + print err + + success, result = try func 1, 2, 3 + + tb = {} + + try tb.func + try tb.func! + try tb.func() + try (tb.func!) + try (tb\func(1, 2, 3)) + + try tb.func 1 + try tb.func(1) + + if (try func 1 + catch err + print err) + print "OK" + + if try (func 1) + catch err + print err + print "OK" + + do + if success, result := try func "abc", 123 + print result + + success, result = try func "abc", 123 + catch err + print err + + print result if success, result := try func "abc", 123 + catch err + print err + + do + try + func 1, 2, 3 + + try func 1, 2, 3 + + do + <- x + local tb, a, b, c + f1 = -> try tb.f a, b, c + + do + f1 = -> do + ok, ... = try func! + ... + + do + local func + a, b, c = try! func! + + do + a, b, c = try! func! + + do + a = (try! func!) ?? "default" + + do + f try! func! + + do + f try! + print 123 + func! + catch e + print e + e + +nil diff --git a/spec/outputs/5.1/try_catch.lua b/spec/outputs/5.1/try_catch.lua index efd92c6..d2b58bc 100644 --- a/spec/outputs/5.1/try_catch.lua +++ b/spec/outputs/5.1/try_catch.lua @@ -22,6 +22,43 @@ end local _anon_func_7 = function(a, b, c, tb) return tb.f(a, b, c) end +local _anon_func_8 = function(_arg_0, ...) + local ok = _arg_0 + return ... +end +local _anon_func_10 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_9 = function(func, pcall) + return _anon_func_10(pcall(func)) +end +local _anon_func_12 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_11 = function(func, pcall) + return _anon_func_12(pcall(func)) +end +local _anon_func_14 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_13 = function(func, print, xpcall) + return _anon_func_14(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) +end local f f = function() xpcall(function() @@ -104,10 +141,236 @@ f = function() do x(function() local tb, a, b, c - f = function() + local f1 + f1 = function() return pcall(_anon_func_7, a, b, c, tb) end end) end + do + local f1 + f1 = function() + do + return _anon_func_8(pcall(function() + return func() + end)) + end + end + end + do + local func + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a + local _exp_0 = (_anon_func_9(func, pcall)) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end + end + do + f(_anon_func_11(func, pcall)) + end + do + f(_anon_func_13(func, print, xpcall)) + end return nil end +local _anon_func_15 = function(a, b, c, tb) + return tb.f(a, b, c) +end +local _anon_func_16 = function(_arg_0, ...) + local ok = _arg_0 + return ... +end +do + xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + pcall(function() + print("trying") + return func(1, 2, 3) + end) + do + local success, result = xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + success, result = pcall(function() + return func(1, 2, 3) + end) + end + local tb = { } + pcall(function() + return tb.func + end) + pcall(function() + return tb.func() + end) + pcall(function() + return tb.func() + end) + pcall(function() + return (tb.func()) + end) + pcall(function() + return (tb:func(1, 2, 3)) + end) + pcall(function() + return tb.func(1) + end) + pcall(function() + return tb.func(1) + end) + if (xpcall(function() + return func(1) + end, function(err) + return print(err) + end)) then + print("OK") + end + if xpcall(function() + return (func(1)) + end, function(err) + return print(err) + end) then + print("OK") + end + do + do + local success, result = pcall(function() + return func("abc", 123) + end) + if success then + print(result) + end + end + local success, result = xpcall(function() + return func("abc", 123) + end, function(err) + return print(err) + end) + success, result = xpcall(function() + return func("abc", 123) + end, function(err) + return print(err) + end) + if success then + print(result) + end + end + do + pcall(function() + return func(1, 2, 3) + end) + pcall(function() + return func(1, 2, 3) + end) + end + do + x(function() + local tb, a, b, c + local f1 + f1 = function() + return pcall(_anon_func_15, a, b, c, tb) + end + end) + end + do + local f1 + f1 = function() + do + return _anon_func_16(pcall(function() + return func() + end)) + end + end + end + do + local func + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end + end + do + f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + end + do + f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) + end)()) + end +end +return nil diff --git a/spec/outputs/assign.lua b/spec/outputs/assign.lua index 162c5a8..89c5f8a 100644 --- a/spec/outputs/assign.lua +++ b/spec/outputs/assign.lua @@ -43,10 +43,8 @@ do end end local _anon_func_0 = function(print) - do - print(123) - return { } - end + print(123) + return { } end return _(function() setmetatable(a, _anon_func_0(print)) diff --git a/spec/outputs/codes_from_doc.lua b/spec/outputs/codes_from_doc.lua index 55be7df..cce0516 100644 --- a/spec/outputs/codes_from_doc.lua +++ b/spec/outputs/codes_from_doc.lua @@ -688,6 +688,56 @@ end) if success then print(result) end +local a, b, c +do + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end +end +do + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end +end +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) +end)()) +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) +end)()) local a = 123 local _ = setmetatable({ }, { __close = function() @@ -2909,6 +2959,56 @@ end) if success then print(result) end +local a, b, c +do + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end +end +do + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end +end +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) +end)()) +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) +end)()) local a = 123 local _ = setmetatable({ }, { __close = function() diff --git a/spec/outputs/codes_from_doc_zh.lua b/spec/outputs/codes_from_doc_zh.lua index 399f8c1..e267709 100644 --- a/spec/outputs/codes_from_doc_zh.lua +++ b/spec/outputs/codes_from_doc_zh.lua @@ -688,6 +688,56 @@ end) if success then print(result) end +local a, b, c +do + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end +end +do + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end +end +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) +end)()) +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) +end)()) local a = 123 local _ = setmetatable({ }, { __close = function() @@ -2903,6 +2953,56 @@ end) if success then print(result) end +local a, b, c +do + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end +end +do + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end +end +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) +end)()) +f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) +end)()) local a = 123 local _ = setmetatable({ }, { __close = function() diff --git a/spec/outputs/try_catch.lua b/spec/outputs/try_catch.lua index efd92c6..edb2341 100644 --- a/spec/outputs/try_catch.lua +++ b/spec/outputs/try_catch.lua @@ -22,6 +22,44 @@ end local _anon_func_7 = function(a, b, c, tb) return tb.f(a, b, c) end +local _anon_func_8 = function(_arg_0, ...) + local ok = _arg_0 + return ... +end +local _anon_func_10 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_9 = function(func, pcall) + return _anon_func_10(pcall(func)) +end +local _anon_func_12 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_11 = function(func, pcall) + return _anon_func_12(pcall(func)) +end +local _anon_func_14 = function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end +end +local _anon_func_15 = function(func, print) + print(123) + return func() +end +local _anon_func_13 = function(func, print, xpcall) + return _anon_func_14(xpcall(_anon_func_15, function(e) + print(e) + return e + end, func, print)) +end local f f = function() xpcall(function() @@ -104,10 +142,236 @@ f = function() do x(function() local tb, a, b, c - f = function() + local f1 + f1 = function() return pcall(_anon_func_7, a, b, c, tb) end end) end + do + local f1 + f1 = function() + do + return _anon_func_8(pcall(function() + return func() + end)) + end + end + end + do + local func + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a + local _exp_0 = (_anon_func_9(func, pcall)) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end + end + do + f(_anon_func_11(func, pcall)) + end + do + f(_anon_func_13(func, print, xpcall)) + end return nil end +local _anon_func_16 = function(a, b, c, tb) + return tb.f(a, b, c) +end +local _anon_func_17 = function(_arg_0, ...) + local ok = _arg_0 + return ... +end +do + xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + pcall(function() + print("trying") + return func(1, 2, 3) + end) + do + local success, result = xpcall(function() + return func(1, 2, 3) + end, function(err) + return print(err) + end) + success, result = pcall(function() + return func(1, 2, 3) + end) + end + local tb = { } + pcall(function() + return tb.func + end) + pcall(function() + return tb.func() + end) + pcall(function() + return tb.func() + end) + pcall(function() + return (tb.func()) + end) + pcall(function() + return (tb:func(1, 2, 3)) + end) + pcall(function() + return tb.func(1) + end) + pcall(function() + return tb.func(1) + end) + if (xpcall(function() + return func(1) + end, function(err) + return print(err) + end)) then + print("OK") + end + if xpcall(function() + return (func(1)) + end, function(err) + return print(err) + end) then + print("OK") + end + do + do + local success, result = pcall(function() + return func("abc", 123) + end) + if success then + print(result) + end + end + local success, result = xpcall(function() + return func("abc", 123) + end, function(err) + return print(err) + end) + success, result = xpcall(function() + return func("abc", 123) + end, function(err) + return print(err) + end) + if success then + print(result) + end + end + do + pcall(function() + return func(1, 2, 3) + end) + pcall(function() + return func(1, 2, 3) + end) + end + do + x(function() + local tb, a, b, c + local f1 + f1 = function() + return pcall(_anon_func_16, a, b, c, tb) + end + end) + end + do + local f1 + f1 = function() + do + return _anon_func_17(pcall(function() + return func() + end)) + end + end + end + do + local func + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a, b, c + local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function() + return func() + end) + if _ok_0 then + a, b, c = _ret_0, _ret_1, _ret_2 + end + end + do + local a + local _exp_0 = ((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + if _exp_0 ~= nil then + a = _exp_0 + else + a = "default" + end + end + do + f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(pcall(function() + return func() + end)) + end)()) + end + do + f((function() + return (function(_arg_0, ...) + local _ok_0 = _arg_0 + if _ok_0 then + return ... + end + end)(xpcall(function() + print(123) + return func() + end, function(e) + print(e) + return e + end)) + end)()) + end +end +return nil 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/macro.lua b/spec/outputs/unicode/macro.lua index 3b9327a..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() 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(...) diff --git a/spec/outputs/upvalue_func.lua b/spec/outputs/upvalue_func.lua index 3181adf..3e088be 100644 --- a/spec/outputs/upvalue_func.lua +++ b/spec/outputs/upvalue_func.lua @@ -214,10 +214,8 @@ local _anon_func_1 = function(valueB) end end local _anon_func_2 = function(print, select, _arg_0, ...) - do - local ok = _arg_0 - return print(select(3, ...)) - end + local ok = _arg_0 + return print(select(3, ...)) end local _anon_func_3 = function(tb) if tb ~= nil then @@ -242,11 +240,9 @@ local _anon_func_5 = function(getmetatable, tb) return _obj_0[1 + 1](_obj_0, "abc") end local _anon_func_6 = function(tb) - do - local _call_0 = tb - local _call_1 = _call_0["end"](_call_0) - return _call_1["🤣"](_call_1, 123) - end + local _call_0 = tb + local _call_1 = _call_0["end"](_call_0) + return _call_1["🤣"](_call_1, 123) end local _anon_func_7 = function(itemA, listA) for _index_0 = 1, #listA do @@ -354,17 +350,13 @@ local _anon_func_16 = function(pairs, tb, tostring) return _tbl_0 end local _anon_func_17 = function(print) - do - print(123) - return "abc" - end + print(123) + return "abc" end local _anon_func_18 = function(print, select, _arg_0, ...) - do - local success = _arg_0 - if success then - return print(select('#', ...)) - end + local success = _arg_0 + if success then + return print(select('#', ...)) end end local _anon_func_19 = function(cond, i) @@ -459,11 +451,9 @@ local _anon_func_25 = function(itemA, listA) return false end local _anon_func_24 = function(itemA, listA, tb) - do - local _call_0 = tb - local _call_1 = _call_0["end"](_call_0) - return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA))) - end + local _call_0 = tb + local _call_1 = _call_0["end"](_call_0) + return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA))) end GameEngine:onEvent("SomeEvent", function() return func(value + (_anon_func_21(cond)) + (_anon_func_22(valueB)) > _anon_func_23(tb) + _anon_func_24(itemA, listA, tb)) @@ -503,13 +493,11 @@ local _anon_func_27 = function(char) return nil end local _anon_func_28 = function(os, _arg_0, ...) - do - local ok = _arg_0 - if ok then - return ... - else - return os.exit(1) - end + local ok = _arg_0 + if ok then + return ... + else + return os.exit(1) end end local _anon_func_29 = function(debug_env_after, debug_env_before, env, func) diff --git a/spec/outputs/vararg.lua b/spec/outputs/vararg.lua index dabba44..254aa6a 100644 --- a/spec/outputs/vararg.lua +++ b/spec/outputs/vararg.lua @@ -125,14 +125,10 @@ local _anon_func_11 = function(items, ...) return _tbl_0 end local _anon_func_12 = function(func) - do - return func() - end + return func() end local _anon_func_13 = function(func, ...) - do - return func(...) - end + return func(...) end local _anon_func_14 = function(func) local _accum_0 = { } @@ -195,15 +191,11 @@ local _anon_func_23 = function(func, ...) return nil end local _anon_func_24 = function(print, select, ...) - do - print(select("#", ...)) - return print(...) - end + print(select("#", ...)) + return print(...) end local _anon_func_25 = function(print, ...) - do - return print(...) - end + return print(...) end local _anon_func_26 = function(tb, tb2, x) if 1 == x then @@ -214,9 +206,7 @@ local _anon_func_26 = function(tb, tb2, x) end end local _anon_func_27 = function(print, ...) - do - return print(...) - end + return print(...) end local _anon_func_28 = function(cond) if cond then @@ -224,10 +214,8 @@ local _anon_func_28 = function(cond) end end local _anon_func_29 = function(print, _arg_0, ...) - do - local tb = _arg_0 - return print(...) - end + local tb = _arg_0 + return print(...) end local join join = function(...) -- cgit v1.2.3-55-g6feb