nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'requiref' checks 'package.loaded' before loading a module

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2014-07-16 11:51:36 -03:00
parent 16b4110521
commit c229ed597f
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lauxlib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lauxlib.c,v 1.263 2014/05/12 21:44:17 roberto Exp roberto $ ** $Id: lauxlib.c,v 1.264 2014/06/26 17:25:11 roberto Exp roberto $
** Auxiliary functions for building Lua libraries ** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -883,22 +883,26 @@ LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
/* /*
** stripped-down 'require'. Calls 'openf' to open a module, ** Stripped-down 'require': After checking "loaded" table, calls 'openf'
** registers the result in 'package.loaded' table and, if 'glb' ** to open a module, registers the result in 'package.loaded' table and,
** is true, also registers the result in the global table. ** if 'glb' is true, also registers the result in the global table.
** Leaves resulting module on the top. ** Leaves resulting module on the top.
*/ */
LUALIB_API void luaL_requiref (lua_State *L, const char *modname, LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
lua_CFunction openf, int glb) { lua_CFunction openf, int glb) {
lua_pushcfunction(L, openf);
lua_pushstring(L, modname); /* argument to open function */
lua_call(L, 1, 1); /* open module */
luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
lua_pushvalue(L, -2); /* make copy of module (call result) */ lua_getfield(L, -1, modname); /* _LOADED[modname] */
lua_setfield(L, -2, modname); /* _LOADED[modname] = module */ if (!lua_toboolean(L, -1)) { /* package not already loaded? */
lua_pop(L, 1); /* remove _LOADED table */ lua_pop(L, 1); /* remove field */
lua_pushcfunction(L, openf);
lua_pushstring(L, modname); /* argument to open function */
lua_call(L, 1, 1); /* call 'openf' to open module */
lua_pushvalue(L, -1); /* make copy of module (call result) */
lua_setfield(L, -3, modname); /* _LOADED[modname] = module */
}
lua_remove(L, -2); /* remove _LOADED table */
if (glb) { if (glb) {
lua_pushvalue(L, -1); /* copy of 'mod' */ lua_pushvalue(L, -1); /* copy of module */
lua_setglobal(L, modname); /* _G[modname] = module */ lua_setglobal(L, modname); /* _G[modname] = module */
} }
} }

9
ltests.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: ltests.c,v 2.173 2014/06/19 18:29:30 roberto Exp roberto $ ** $Id: ltests.c,v 2.174 2014/06/26 17:25:11 roberto Exp roberto $
** Internal Module for Debugging of the Lua Implementation ** Internal Module for Debugging of the Lua Implementation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -839,7 +839,12 @@ static int loadlib (lua_State *L) {
}; };
lua_State *L1 = getstate(L); lua_State *L1 = getstate(L);
int i; int i;
luaL_requiref(L1, "package", luaopen_package, 1); luaL_requiref(L1, "package", luaopen_package, 0);
lua_assert(lua_type(L1, -1) == LUA_TTABLE);
/* 'requiref' should not reload module already loaded... */
luaL_requiref(L1, "package", NULL, 1); /* seg. fault if it reloads */
/* ...but should return the same module */
lua_assert(lua_compare(L1, -1, -2, LUA_OPEQ));
luaL_getsubtable(L1, LUA_REGISTRYINDEX, "_PRELOAD"); luaL_getsubtable(L1, LUA_REGISTRYINDEX, "_PRELOAD");
for (i = 0; libs[i].name; i++) { for (i = 0; libs[i].name; i++) {
lua_pushcfunction(L1, libs[i].func); lua_pushcfunction(L1, libs[i].func);