rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

two bugs related to varargs

This commit is contained in:
Roberto Ierusalimschy 2004-09-03 12:48:56 -03:00
parent 3c394b12f9
commit ee165043ef
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ldo.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ldo.c,v 2.6 2004/05/31 18:51:50 roberto Exp roberto $ ** $Id: ldo.c,v 2.7 2004/06/02 19:07:55 roberto Exp roberto $
** Stack and Call structure of Lua ** Stack and Call structure of Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -193,6 +193,7 @@ static StkId adjust_varargs (lua_State *L, int nfixargs, int actual,
} }
if (style != NEWSTYLEVARARG) { /* compatibility with old-style vararg */ if (style != NEWSTYLEVARARG) { /* compatibility with old-style vararg */
int nvar = actual - nfixargs; /* number of extra arguments */ int nvar = actual - nfixargs; /* number of extra arguments */
luaC_checkGC(L);
htab = luaH_new(L, nvar, 1); /* create `arg' table */ htab = luaH_new(L, nvar, 1); /* create `arg' table */
for (i=0; i<nvar; i++) /* put extra arguments into `arg' table */ for (i=0; i<nvar; i++) /* put extra arguments into `arg' table */
setobj2n(L, luaH_setnum(L, htab, i+LUA_FIRSTINDEX), L->top - nvar + i); setobj2n(L, luaH_setnum(L, htab, i+LUA_FIRSTINDEX), L->top - nvar + i);
@ -244,14 +245,17 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
CallInfo *ci; CallInfo *ci;
StkId st, base; StkId st, base;
Proto *p = cl->p; Proto *p = cl->p;
luaD_checkstack(L, p->maxstacksize);
func = restorestack(L, funcr);
if (p->is_vararg) { /* varargs? */ if (p->is_vararg) { /* varargs? */
int nargs = L->top - func - 1; int nargs = L->top - restorestack(L, funcr) - 1;
luaD_checkstack(L, p->maxstacksize + nargs);
base = adjust_varargs(L, p->numparams, nargs, p->is_vararg); base = adjust_varargs(L, p->numparams, nargs, p->is_vararg);
func = restorestack(L, funcr);
} }
else else {
luaD_checkstack(L, p->maxstacksize);
func = restorestack(L, funcr);
base = func + 1; base = func + 1;
}
ci = ++L->ci; /* now `enter' new function */ ci = ++L->ci; /* now `enter' new function */
ci->func = func; ci->func = func;
L->base = ci->base = base; L->base = ci->base = base;