Improve calling convention handling when the number of arguments doesn't match the expected number, and the number of return values doesn't match those needed.

This commit is contained in:
James Roseborough
2007-06-11 04:30:03 +00:00
parent de763e0a1e
commit 05cfdaa33b
7 changed files with 52 additions and 15 deletions

View File

@@ -4,6 +4,7 @@
package lua;
import lua.value.LFunction;
import lua.value.LNil;
import lua.value.LString;
import lua.value.LTable;
import lua.value.LValue;
@@ -30,7 +31,7 @@ final class Builtin extends LFunction {
}
// perform a lua call
public void luaStackCall(StackState state, int base, int nargs) {
public int luaStackCall(StackState state, int base, int nargs) {
switch ( id ) {
case PRINT:
for ( int i=0; i<nargs; i++ ) {
@@ -39,13 +40,14 @@ final class Builtin extends LFunction {
System.out.print( String.valueOf(state.stack[base+1+i]) );
}
System.out.println();
return;
return 0;
case PAIRS:
LValue value = state.stack[base+1].luaPairs();
state.stack[base] = value;
return;
return 1;
default:
luaUnsupportedOperation();
return 0;
}
}