Fix calling convention by managing top of stack and adjusting on way in and out of function calls.
This commit is contained in:
@@ -31,23 +31,23 @@ final class Builtin extends LFunction {
|
||||
}
|
||||
|
||||
// perform a lua call
|
||||
public int luaStackCall(StackState state, int base, int nargs) {
|
||||
public void luaStackCall(StackState state, int base) {
|
||||
switch ( id ) {
|
||||
case PRINT:
|
||||
for ( int i=0; i<nargs; i++ ) {
|
||||
if ( i > 0 )
|
||||
System.out.print( "\t" );
|
||||
System.out.print( String.valueOf(state.stack[base+1+i]) );
|
||||
for ( int i=base+1, n=state.top; i<n; i++ ) {
|
||||
System.out.print( String.valueOf(state.stack[i]) );
|
||||
System.out.print( "\t" );
|
||||
}
|
||||
System.out.println();
|
||||
return 0;
|
||||
return;
|
||||
case PAIRS:
|
||||
state.adjustTop(base+2);
|
||||
LValue value = state.stack[base+1].luaPairs();
|
||||
state.stack[base] = value;
|
||||
return 1;
|
||||
state.adjustTop(base+1);
|
||||
return;
|
||||
default:
|
||||
luaUnsupportedOperation();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ public class Closure extends LValue {
|
||||
|
||||
|
||||
// perform a lua call
|
||||
public int luaStackCall(StackState state, int base, int nargs) {
|
||||
state.clear( base+1+nargs, p.numparams-nargs );
|
||||
return state.vmExecute( this, base+1 );
|
||||
public void luaStackCall(StackState state, int base) {
|
||||
state.adjustTop( base+1+p.numparams );
|
||||
state.vmExecute( this, base+1 );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,14 +50,15 @@ public class LTable extends LValue {
|
||||
}
|
||||
|
||||
// perform a lua call
|
||||
public int luaStackCall(StackState state, int base, int nargs) {
|
||||
public void luaStackCall(StackState state, int base) {
|
||||
if ( e.hasMoreElements() ) {
|
||||
LValue key = (LValue) e.nextElement();
|
||||
state.adjustTop(base+2);
|
||||
state.stack[base] = key;
|
||||
state.stack[base+1] = t.luaGetTable(key);
|
||||
return 2;
|
||||
} else {
|
||||
state.adjustTop(base);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,8 @@ public class LValue {
|
||||
}
|
||||
|
||||
// perform a lua call, return number of results actually produced
|
||||
public int luaStackCall(StackState state, int base, int nargs) {
|
||||
public void luaStackCall(StackState state, int base) {
|
||||
luaUnsupportedOperation();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// unsupported except for numbers
|
||||
|
||||
Reference in New Issue
Block a user