From 2733fe565c405f7b382fb7c02c69f78fb65d2f20 Mon Sep 17 00:00:00 2001
From: Li Jin <dragon-fly@qq.com>
Date: Tue, 19 Mar 2024 16:21:35 +0800
Subject: fix nil coalescing anonymous function moving issue. add test cases.

---
 spec/inputs/upvalue_func.yue  | 207 +++++++++++++++++
 spec/outputs/upvalue_func.lua | 502 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 709 insertions(+)
 create mode 100644 spec/inputs/upvalue_func.yue
 create mode 100644 spec/outputs/upvalue_func.lua

(limited to 'spec')

diff --git a/spec/inputs/upvalue_func.yue b/spec/inputs/upvalue_func.yue
new file mode 100644
index 0000000..a4155da
--- /dev/null
+++ b/spec/inputs/upvalue_func.yue
@@ -0,0 +1,207 @@
+-- In module root scope the anonymous functions won't be moved to up-values because they just run once.
+
+-- 1. if expr
+func if cond
+	998
+else
+	"abc"
+
+-- 2. nil coalesed expr
+func valueA + valueB ?? 123
+
+-- 3. vararg passing
+do
+	ok, ... = func 1, 2, 3
+	print select 3, ...
+
+-- 4. chain with existential operator
+if tb?.abc?\call? 123
+	print "OK"
+
+-- 5. colon chain with metamethod accessing with string or expr
+func(
+	tb\<"fn"> 123
+	tb\<[1 + 1]> "abc"
+)
+
+-- 6. colon chain with Lua keyword or unicode name
+func tb\end()\🤣 123
+
+-- 7. in expr with short check
+itemA = 1
+listA = []
+if itemA in listA
+	print "itemA in listA"
+
+-- 8. in expr without short check
+if itemB? and itemB in listB
+	print "itemB in listB"
+
+-- 9. spread table
+func [...listA, ...listB]
+
+-- 10. comprehension
+func [i for i = 1, 10], [k for k in pairs tb]
+
+-- 11. for expr
+func for i = 1, 10
+	i + 1
+
+-- 12. for each expr
+func for k, v in pairs tb
+	[k, v]
+
+-- 13. class declaration expr
+func class
+	new: => @value = 1
+
+-- 14. with expr
+func with tb
+	.field = 1
+	\func "a"
+
+-- 15. table comprehension expr
+func {"#{k}-post-fix", v * 2 for k, v in pairs tb}
+
+-- 16. do expr
+func do
+	print 123
+	"abc"
+
+-- 17. try expr with block codes
+do
+	success, ... = try
+		a = 1
+		print a + nil
+		1, 2, 3
+	print select '#', ... if success
+
+-- 18. while expr
+i = 1
+func while cond
+	i += 1
+	i
+
+-- 19. switch expr
+func switch value
+	when 1
+		'a'
+	when 2
+		'b'
+
+GameEngine\onUpdate (deltaTime) ->
+	-- 1. if expr
+	func if cond
+		998
+	else
+		"abc"
+	
+	-- 2. nil coalesed expr
+	func valueA + valueB ?? 123
+	
+	-- 3. vararg passing
+	do
+		ok, ... = func 1, 2, 3
+		print select 3, ...
+	
+	-- 4. chain with existential operator
+	if tb?.abc?\call? 123
+		print "OK"
+	
+	-- 5. colon chain with metamethod accessing with string or expr
+	func(
+		tb\<"fn"> 123
+		tb\<[1 + 1]> "abc"
+	)
+	
+	-- 6. colon chain with Lua keyword or unicode name
+	func tb\end()\🤣 123
+	
+	-- 7. in expr with short check
+	itemA = 1
+	listA = []
+	if itemA in listA
+		print "item in list"
+	
+	-- 8. in expr without short check
+	if itemB? and itemB in listB
+		print "item in list"
+	
+	-- 9. spread table
+	func [...listA, ...listB]
+	
+	-- 10. comprehension
+	func [i for i = 1, 10], [k for k in pairs tb]
+	
+	-- 11. for expr
+	func for i = 1, 10
+		i + 1
+	
+	-- 12. for each expr
+	func for k, v in pairs tb
+		[k, v]
+	
+	-- 13. class declaration expr
+	func class
+		new: => @value = 1
+	
+	-- 14. with expr
+	func with tb
+		.field = 1
+		\func "a"
+	
+	-- 15. table comprehension expr
+	func {"#{k}-post-fix", v * 2 for k, v in pairs tb}
+	
+	-- 16. do expr
+	func do
+		print 123
+		"abc"
+	
+	-- 17. try expr with block codes
+	do
+		success, ... = try
+			a = 1
+			print a + nil
+			1, 2, 3
+		print select '#', ... if success
+	
+	-- 18. while expr
+	i = 1
+	func while cond
+		i += 1
+		i
+	
+	-- 19. switch expr
+	func switch value
+		when 1
+			'a'
+		when 2
+			'b'
+
+GameEngine\onEvent "SomeEvent", ->
+	func value + (if cond
+		998
+	else
+		"abc") + (valueB ?? 123) > tb?.abc?\call?(123) + tb\end()\🤣 123 and
+	itemA in listA
+
+GameEngine\schedule (deltaTime) ->
+	value = 123
+	func if value > 200
+		UpdateScoreText "Win: #{value}"
+		"done"
+	else
+		UpdateScoreText "Score: #{value}"
+		"continue"
+
+GameEngine\schedule (deltaTime) -> -- closure 1
+	value = 123
+	func if value > 200
+		UpdateScoreText "Win: #{value}"
+		"done"
+	else
+		GameEngine\schedule (deltaTime) -> -- closure 2
+			UpdateScoreText "Score: #{value}" -- value is captured by closure 2
+		"continue"
+
diff --git a/spec/outputs/upvalue_func.lua b/spec/outputs/upvalue_func.lua
new file mode 100644
index 0000000..125d75f
--- /dev/null
+++ b/spec/outputs/upvalue_func.lua
@@ -0,0 +1,502 @@
+func((function()
+	if cond then
+		return 998
+	else
+		return "abc"
+	end
+end)())
+func(valueA + (function()
+	local _exp_0 = valueB
+	if _exp_0 ~= nil then
+		return _exp_0
+	else
+		return 123
+	end
+end)())
+do
+	(function(_arg_0, ...)
+		local ok = _arg_0
+		return print(select(3, ...))
+	end)(func(1, 2, 3))
+end
+if (function()
+	local _obj_0 = tb
+	if _obj_0 ~= nil then
+		local _obj_1 = _obj_0.abc
+		if _obj_1 ~= nil then
+			local _obj_2 = _obj_1.call
+			if _obj_2 ~= nil then
+				return _obj_2(_obj_1, 123)
+			end
+			return nil
+		end
+		return nil
+	end
+	return nil
+end)() then
+	print("OK")
+end
+func((function()
+	local _obj_0 = getmetatable(tb)
+	return _obj_0["fn"](_obj_0, 123)
+end)(), (function()
+	local _obj_0 = getmetatable(tb)
+	return _obj_0[1 + 1](_obj_0, "abc")
+end)())
+func((function()
+	local _call_0 = tb
+	local _call_1 = _call_0["end"](_call_0)
+	return _call_1["🤣"](_call_1, 123)
+end)())
+local itemA = 1
+local listA = { }
+if (#listA > 0 and (function()
+	for _index_0 = 1, #listA do
+		if listA[_index_0] == itemA then
+			return true
+		end
+	end
+	return false
+end)()) then
+	print("itemA in listA")
+end
+if (itemB ~= nil) and (function()
+	local _check_0 = listB
+	local _val_0 = itemB
+	for _index_0 = 1, #_check_0 do
+		if _check_0[_index_0] == _val_0 then
+			return true
+		end
+	end
+	return false
+end)() then
+	print("itemB in listB")
+end
+func((function()
+	local _tab_0 = { }
+	local _idx_0 = #_tab_0 + 1
+	for _index_0 = 1, #listA do
+		local _value_0 = listA[_index_0]
+		_tab_0[_idx_0] = _value_0
+		_idx_0 = _idx_0 + 1
+	end
+	local _idx_1 = #_tab_0 + 1
+	local _list_0 = listB
+	for _index_0 = 1, #_list_0 do
+		local _value_0 = _list_0[_index_0]
+		_tab_0[_idx_1] = _value_0
+		_idx_1 = _idx_1 + 1
+	end
+	return _tab_0
+end)())
+func((function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for i = 1, 10 do
+		_accum_0[_len_0] = i
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end)(), (function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for k in pairs(tb) do
+		_accum_0[_len_0] = k
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end)())
+func((function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for i = 1, 10 do
+		_accum_0[_len_0] = i + 1
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end)())
+func((function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for k, v in pairs(tb) do
+		_accum_0[_len_0] = {
+			k,
+			v
+		}
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end)())
+func((function()
+	do
+		local _class_0
+		local _base_0 = { }
+		if _base_0.__index == nil then
+			_base_0.__index = _base_0
+		end
+		_class_0 = setmetatable({
+			__init = function(self)
+				self.value = 1
+			end,
+			__base = _base_0
+		}, {
+			__index = _base_0,
+			__call = function(cls, ...)
+				local _self_0 = setmetatable({ }, _base_0)
+				cls.__init(_self_0, ...)
+				return _self_0
+			end
+		})
+		_base_0.__class = _class_0
+		return _class_0
+	end
+end)())
+func((function()
+	local _with_0 = tb
+	_with_0.field = 1
+	_with_0:func("a")
+	return _with_0
+end)())
+func((function()
+	local _tbl_0 = { }
+	for k, v in pairs(tb) do
+		_tbl_0[tostring(k) .. "-post-fix"] = v * 2
+	end
+	return _tbl_0
+end)())
+func((function()
+	print(123)
+	return "abc"
+end)())
+do
+	(function(_arg_0, ...)
+		local success = _arg_0
+		if success then
+			return print(select('#', ...))
+		end
+	end)(pcall(function()
+		local a = 1
+		print(a + nil)
+		return 1, 2, 3
+	end))
+end
+local i = 1
+func((function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	while cond do
+		i = i + 1
+		_accum_0[_len_0] = i
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end)())
+func((function()
+	local _exp_0 = value
+	if 1 == _exp_0 then
+		return 'a'
+	elseif 2 == _exp_0 then
+		return 'b'
+	end
+end)())
+local _anon_func_0 = function(cond)
+	if cond then
+		return 998
+	else
+		return "abc"
+	end
+end
+local _anon_func_1 = function(valueB)
+	if valueB ~= nil then
+		return valueB
+	else
+		return 123
+	end
+end
+local _anon_func_2 = function(print, select, _arg_0, ...)
+	do
+		local ok = _arg_0
+		return print(select(3, ...))
+	end
+end
+local _anon_func_3 = function(tb)
+	if tb ~= nil then
+		local _obj_0 = tb.abc
+		if _obj_0 ~= nil then
+			local _obj_1 = _obj_0.call
+			if _obj_1 ~= nil then
+				return _obj_1(_obj_0, 123)
+			end
+			return nil
+		end
+		return nil
+	end
+	return nil
+end
+local _anon_func_4 = function(getmetatable, tb)
+	local _obj_0 = getmetatable(tb)
+	return _obj_0["fn"](_obj_0, 123)
+end
+local _anon_func_5 = function(getmetatable, tb)
+	local _obj_0 = 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
+end
+local _anon_func_7 = function(itemA, listA)
+	for _index_0 = 1, #listA do
+		if listA[_index_0] == itemA then
+			return true
+		end
+	end
+	return false
+end
+local _anon_func_8 = function(itemB, listB)
+	for _index_0 = 1, #listB do
+		if listB[_index_0] == itemB then
+			return true
+		end
+	end
+	return false
+end
+local _anon_func_9 = function(listA, listB, pairs)
+	local _tab_0 = { }
+	local _idx_0 = #_tab_0 + 1
+	for _index_0 = 1, #listA do
+		local _value_0 = listA[_index_0]
+		_tab_0[_idx_0] = _value_0
+		_idx_0 = _idx_0 + 1
+	end
+	local _idx_1 = #_tab_0 + 1
+	for _index_0 = 1, #listB do
+		local _value_0 = listB[_index_0]
+		_tab_0[_idx_1] = _value_0
+		_idx_1 = _idx_1 + 1
+	end
+	return _tab_0
+end
+local _anon_func_10 = function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for i = 1, 10 do
+		_accum_0[_len_0] = i
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end
+local _anon_func_11 = function(pairs, tb)
+	local _accum_0 = { }
+	local _len_0 = 1
+	for k in pairs(tb) do
+		_accum_0[_len_0] = k
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end
+local _anon_func_12 = function()
+	local _accum_0 = { }
+	local _len_0 = 1
+	for i = 1, 10 do
+		_accum_0[_len_0] = i + 1
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end
+local _anon_func_13 = function(pairs, tb)
+	local _accum_0 = { }
+	local _len_0 = 1
+	for k, v in pairs(tb) do
+		_accum_0[_len_0] = {
+			k,
+			v
+		}
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end
+local _anon_func_14 = function(setmetatable)
+	do
+		local _class_0
+		local _base_0 = { }
+		if _base_0.__index == nil then
+			_base_0.__index = _base_0
+		end
+		_class_0 = setmetatable({
+			__init = function(self)
+				self.value = 1
+			end,
+			__base = _base_0
+		}, {
+			__index = _base_0,
+			__call = function(cls, ...)
+				local _self_0 = setmetatable({ }, _base_0)
+				cls.__init(_self_0, ...)
+				return _self_0
+			end
+		})
+		_base_0.__class = _class_0
+		return _class_0
+	end
+end
+local _anon_func_15 = function(tb)
+	tb.field = 1
+	tb:func("a")
+	return tb
+end
+local _anon_func_16 = function(pairs, tb, tostring)
+	local _tbl_0 = { }
+	for k, v in pairs(tb) do
+		_tbl_0[tostring(k) .. "-post-fix"] = v * 2
+	end
+	return _tbl_0
+end
+local _anon_func_17 = function(print)
+	do
+		print(123)
+		return "abc"
+	end
+end
+local _anon_func_18 = function(print, select, _arg_0, ...)
+	do
+		local success = _arg_0
+		if success then
+			return print(select('#', ...))
+		end
+	end
+end
+local _anon_func_19 = function(print)
+	do
+		local a = 1
+		print(a + nil)
+		return 1, 2, 3
+	end
+end
+local _anon_func_20 = function(cond, i)
+	local _accum_0 = { }
+	local _len_0 = 1
+	while cond do
+		i = i + 1
+		_accum_0[_len_0] = i
+		_len_0 = _len_0 + 1
+	end
+	return _accum_0
+end
+local _anon_func_21 = function(value)
+	if 1 == value then
+		return 'a'
+	elseif 2 == value then
+		return 'b'
+	end
+end
+GameEngine:onUpdate(function(deltaTime)
+	func(_anon_func_0(cond))
+	func(valueA + _anon_func_1(valueB))
+	do
+		_anon_func_2(print, select, func(1, 2, 3))
+	end
+	if _anon_func_3(tb) then
+		print("OK")
+	end
+	func(_anon_func_4(getmetatable, tb), _anon_func_5(getmetatable, tb))
+	func(_anon_func_6(tb))
+	itemA = 1
+	listA = { }
+	if (#listA > 0 and _anon_func_7(itemA, listA)) then
+		print("item in list")
+	end
+	if (itemB ~= nil) and _anon_func_8(itemB, listB) then
+		print("item in list")
+	end
+	func(_anon_func_9(listA, listB, pairs))
+	func(_anon_func_10(), _anon_func_11(pairs, tb))
+	func(_anon_func_12())
+	func(_anon_func_13(pairs, tb))
+	func(_anon_func_14(setmetatable))
+	func(_anon_func_15(tb))
+	func(_anon_func_16(pairs, tb, tostring))
+	func(_anon_func_17(print))
+	do
+		_anon_func_18(print, select, pcall(_anon_func_19, print))
+	end
+	i = 1
+	func(_anon_func_20(cond, i))
+	return func(_anon_func_21(value))
+end)
+local _anon_func_22 = function(cond)
+	if cond then
+		return 998
+	else
+		return "abc"
+	end
+end
+local _anon_func_23 = function(valueB)
+	if valueB ~= nil then
+		return valueB
+	else
+		return 123
+	end
+end
+local _anon_func_24 = function(tb)
+	if tb ~= nil then
+		local _obj_0 = tb.abc
+		if _obj_0 ~= nil then
+			local _obj_1 = _obj_0.call
+			if _obj_1 ~= nil then
+				return _obj_1(_obj_0, 123)
+			end
+			return nil
+		end
+		return nil
+	end
+	return nil
+end
+local _anon_func_26 = function(itemA, listA)
+	for _index_0 = 1, #listA do
+		if listA[_index_0] == itemA then
+			return true
+		end
+	end
+	return false
+end
+local _anon_func_25 = 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_26(itemA, listA)))
+	end
+end
+GameEngine:onEvent("SomeEvent", function()
+	return func(value + (_anon_func_22(cond)) + (_anon_func_23(valueB)) > _anon_func_24(tb) + _anon_func_25(itemA, listA, tb))
+end)
+local _anon_func_27 = function(UpdateScoreText, tostring, value)
+	if value > 200 then
+		UpdateScoreText("Win: " .. tostring(value))
+		return "done"
+	else
+		UpdateScoreText("Score: " .. tostring(value))
+		return "continue"
+	end
+end
+GameEngine:schedule(function(deltaTime)
+	local value = 123
+	return func(_anon_func_27(UpdateScoreText, tostring, value))
+end)
+return GameEngine:schedule(function(deltaTime)
+	local value = 123
+	return func((function()
+		if value > 200 then
+			UpdateScoreText("Win: " .. tostring(value))
+			return "done"
+		else
+			GameEngine:schedule(function(deltaTime)
+				return UpdateScoreText("Score: " .. tostring(value))
+			end)
+			return "continue"
+		end
+	end)())
+end)
-- 
cgit v1.2.3-55-g6feb