gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-22 06:43:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor handle_script with pushargs / luaL_len

Browse Source
This commit is contained in:
Francois Perrad 2017-05-03 21:03:32 +02:00
parent 2bfddf00fb
commit af45163001
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/luajit.c
View File

@ -267,6 +267,21 @@ static void dotty(lua_State *L)
progname = oldprogname; progname = oldprogname;
} }
/* Push on the stack the contents of table 'arg' from 1 to #arg */
static int pushargs(lua_State *L)
{
int i, n;
lua_getglobal(L, "arg");
if (!lua_istable(L, -1))
luaL_error(L, "'arg' is not a table");
n = luaL_len(L, -1);
luaL_checkstack(L, n + 3, "too many arguments to script");
for (i = 1; i <= n; i++)
lua_rawgeti(L, -i, i);
lua_remove(L, -i); /* remove table from the stack */
return n;
}
static int handle_script(lua_State *L, char **argx) static int handle_script(lua_State *L, char **argx)
{ {
int status; int status;
@ -275,21 +290,8 @@ static int handle_script(lua_State *L, char **argx)
fname = NULL; /* stdin */ fname = NULL; /* stdin */
status = luaL_loadfile(L, fname); status = luaL_loadfile(L, fname);
if (status == LUA_OK) { if (status == LUA_OK) {
/* Fetch args from arg table. LUA_INIT or -e might have changed them. */ int narg = pushargs(L); /* push arguments to script */
int narg = 0; status = docall(L, narg, LUA_MULTRET);
lua_getglobal(L, "arg");
if (lua_istable(L, -1)) {
do {
narg++;
lua_rawgeti(L, -narg, narg);
} while (!lua_isnil(L, -1));
lua_pop(L, 1);
lua_remove(L, -narg);
narg--;
} else {
lua_pop(L, 1);
}
status = docall(L, narg, 0);
} }
return report(L, status); return report(L, status);
} }