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

Fix varargs invocation from luajava #95

Closed
yut23 wants to merge 2 commits from yut23/fix-luajava-varargs into master
pull from: yut23/fix-luajava-varargs
merge into: open-autonomous-connection:master
Conversation 1 Commits 2 Files Changed 1 +8 -5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/jse/org/luaj/vm2/lib/jse/JavaMember.java
View File

@@ -51,7 +51,7 @@ class JavaMember extends VarArgFunction {
fixedargs = new CoerceLuaToJava.Coercion[isvarargs? params.length-1: params.length]; fixedargs = new CoerceLuaToJava.Coercion[isvarargs? params.length-1: params.length];
for ( int i=0; i<fixedargs.length; i++ ) for ( int i=0; i<fixedargs.length; i++ )
fixedargs[i] = CoerceLuaToJava.getCoercion( params[i] ); fixedargs[i] = CoerceLuaToJava.getCoercion( params[i] );
varargs = isvarargs? CoerceLuaToJava.getCoercion( params[params.length-1] ): null; varargs = isvarargs? CoerceLuaToJava.getCoercion( params[params.length-1].getComponentType() ): null;
} }
int score(Varargs args) { int score(Varargs args) {
@@ -72,12 +72,15 @@ class JavaMember extends VarArgFunction {
for ( int i=0; i<a.length; i++ ) for ( int i=0; i<a.length; i++ )
a[i] = fixedargs[i].coerce( args.arg(i+1) ); a[i] = fixedargs[i].coerce( args.arg(i+1) );
} else { } else {
int n = Math.max(fixedargs.length,args.narg()); // should be the fixed arguments, followed by an array with the varargs
a = new Object[n]; a = new Object[fixedargs.length+1];
int nvar = Math.max(0, args.narg()-fixedargs.length);
Object[] vararray = new Object[nvar];
for ( int i=0; i<fixedargs.length; i++ ) for ( int i=0; i<fixedargs.length; i++ )
a[i] = fixedargs[i].coerce( args.arg(i+1) ); a[i] = fixedargs[i].coerce( args.arg(i+1) );
for ( int i=fixedargs.length; i<n; i++ ) a[a.length-1] = vararray;
a[i] = varargs.coerce( args.arg(i+1) ); for ( int i=0; i<nvar; i++ )
vararray[i] = varargs.coerce( args.arg(fixedargs.length+i+1) );
} }
return a; return a;
} }