From 374b65d199a9eb05f17429723ef3cd51365e3a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=A3=8E?= <cloudwu@gmail.com>
Date: Wed, 12 Sep 2012 20:57:03 +0800
Subject: [PATCH] loadx for compat lua 5.1

---
 lualib/loadx.lua | 57 ++++--------------------------------------------
 1 file changed, 4 insertions(+), 53 deletions(-)

diff --git a/lualib/loadx.lua b/lualib/loadx.lua
index a71c224e..4c54ec04 100644
--- a/lualib/loadx.lua
+++ b/lualib/loadx.lua
@@ -1,44 +1,4 @@
-local cookie
-
-local function make_ld(ld)
-	local load_cookie
-	return function()
-		if load_cookie then
-			return ld()
-		else
-			load_cookie = true
-			return cookie
-		end
-	end
-end
-
 if _VERSION == "Lua 5.2" then
-
-cookie = "local function __setenv() end;"
-
-local load = load
-
-function _G.load(ld, chunkname, mode, env)
-	local f,err
-	if type(ld) == "string" then
-		f,err = load(cookie .. ld, chunkname, mode, env)
-	else
-		f,err = load(make_ld(ld), chunkname)
-	end
-
-	return f,err
-end
-
-function _G.loadfile(filename, mode, env)
-	local f = io.open(filename, "rb")
-	assert(f, filename)
-	local source = f:read "*a"
-	f:close()
-	return _G.load(source, "@" .. filename, mode, env)
-end
-
-_G.loadstring = _G.load
-
 	return
 end
 
@@ -47,17 +7,10 @@ local assert = assert
 assert(_VERSION == "Lua 5.1")
 
 local setfenv = setfenv
-local getfenv = getfenv
 local loadstring = loadstring
 local load = load
 local io = io
 
-local function __setenv(env)
-	setfenv(2,env)
-end
-
-cookie = "local _ENV,__setenv = __getenv();"
-
 function _G.load(ld, chunkname, mode, env)
 	local f,err
 	if type(ld) == "string" then
@@ -68,11 +21,9 @@ function _G.load(ld, chunkname, mode, env)
 	if f == nil then
 		return f, err
 	end
-	env = env or getfenv(1)
-	setfenv(f, { __getenv = function()
-		setfenv(2, env)
-		return env, __setenv
-	end })
+	if env then
+		setfenv(f, env)
+	end
 
 	return f,err
 end
@@ -86,4 +37,4 @@ function _G.loadfile(filename, mode, env)
 end
 
 _G.loadstring = _G.load
-_G._ENV = _G
+