Remove usage of getfenv and setfenv

Author: SquidDev

bsrocks/bin/repl.lua

@@ -2,7 +2,7 @@ preload['bsrocks.env'] = function()
 	return function()
 		return {
 			cleanup = {},
-			_G = setmetatable({}, {__index = getfenv()})
+			_G = setmetatable({}, {__index = _ENV})
 		}
 	end
 end

bsrocks/commands/exec.lua

@@ -35,13 +35,12 @@ return {
 			file = shell.resolve(file)
 		end
 
-		local loaded, msg = loadfile(file)
-		if not loaded then error(msg, 0) end
-
 		local env = env()
 		local thisEnv = env._G
 		thisEnv.arg = {[-2] = "/" .. shell.getRunningProgram(), [-1] = "exec", [0] = "/" .. file, ... }
-		setfenv(loaded, thisEnv)
+
+		local loaded, msg = loadfile(file, thisEnv)
+		if not loaded then error(msg, 0) end
 
 		local args = {...}
 		local success, msg = xpcall(

bsrocks/env/init.lua

@@ -63,12 +63,7 @@ return function()
 
 	-- Need to set environment
 	function _G.loadstring(name, chunk)
-		local result, message = loadstring(name, chunk)
-		if result then
-			return setfenv(result, _G)
-		end
-
-		return result, message
+		return load(name, chunk, nil, _G)
 	end
 
 	-- Customised loadfile function to work with relative files

bsrocks/lib/serialize.lua

@@ -1,8 +1,6 @@
 local function unserialize(text)
-	local func = assert(loadstring(text, "unserialize"))
-
 	local table = {}
-	setfenv(func, table)()
+	assert(load(text, "unserialize", nil, table))()
 	return table
 end