gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

From Lua 5.2: Add mode and env arguments to load*().

Browse Source
This commit is contained in:
Mike Pall 2012-09-21 16:33:14 +02:00
parent 3dceaa9a74
commit 2ba16862c7
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/lib_base.c
View File

@ -341,28 +341,31 @@ LJLIB_ASM_(xpcall) LJLIB_REC(.)
/* -- Base library: load Lua code ----------------------------------------- */ /* -- Base library: load Lua code ----------------------------------------- */
static int load_aux(lua_State *L, int status) static int load_aux(lua_State *L, int status, int envarg)
{ {
if (status == 0) if (status == 0) {
if (tvistab(L->base+envarg-1)) {
GCfunc *fn = funcV(L->top-1);
GCtab *t = tabV(L->base+envarg-1);
setgcref(fn->c.env, obj2gco(t));
lj_gc_objbarrier(L, fn, t);
}
return 1; return 1;
copyTV(L, L->top, L->top-1); } else {
setnilV(L->top-1); setnilV(L->top-2);
L->top++;
return 2; return 2;
} }
LJLIB_CF(loadstring)
{
GCstr *s = lj_lib_checkstr(L, 1);
GCstr *name = lj_lib_optstr(L, 2);
return load_aux(L,
luaL_loadbuffer(L, strdata(s), s->len, strdata(name ? name : s)));
} }
LJLIB_CF(loadfile) LJLIB_CF(loadfile)
{ {
GCstr *fname = lj_lib_optstr(L, 1); GCstr *fname = lj_lib_optstr(L, 1);
return load_aux(L, luaL_loadfile(L, fname ? strdata(fname) : NULL)); GCstr *mode = lj_lib_optstr(L, 2);
int status;
lua_settop(L, 3); /* Ensure env arg exists. */
status = luaL_loadfilex(L, fname ? strdata(fname) : NULL,
mode ? strdata(mode) : NULL);
return load_aux(L, status, 3);
} }
static const char *reader_func(lua_State *L, void *ud, size_t *size) static const char *reader_func(lua_State *L, void *ud, size_t *size)
@ -376,8 +379,8 @@ static const char *reader_func(lua_State *L, void *ud, size_t *size)
*size = 0; *size = 0;
return NULL; return NULL;
} else if (tvisstr(L->top) || tvisnumber(L->top)) { } else if (tvisstr(L->top) || tvisnumber(L->top)) {
copyTV(L, L->base+2, L->top); /* Anchor string in reserved stack slot. */ copyTV(L, L->base+4, L->top); /* Anchor string in reserved stack slot. */
return lua_tolstring(L, 3, size); return lua_tolstring(L, 5, size);
} else { } else {
lj_err_caller(L, LJ_ERR_RDRSTR); lj_err_caller(L, LJ_ERR_RDRSTR);
return NULL; return NULL;
@ -386,14 +389,26 @@ static const char *reader_func(lua_State *L, void *ud, size_t *size)
LJLIB_CF(load) LJLIB_CF(load)
{ {
GCstr *name; GCstr *name = lj_lib_optstr(L, 2);
if (L->base < L->top && (tvisstr(L->base) || tvisnumber(L->base))) GCstr *mode = lj_lib_optstr(L, 3);
return lj_cf_loadstring(L); int status;
if (L->base < L->top && (tvisstr(L->base) || tvisnumber(L->base))) {
GCstr *s = lj_lib_checkstr(L, 1);
lua_settop(L, 4); /* Ensure env arg exists. */
status = luaL_loadbufferx(L, strdata(s), s->len, strdata(name ? name : s),
mode ? strdata(mode) : NULL);
} else {
lj_lib_checkfunc(L, 1); lj_lib_checkfunc(L, 1);
name = lj_lib_optstr(L, 2); lua_settop(L, 5); /* Reserve a slot for the string from the reader. */
lua_settop(L, 3); /* Reserve a slot for the string from the reader. */ status = lua_loadx(L, reader_func, NULL, name ? strdata(name) : "=(load)",
return load_aux(L, mode ? strdata(mode) : NULL);
lua_load(L, reader_func, NULL, name ? strdata(name) : "=(load)")); }
return load_aux(L, status, 4);
}
LJLIB_CF(loadstring)
{
return lj_cf_load(L);
} }
LJLIB_CF(dofile) LJLIB_CF(dofile)