open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Vix VARARGS passing by adjusting stack on varargs call to bury varargs + length of varargs under base of stack

Browse Source
This commit is contained in:
James Roseborough
2007-06-12 14:30:49 +00:00
parent b6f123d5e5
commit 4b7bbc1d8e
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/lua/io/Closure.java
View File

@@ -1,6 +1,8 @@
package lua.io;
import lua.StackState;
import lua.value.LInteger;
import lua.value.LNil;
import lua.value.LValue;
public class Closure extends LValue {
@@ -18,8 +20,26 @@ public class Closure extends LValue {
// perform a lua call
public void luaStackCall(StackState state, int base) {
if ( (! p.is_vararg) || (state.top < base+1+p.numparams) )
state.adjustTop( base+1+p.numparams );
state.vmExecute( this, base+1 );
// skip over closure
base++;
if ( p.is_vararg ) {
// adjust stack to bury varargs under base
int top = state.top;
int nsupplied = top-base;
int nrequired = p.numparams;
int nvarargs = Math.max( 0, nsupplied - nrequired );
for ( int i=0; i<nrequired; i++ )
state.stack[top+i+1] = (i<nsupplied? state.stack[base+i]: LNil.NIL);
state.stack[top] = new LInteger( nvarargs );
state.top = top + nrequired + 1;
base = top+1;
} else {
// normal non-varargs call
state.adjustTop( base+p.numparams );
}
state.vmExecute( this, base );
}
}

4
src/test/res/test3.lua
View File

@@ -42,14 +42,12 @@ print( func(func(32,33,34), func(45,46,47), func(58,59,50)) )
--[[
function p(a,...)
print("a",a)
print("a,...",a,...)
print("...",...)
print("...,a",...,a)
print("a,...",a,...)
end
local aa,bb,cc,dd
p()
p("q")
p("q","r")
p("q","r","s")
print(aa,bb,cc,dd)
--]]