Skip to content

Commit afc8661

Browse files
pigpigyyypigpigyyy
committed
try fixing issue #162.
1 parent 4f399a1 commit afc8661

File tree

15 files changed

+1328
-819
lines changed

15 files changed

+1328
-819
lines changed

‎spec/inputs/attrib.yue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ do
4141

4242
close _ = <close>: -> print "first"
4343

44+
print "third"
45+
4446
_defers = setmetatable {}, __close: =>
4547
@[#@]!
4648
@[#@] = nil

‎spec/inputs/unicode/multiline_chain.yue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121

2222
表bb =
2323
键1: 变量a
24-
\变量b 123
25-
.变量c!
24+
\变量b 123,
25+
:字段A
26+
.变量c 1, 2, 3
27+
:字段B
2628
键2:
2729
键w1: 变量a!
2830
.变量b

‎spec/outputs/5.1/attrib.lua

Lines changed: 103 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,22 @@ do
5050
a, b = _obj_0[1], _obj_0[2]
5151
end
5252
end
53+
local _anon_func_0 = function(f, error, _close_1, _arg_0, ...)
54+
do
55+
local _ok_0 = _arg_0
56+
_close_1(f)
57+
if _ok_0 then
58+
return ...
59+
else
60+
return error(...)
61+
end
62+
end
63+
end
64+
local _anon_func_1 = function(io)
65+
local _with_0 = io.open("file.txt")
66+
_with_0:write("Hello")
67+
return _with_0
68+
end
5369
do
5470
local v = (function()
5571
if flag then
@@ -70,23 +86,43 @@ do
7086
return error(...)
7187
end
7288
end)(pcall(function(...)
73-
local f = (function()
74-
local _with_0 = io.open("file.txt")
75-
_with_0:write("Hello")
76-
return _with_0
77-
end)()
89+
local f = _anon_func_1(io)
7890
local _close_1 = assert(getmetatable(f).__close)
79-
return (function(_arg_0, ...)
80-
local _ok_0 = _arg_0
81-
_close_1(f)
82-
if _ok_0 then
83-
return ...
84-
else
85-
return error(...)
86-
end
87-
end)(pcall(function(...) end, ...))
91+
return _anon_func_0(f, error, _close_1, pcall(function(...) end, ...))
8892
end, ...))
8993
end
94+
local _anon_func_2 = function(d, error, _close_1, _arg_0, ...)
95+
do
96+
local _ok_0 = _arg_0
97+
_close_1(d)
98+
if _ok_0 then
99+
return ...
100+
else
101+
return error(...)
102+
end
103+
end
104+
end
105+
local _anon_func_3 = function(x)
106+
if true then
107+
if "abc" == x then
108+
return 998
109+
end
110+
end
111+
end
112+
local _anon_func_5 = function(a, b)
113+
if a ~= nil then
114+
return a
115+
else
116+
return b
117+
end
118+
end
119+
local _anon_func_4 = function(a, b)
120+
if _anon_func_5(a, b) then
121+
return {
122+
value = value
123+
}
124+
end
125+
end
90126
do
91127
local a = (function()
92128
if true then
@@ -110,39 +146,34 @@ do
110146
return error(...)
111147
end
112148
end)(pcall(function(...)
113-
local c = (function()
114-
if true then
115-
local _exp_0 = x
116-
if "abc" == _exp_0 then
117-
return 998
118-
end
119-
end
120-
end)()
121-
local d = (function()
122-
if (function()
123-
if a ~= nil then
124-
return a
125-
else
126-
return b
127-
end
128-
end)() then
129-
return {
130-
value = value
131-
}
132-
end
133-
end)()
149+
local c = _anon_func_3(x)
150+
local d = _anon_func_4(a, b)
134151
local _close_1 = assert(getmetatable(d).__close)
135-
return (function(_arg_0, ...)
136-
local _ok_0 = _arg_0
137-
_close_1(d)
138-
if _ok_0 then
139-
return ...
140-
else
141-
return error(...)
142-
end
143-
end)(pcall(function(...) end, ...))
152+
return _anon_func_2(d, error, _close_1, pcall(function(...) end, ...))
144153
end, ...))
145154
end
155+
local _anon_func_6 = function(_, error, _close_1, _arg_0, ...)
156+
do
157+
local _ok_0 = _arg_0
158+
_close_1(_)
159+
if _ok_0 then
160+
return ...
161+
else
162+
return error(...)
163+
end
164+
end
165+
end
166+
local _anon_func_7 = function(_, _close_2, error, _arg_0, ...)
167+
do
168+
local _ok_0 = _arg_0
169+
_close_2(_)
170+
if _ok_0 then
171+
return ...
172+
else
173+
return error(...)
174+
end
175+
end
176+
end
146177
do
147178
local _ = (function()
148179
local _with_0 = io.open("file.txt")
@@ -165,30 +196,16 @@ do
165196
end
166197
})
167198
local _close_1 = assert(getmetatable(_).__close)
168-
return (function(_arg_0, ...)
169-
local _ok_0 = _arg_0
170-
_close_1(_)
171-
if _ok_0 then
172-
return ...
173-
else
174-
return error(...)
175-
end
176-
end)(pcall(function(...)
199+
return _anon_func_6(_, error, _close_1, pcall(function(...)
177200
local _ = setmetatable({ }, {
178201
__close = function()
179202
return print("first")
180203
end
181204
})
182205
local _close_2 = assert(getmetatable(_).__close)
183-
return (function(_arg_0, ...)
184-
local _ok_0 = _arg_0
185-
_close_2(_)
186-
if _ok_0 then
187-
return ...
188-
else
189-
return error(...)
190-
end
191-
end)(pcall(function(...) end, ...))
206+
return _anon_func_7(_, _close_2, error, pcall(function(...)
207+
return print("third")
208+
end, ...))
192209
end, ...))
193210
end, ...))
194211
end
@@ -203,6 +220,28 @@ def = function(item)
203220
_defers[#_defers + 1] = item
204221
return _defers
205222
end
223+
local _anon_func_8 = function(_, error, _close_1, _arg_0, ...)
224+
do
225+
local _ok_0 = _arg_0
226+
_close_1(_)
227+
if _ok_0 then
228+
return ...
229+
else
230+
return error(...)
231+
end
232+
end
233+
end
234+
local _anon_func_9 = function(_, _close_2, error, _arg_0, ...)
235+
do
236+
local _ok_0 = _arg_0
237+
_close_2(_)
238+
if _ok_0 then
239+
return ...
240+
else
241+
return error(...)
242+
end
243+
end
244+
end
206245
do
207246
local _ = def(function()
208247
return print(3)
@@ -221,28 +260,12 @@ do
221260
return print(2)
222261
end)
223262
local _close_1 = assert(getmetatable(_).__close)
224-
return (function(_arg_0, ...)
225-
local _ok_0 = _arg_0
226-
_close_1(_)
227-
if _ok_0 then
228-
return ...
229-
else
230-
return error(...)
231-
end
232-
end)(pcall(function(...)
263+
return _anon_func_8(_, error, _close_1, pcall(function(...)
233264
local _ = def(function()
234265
return print(1)
235266
end)
236267
local _close_2 = assert(getmetatable(_).__close)
237-
return (function(_arg_0, ...)
238-
local _ok_0 = _arg_0
239-
_close_2(_)
240-
if _ok_0 then
241-
return ...
242-
else
243-
return error(...)
244-
end
245-
end)(pcall(function(...) end, ...))
268+
return _anon_func_9(_, _close_2, error, pcall(function(...) end, ...))
246269
end, ...))
247270
end, ...))
248271
end

‎spec/outputs/assign.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ do
4242
end
4343
end
4444
end
45-
return _(function()
46-
setmetatable(a, (function()
45+
local _anon_func_0 = function(print)
46+
do
4747
print(123)
4848
return { }
49-
end)())
49+
end
50+
end
51+
return _(function()
52+
setmetatable(a, _anon_func_0(print))
5053
do
5154
local a, b
5255
if "a" == c then

‎spec/outputs/attrib.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ do
106106
return print("first")
107107
end
108108
})
109+
print("third")
109110
end
110111
local _defers = setmetatable({ }, {
111112
__close = function(self)

‎spec/outputs/unicode/assign.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ do
4242
end
4343
end
4444
end
45-
return __u65e0_u6548_u53d8_u91cf(function()
46-
setmetatable(a_u53d8_u91cf, (function()
45+
local _anon_func_0 = function(_u6253_u5370)
46+
do
4747
_u6253_u5370(123)
4848
return { }
49-
end)())
49+
end
50+
end
51+
return __u65e0_u6548_u53d8_u91cf(function()
52+
setmetatable(a_u53d8_u91cf, _anon_func_0(_u6253_u5370))
5053
do
5154
local _u5143_u7d20a, _u5143_u7d20b
5255
do

‎spec/outputs/unicode/macro.lua

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ local _call_1 = (_({
211211
-2,
212212
3
213213
}))
214-
_call_1 = _call_1["链"](_call_1, _call_1, _call_1, _call_1, _call_1, _call_1, _call_1, _call_1)
215-
_call_1 = _call_1["映射"](_call_1, _call_1, _call_1, _call_1, function(self)
214+
_call_1 = _call_1["链"](_call_1)
215+
_call_1 = _call_1["映射"](_call_1, function(self)
216216
return self * 2
217217
end)
218-
_call_1 = _call_1["过滤"](_call_1, _call_1, function(self)
218+
_call_1 = _call_1["过滤"](_call_1, function(self)
219219
return self > 3
220220
end)
221221
local _u7ed3_u679ca = _call_1["取值"](_call_1)
@@ -227,25 +227,25 @@ local _call_2 = (_({
227227
-2,
228228
3
229229
}))
230-
_call_2 = _call_2["链"](_call_2, _call_2, _call_2, _call_2, _call_2, _call_2, _call_2, _call_2)
231-
_call_2 = _call_2["映射"](_call_2, _call_2, _call_2, _call_2, function(self)
230+
_call_2 = _call_2["链"](_call_2)
231+
_call_2 = _call_2["映射"](_call_2, function(self)
232232
return self * 2
233233
end)
234-
_call_2 = _call_2["过滤"](_call_2, _call_2, function(self)
234+
_call_2 = _call_2["过滤"](_call_2, function(self)
235235
return self > 3
236236
end)
237237
_call_2["每一个"](_call_2, function(self)
238238
return _u6253_u5370(self)
239239
end)
240240
local _call_3 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
241-
_call_3 = _call_3["父节点"](_call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3)
242-
_call_3 = _call_3["后代"](_call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3)
243-
_call_3 = _call_3["选择启用"](_call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3)
244-
_call_3 = _call_3["选择可见"](_call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3, _call_3)
245-
_call_3 = _call_3["标签等于"](_call_3, _call_3, _call_3, _call_3, "fx")
246-
_call_3 = _call_3["其中"](_call_3, _call_3, function(x)
241+
_call_3 = _call_3["父节点"](_call_3)
242+
_call_3 = _call_3["后代"](_call_3)
243+
_call_3 = _call_3["选择启用"](_call_3)
244+
_call_3 = _call_3["选择可见"](_call_3)
245+
_call_3 = _call_3["标签等于"](_call_3, "fx")
246+
_call_3 = _call_3["其中"](_call_3, function(x)
247247
local _call_4 = x["名称"]
248-
return _call_4["结尾为"](_call_4, _call_4, "(克隆)")
248+
return _call_4["结尾为"](_call_4, "(克隆)")
249249
end)
250250
_u7ed3_u679c = _call_3["摧毁"](_call_3)
251251
do

0 commit comments

Comments
 (0)