Merge branch 'upsteam'

Author: fesily

extension/script/backend/worker/eval/readonly.lua

@@ -1,14 +1,14 @@
 local source, level, symbol = ...
 level = (level or 0) + 2
 
+local _load
+local _unpack
 if _VERSION == "Lua 5.1" then
-	load = loadstring
-	function table.pack(...)
-		local t = {...}
-		t.n = select("#", ...)
-		return t
-	end
-	table.unpack = unpack
+	_load = loadstring
+	_unpack = unpack
+else
+	_load = load
+	_unpack = table.unpack
 end
 
 local f = assert(debug.getinfo(level,"f").func, "can't find function")
@@ -74,8 +74,8 @@ end]]):gsub("%$(%w+)", {
 })
 end
 local compiled = env
-	and assert(load(full_source, '=(EVAL)', "t", env))
-	or  assert(load(full_source, '=(EVAL)'))
+	and assert(_load(full_source, '=(EVAL)', "t", env))
+	or  assert(_load(full_source, '=(EVAL)'))
 local func = compiled()
 do
 	local i = 1
@@ -103,7 +103,7 @@ if vararg then
 		end
 		i = i + 1
 	end
-	return func(table.unpack(vargs))
+	return func(_unpack(vargs))
 else
 	return func()
 end

extension/script/backend/worker/eval/readwrite.lua

@@ -1,14 +1,21 @@
 local source, level = ...
 level = (level or 0) + 2
 
+local _load
+local _pack
+local _unpack
 if _VERSION == "Lua 5.1" then
-	load = loadstring
-	function table.pack(...)
+	_load = loadstring
+	_pack = function (...)
 		local t = {...}
 		t.n = select("#", ...)
 		return t
 	end
-	table.unpack = unpack
+	_unpack = unpack
+else
+	_load = load
+	_pack = table.pack
+	_unpack = table.unpack
 end
 
 local f = assert(debug.getinfo(level,"f").func, "can't find function")
@@ -81,8 +88,8 @@ end
 end
 
 local compiled = env
-	and assert(load(full_source, '=(EVAL)', "t", env))
-	or  assert(load(full_source, '=(EVAL)'))
+	and assert(_load(full_source, '=(EVAL)', "t", env))
+	or  assert(_load(full_source, '=(EVAL)'))
 local func, update = compiled()
 local found = {}
 do
@@ -114,9 +121,9 @@ do
 			end
 			i = i + 1
 		end
-		rets = table.pack(func(table.unpack(vargs)))
+		rets = _pack(func(_unpack(vargs)))
 	else
-		rets = table.pack(func())
+		rets = _pack(func())
 	end
 end
 for _, info in ipairs(update()) do
@@ -128,4 +135,4 @@ for _, info in ipairs(update()) do
 		end
 	end
 end
-return table.unpack(rets)
+return _unpack(rets)

extension/script/backend/worker/eval/verify.lua

@@ -1,5 +1,10 @@
 local source = ...
+
+local _load
 if _VERSION == "Lua 5.1" then
-	load = loadstring
+	_load = loadstring
+else
+	_load = load
 end
-assert(load("return " .. source, '=(EVAL)'))
+
+assert(_load("return " .. source, '=(EVAL)'))

src/luadebug/symbolize/symbolize_linux.inl

@@ -40,7 +40,7 @@ namespace luadebug {
             args.push(*p);
         }
         spawn.redirect(bee::subprocess::stdio::eOutput, pipe.wr);
-        if (!spawn.exec(args, nullptr)) {
+        if (!spawn.exec(args, {})) {
             return std::nullopt;
         }
         std::string res;

src/luadebug/symbolize/symbolize_macos.inl

@@ -40,7 +40,7 @@ namespace luadebug {
             args.push(*p);
         }
         spawn.redirect(bee::subprocess::stdio::eOutput, pipe.wr);
-        if (!spawn.exec(args, nullptr)) {
+        if (!spawn.exec(args, {})) {
             return std::nullopt;
         }
         std::string res;