details (using lua_setglobal/lua_getglobal instead of explicit

use of the global table)
This commit is contained in:
Roberto Ierusalimschy
2012-04-20 14:05:17 -03:00
parent 8df0198178
commit 4cca1a436d
2 changed files with 8 additions and 15 deletions

15
lua.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: lua.c,v 1.202 2011/08/17 20:19:52 roberto Exp roberto $
** $Id: lua.c,v 1.203 2011/12/12 16:34:03 roberto Exp roberto $
** Lua stand-alone interpreter
** See Copyright Notice in lua.h
*/
@@ -223,16 +223,11 @@ static int dostring (lua_State *L, const char *s, const char *name) {
static int dolibrary (lua_State *L, const char *name) {
int status;
lua_pushglobaltable(L);
lua_getfield(L, -1, "require");
lua_getglobal(L, "require");
lua_pushstring(L, name);
status = docall(L, 1, 1);
if (status == LUA_OK) {
lua_setfield(L, -2, name); /* global[name] = require return */
lua_pop(L, 1); /* remove global table */
}
else
lua_remove(L, -2); /* remove global table (below error msg.) */
status = docall(L, 1, 1); /* call 'require(name)' */
if (status == LUA_OK)
lua_setglobal(L, name); /* global[name] = require return */
return report(L, status);
}