Lua 5.2.0-beta-rc65.2.0-beta-rc6

1 files changed, 4 insertions, 17 deletions

diff --git a/src/lbaselib.c b/src/lbaselib.c
index 8172f131..e4daf5d4 100644
--- a/src/lbaselib.c
+++ b/src/lbaselib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.263 2011/07/02 15:56:43 roberto Exp $
+** $Id: lbaselib.c,v 1.264 2011/07/05 12:49:35 roberto Exp $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -120,11 +120,6 @@ static int luaB_setmetatable (lua_State *L) {
 }
 
 
-static int luaB_removed (lua_State *L) {
-  return luaL_error(L, "removed function");
-}
-
-
 static int luaB_rawequal (lua_State *L) {
   luaL_checkany(L, 1);
   luaL_checkany(L, 2);
@@ -355,14 +350,6 @@ static int luaB_load (lua_State *L) {
   return load_aux(L, status);
 }
 
-
-#if defined(LUA_COMPAT_LOADSTRING)
-#define luaB_loadstring		luaB_load
-#else
-#define luaB_loadstring		luaB_removed
-#endif
-
-
 /* }====================================================== */
 
 
@@ -454,12 +441,13 @@ static const luaL_Reg base_funcs[] = {
   {"collectgarbage", luaB_collectgarbage},
   {"dofile", luaB_dofile},
   {"error", luaB_error},
-  {"getfenv", luaB_removed},
   {"getmetatable", luaB_getmetatable},
   {"ipairs", luaB_ipairs},
   {"loadfile", luaB_loadfile},
   {"load", luaB_load},
-  {"loadstring", luaB_loadstring},
+#if defined(LUA_COMPAT_LOADSTRING)
+  {"loadstring", luaB_load},
+#endif
   {"next", luaB_next},
   {"pairs", luaB_pairs},
   {"pcall", luaB_pcall},
@@ -469,7 +457,6 @@ static const luaL_Reg base_funcs[] = {
   {"rawget", luaB_rawget},
   {"rawset", luaB_rawset},
   {"select", luaB_select},
-  {"setfenv", luaB_removed},
   {"setmetatable", luaB_setmetatable},
   {"tonumber", luaB_tonumber},
   {"tostring", luaB_tostring},