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

base-level C use global table as its environment

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2009-12-15 09:25:36 -02:00
parent a25b8ff69c
commit 9fbe0690fb
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lapi.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 2.102 2009/12/07 15:49:47 roberto Exp roberto $ ** $Id: lapi.c,v 2.103 2009/12/08 16:15:43 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -39,6 +39,16 @@ const char lua_ident[] =
"invalid index") "invalid index")
static Table *getcurrenv (lua_State *L) {
if (L->ci->previous == NULL) /* no enclosing function? */
return hvalue(&G(L)->l_gt); /* use global table as environment */
else {
Closure *func = curr_func(L);
return func->c.env;
}
}
static TValue *index2addr (lua_State *L, int idx) { static TValue *index2addr (lua_State *L, int idx) {
CallInfo *ci = L->ci; CallInfo *ci = L->ci;
if (idx > 0) { if (idx > 0) {
@@ -54,8 +64,7 @@ static TValue *index2addr (lua_State *L, int idx) {
else switch (idx) { /* pseudo-indices */ else switch (idx) { /* pseudo-indices */
case LUA_REGISTRYINDEX: return &G(L)->l_registry; case LUA_REGISTRYINDEX: return &G(L)->l_registry;
case LUA_ENVIRONINDEX: { case LUA_ENVIRONINDEX: {
Closure *func = curr_func(L); sethvalue(L, &L->env, getcurrenv(L));
sethvalue(L, &L->env, func->c.env);
return &L->env; return &L->env;
} }
case LUA_GLOBALSINDEX: return &G(L)->l_gt; case LUA_GLOBALSINDEX: return &G(L)->l_gt;
@@ -71,16 +80,6 @@ static TValue *index2addr (lua_State *L, int idx) {
} }
static Table *getcurrenv (lua_State *L) {
if (L->ci->previous == NULL) /* no enclosing function? */
return hvalue(&G(L)->l_gt); /* use global table as environment */
else {
Closure *func = curr_func(L);
return func->c.env;
}
}
/* /*
** to be caled by 'lua_checkstack' in protected mode, to grow stack ** to be caled by 'lua_checkstack' in protected mode, to grow stack
** capturing memory errors ** capturing memory errors