fixed bug: invoke java variable parameter type method problem
This commit is contained in:
@@ -1,26 +1,27 @@
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2011 Luaj.org. All rights reserved.
|
* Copyright (c) 2011 Luaj.org. All rights reserved.
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
* in the Software without restriction, including without limitation the rights
|
* in the Software without restriction, including without limitation the rights
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
* furnished to do so, subject to the following conditions:
|
* furnished to do so, subject to the following conditions:
|
||||||
*
|
*
|
||||||
* The above copyright notice and this permission notice shall be included in
|
* The above copyright notice and this permission notice shall be included in
|
||||||
* all copies or substantial portions of the Software.
|
* all copies or substantial portions of the Software.
|
||||||
*
|
*
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package org.luaj.vm2.libs.jse;
|
package org.luaj.vm2.libs.jse;
|
||||||
|
|
||||||
|
import java.lang.reflect.Array;
|
||||||
import org.luaj.vm2.Varargs;
|
import org.luaj.vm2.Varargs;
|
||||||
import org.luaj.vm2.libs.VarArgFunction;
|
import org.luaj.vm2.libs.VarArgFunction;
|
||||||
import org.luaj.vm2.libs.jse.CoerceLuaToJava.Coercion;
|
import org.luaj.vm2.libs.jse.CoerceLuaToJava.Coercion;
|
||||||
@@ -28,10 +29,10 @@ import org.luaj.vm2.libs.jse.CoerceLuaToJava.Coercion;
|
|||||||
/**
|
/**
|
||||||
* Java method or constructor.
|
* Java method or constructor.
|
||||||
* <p>
|
* <p>
|
||||||
* Primarily handles argument coercion for parameter lists including scoring of compatibility and
|
* Primarily handles argument coercion for parameter lists including scoring of compatibility and
|
||||||
* java varargs handling.
|
* java varargs handling.
|
||||||
* <p>
|
* <p>
|
||||||
* This class is not used directly.
|
* This class is not used directly.
|
||||||
* It is an abstract base class for {@link JavaConstructor} and {@link JavaMethod}.
|
* It is an abstract base class for {@link JavaConstructor} and {@link JavaMethod}.
|
||||||
* @see JavaConstructor
|
* @see JavaConstructor
|
||||||
* @see JavaMethod
|
* @see JavaMethod
|
||||||
@@ -40,20 +41,20 @@ import org.luaj.vm2.libs.jse.CoerceLuaToJava.Coercion;
|
|||||||
*/
|
*/
|
||||||
abstract
|
abstract
|
||||||
class JavaMember extends VarArgFunction {
|
class JavaMember extends VarArgFunction {
|
||||||
|
|
||||||
static final int METHOD_MODIFIERS_VARARGS = 0x80;
|
static final int METHOD_MODIFIERS_VARARGS = 0x80;
|
||||||
|
|
||||||
final Coercion[] fixedargs;
|
final Coercion[] fixedargs;
|
||||||
final Coercion varargs;
|
final Coercion varargs;
|
||||||
|
|
||||||
protected JavaMember(Class[] params, int modifiers) {
|
protected JavaMember(Class[] params, int modifiers) {
|
||||||
boolean isvarargs = ((modifiers & METHOD_MODIFIERS_VARARGS) != 0);
|
boolean isvarargs = ((modifiers & METHOD_MODIFIERS_VARARGS) != 0);
|
||||||
fixedargs = new 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] ): null;
|
||||||
}
|
}
|
||||||
|
|
||||||
int score(Varargs args) {
|
int score(Varargs args) {
|
||||||
int n = args.narg();
|
int n = args.narg();
|
||||||
int s = n>fixedargs.length? CoerceLuaToJava.SCORE_WRONG_TYPE * (n-fixedargs.length): 0;
|
int s = n>fixedargs.length? CoerceLuaToJava.SCORE_WRONG_TYPE * (n-fixedargs.length): 0;
|
||||||
@@ -64,7 +65,7 @@ class JavaMember extends VarArgFunction {
|
|||||||
s += varargs.score( args.arg(k+1) );
|
s += varargs.score( args.arg(k+1) );
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Object[] convertArgs(Varargs args) {
|
protected Object[] convertArgs(Varargs args) {
|
||||||
Object[] a;
|
Object[] a;
|
||||||
if ( varargs == null ) {
|
if ( varargs == null ) {
|
||||||
@@ -73,6 +74,11 @@ class JavaMember extends VarArgFunction {
|
|||||||
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());
|
int n = Math.max(fixedargs.length,args.narg());
|
||||||
|
// This situation indicates that the method has only one input parameter,
|
||||||
|
// and the parameter is a variable parameter type, etc: append(String...args).
|
||||||
|
if (n == 0 && varargs instanceof CoerceLuaToJava.ArrayCoercion) {
|
||||||
|
return new Object[] {Array.newInstance(((CoerceLuaToJava.ArrayCoercion)varargs).componentType,0)};
|
||||||
|
}
|
||||||
a = new Object[n];
|
a = new Object[n];
|
||||||
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) );
|
||||||
@@ -81,4 +87,4 @@ class JavaMember extends VarArgFunction {
|
|||||||
}
|
}
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user