commit 9866fb0ef1bd40afe47dd2cffdea5e66f9c048c1
parent 60c83ded3080a23bc661ab440c36d0a71b399e2e
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Tue, 18 Feb 2003 13:12:53 -0300
`set/getglobals' -> `set/getenvtable'
Diffstat:
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/lapi.c b/lapi.c
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 1.227 2002/12/19 11:11:55 roberto Exp roberto $
+** $Id: lapi.c,v 1.228 2003/02/11 10:46:24 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -542,7 +542,7 @@ LUA_API int lua_getmetatable (lua_State *L, int objindex) {
}
-LUA_API void lua_getglobals (lua_State *L, int index) {
+LUA_API void lua_getenvtable (lua_State *L, int index) {
StkId o;
lua_lock(L);
o = luaA_index(L, index);
@@ -620,7 +620,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
}
-LUA_API int lua_setglobals (lua_State *L, int index) {
+LUA_API int lua_setenvtable (lua_State *L, int index) {
StkId o;
int res = 0;
lua_lock(L);
diff --git a/lbaselib.c b/lbaselib.c
@@ -1,5 +1,5 @@
/*
-** $Id: lbaselib.c,v 1.119 2003/02/13 16:07:37 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.120 2003/02/18 16:02:13 roberto Exp roberto $
** Basic library
** See Copyright Notice in lua.h
*/
@@ -127,32 +127,32 @@ static void getfunc (lua_State *L) {
}
-static int aux_getglobals (lua_State *L) {
- lua_getglobals(L, -1);
+static int aux_getenvtable (lua_State *L) {
+ lua_getenvtable(L, -1);
lua_pushliteral(L, "__globals");
lua_rawget(L, -2);
return !lua_isnil(L, -1);
}
-static int luaB_getglobals (lua_State *L) {
+static int luaB_getenvtable (lua_State *L) {
getfunc(L);
- if (!aux_getglobals(L)) /* __globals not defined? */
- lua_pop(L, 1); /* remove it, to return real globals */
+ if (!aux_getenvtable(L)) /* __globals not defined? */
+ lua_pop(L, 1); /* remove it, to return real environment */
return 1;
}
-static int luaB_setglobals (lua_State *L) {
+static int luaB_setenvtable (lua_State *L) {
luaL_checktype(L, 2, LUA_TTABLE);
getfunc(L);
- if (aux_getglobals(L)) /* __globals defined? */
+ if (aux_getenvtable(L)) /* __globals defined? */
luaL_error(L, "cannot change a protected global table");
else
- lua_pop(L, 2); /* remove __globals and real global table */
+ lua_pop(L, 2); /* remove __globals and real environment table */
lua_pushvalue(L, 2);
- if (lua_setglobals(L, -2) == 0)
- luaL_error(L, "cannot change global table of given function");
+ if (lua_setenvtable(L, -2) == 0)
+ luaL_error(L, "cannot change environment of given function");
return 0;
}
@@ -247,8 +247,8 @@ static int load_aux (lua_State *L, int status) {
lua_Debug ar;
lua_getstack(L, 1, &ar);
lua_getinfo(L, "f", &ar); /* get calling function */
- lua_getglobals(L, -1); /* get its global table */
- lua_setglobals(L, -3); /* set it as the global table of the new chunk */
+ lua_getenvtable(L, -1); /* get its environment */
+ lua_setenvtable(L, -3); /* set it as the environment of the new chunk */
lua_pop(L, 1); /* remove calling function */
return 1;
}
@@ -494,8 +494,8 @@ static const luaL_reg base_funcs[] = {
{"error", luaB_error},
{"getmetatable", luaB_getmetatable},
{"setmetatable", luaB_setmetatable},
- {"getglobals", luaB_getglobals},
- {"setglobals", luaB_setglobals},
+ {"getenvtable", luaB_getenvtable},
+ {"setenvtable", luaB_setenvtable},
{"next", luaB_next},
{"ipairs", luaB_ipairs},
{"pairs", luaB_pairs},
diff --git a/lua.h b/lua.h
@@ -1,5 +1,5 @@
/*
-** $Id: lua.h,v 1.170 2002/12/19 11:11:55 roberto Exp roberto $
+** $Id: lua.h,v 1.171 2003/02/18 16:01:57 roberto Exp roberto $
** Lua - An Extensible Extension Language
** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
** http://www.lua.org mailto:info@lua.org
@@ -168,7 +168,7 @@ LUA_API void lua_rawget (lua_State *L, int idx);
LUA_API void lua_rawgeti (lua_State *L, int idx, int n);
LUA_API void lua_newtable (lua_State *L);
LUA_API int lua_getmetatable (lua_State *L, int objindex);
-LUA_API void lua_getglobals (lua_State *L, int idx);
+LUA_API void lua_getenvtable (lua_State *L, int idx);
/*
@@ -178,7 +178,7 @@ LUA_API void lua_settable (lua_State *L, int idx);
LUA_API void lua_rawset (lua_State *L, int idx);
LUA_API void lua_rawseti (lua_State *L, int idx, int n);
LUA_API int lua_setmetatable (lua_State *L, int objindex);
-LUA_API int lua_setglobals (lua_State *L, int idx);
+LUA_API int lua_setenvtable (lua_State *L, int idx);
/*