From 19fbdf6cae4c5186a498eb7a2fcc128804a9c3d5 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Fri, 8 Apr 2011 16:17:36 -0300 Subject: 'luaL_findtable' -> 'luaL_getsubtable' --- lauxlib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lauxlib.c') diff --git a/lauxlib.c b/lauxlib.c index 777b1aaf..bcd4fa1d 100644 --- a/lauxlib.c +++ b/lauxlib.c @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.c,v 1.228 2011/01/10 15:51:42 roberto Exp roberto $ +** $Id: lauxlib.c,v 1.229 2011/03/03 16:34:46 roberto Exp roberto $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ @@ -758,8 +758,8 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) { */ #if defined(LUA_COMPAT_MODULE) -static const char *luaL_findtablex (lua_State *L, int idx, - const char *fname, int szhint) { +static const char *luaL_findtable (lua_State *L, int idx, + const char *fname, int szhint) { const char *e; if (idx) lua_pushvalue(L, idx); do { @@ -803,13 +803,13 @@ static int libsize (const luaL_Reg *l) { */ LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname, int sizehint) { - luaL_findtablex(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */ + luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */ lua_getfield(L, -1, modname); /* get _LOADED[modname] */ if (!lua_istable(L, -1)) { /* not found? */ lua_pop(L, 1); /* remove previous result */ /* try global variable (and create one if it does not exist) */ lua_pushglobaltable(L); - if (luaL_findtablex(L, 0, modname, sizehint) != NULL) + if (luaL_findtable(L, 0, modname, sizehint) != NULL) luaL_error(L, "name conflict for module " LUA_QS, modname); lua_pushvalue(L, -1); lua_setfield(L, -3, modname); /* _LOADED[modname] = new table */ @@ -853,7 +853,7 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { ** ensure that stack[idx][fname] has a table and push that table ** into the stack */ -LUALIB_API int luaL_findtable (lua_State *L, int idx, const char *fname) { +LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) { lua_getfield(L, idx, fname); if (lua_istable(L, -1)) return 1; /* table already there */ else { @@ -878,7 +878,7 @@ LUALIB_API void luaL_requiref (lua_State *L, const char *modname, lua_pushcfunction(L, openf); lua_pushstring(L, modname); /* argument to open function */ lua_call(L, 1, 1); /* open module */ - luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED"); + luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); lua_pushvalue(L, -2); /* make copy of module (call result) */ lua_setfield(L, -2, modname); /* _LOADED[modname] = module */ lua_pop(L, 1); /* remove _LOADED table */ -- cgit v1.2.3-55-g6feb