Skip to content

Commit

Permalink
metamodel #226: support java variadic methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@FroMage
FroMage committed Jun 26, 2013
1 parent 4bd5bf0 commit 08bd915
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 6 deletions.
5 changes: 4 additions & 1 deletion runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedClassType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,16 @@ private void initParameters(com.redhat.ceylon.compiler.typechecker.model.Class d
private MethodHandle reflectionToMethodHandle(Object found, Class<?> javaClass, Object instance2, ProducedType producedType, List<Parameter> parameters) {
MethodHandle constructor = null;
java.lang.Class<?>[] parameterTypes;
boolean variadic;
try {
if(!javaClass.isMemberClass()){
constructor = MethodHandles.lookup().unreflectConstructor((java.lang.reflect.Constructor<?>)found);
parameterTypes = ((java.lang.reflect.Constructor<?>)found).getParameterTypes();
variadic = ((java.lang.reflect.Constructor<?>)found).isVarArgs();
}else{
constructor = MethodHandles.lookup().unreflect((Method) found);
parameterTypes = ((java.lang.reflect.Method)found).getParameterTypes();
variadic = ((java.lang.reflect.Method)found).isVarArgs();
}
} catch (IllegalAccessException e) {
throw new RuntimeException("Problem getting a MH for constructor for: "+javaClass, e);
Expand All @@ -181,7 +184,7 @@ private MethodHandle reflectionToMethodHandle(Object found, Class<?> javaClass,
// get a list of produced parameter types
List<ProducedType> parameterProducedTypes = Metamodel.getParameterProducedTypes(parameters, producedType);
// now convert all arguments (we may need to unbox)
constructor = MethodHandleUtil.unboxArguments(constructor, typeParametersCount, 0, parameterTypes, parameterProducedTypes);
constructor = MethodHandleUtil.unboxArguments(constructor, typeParametersCount, 0, parameterTypes, parameterProducedTypes, variadic);

return constructor;
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private MethodHandle reflectionToMethodHandle(Method found, java.lang.Class<?> j
// get a list of produced parameter types
List<ProducedType> parameterProducedTypes = Metamodel.getParameterProducedTypes(parameters, appliedFunction);
// now convert all arguments (we may need to unbox)
method = MethodHandleUtil.unboxArguments(method, typeParametersCount, 0, parameterTypes, parameterProducedTypes);
method = MethodHandleUtil.unboxArguments(method, typeParametersCount, 0, parameterTypes, parameterProducedTypes, found.isVarArgs());
return method;
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedVariable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected void initField(com.redhat.ceylon.compiler.typechecker.model.Declaratio
setter = MethodHandles.lookup().unreflect(m);
setter = setter.bindTo(instance);
setter = setter.asType(MethodType.methodType(void.class, getterReturnType));
setter = MethodHandleUtil.unboxArguments(setter, 0, 0, new java.lang.Class[]{getterReturnType}, Arrays.asList(valueType));
setter = MethodHandleUtil.unboxArguments(setter, 0, 0, new java.lang.Class[]{getterReturnType}, Arrays.asList(valueType), false);
} catch (NoSuchMethodException e) {
throw new RuntimeException("Failed to find setter method "+setterName+" for: "+decl, e);
} catch (SecurityException e) {
Expand All @@ -48,7 +48,7 @@ protected void initField(com.redhat.ceylon.compiler.typechecker.model.Declaratio
Method m = javaClass.getMethod(setterName, getterReturnType);
setter = MethodHandles.lookup().unreflect(m);
setter = setter.asType(MethodType.methodType(void.class, getterReturnType));
setter = MethodHandleUtil.unboxArguments(setter, 0, 0, new java.lang.Class[]{getterReturnType}, Arrays.asList(valueType));
setter = MethodHandleUtil.unboxArguments(setter, 0, 0, new java.lang.Class[]{getterReturnType}, Arrays.asList(valueType), false);
} catch (NoSuchMethodException e) {
throw new RuntimeException("Failed to find setter method "+setterName+" for: "+decl, e);
} catch (SecurityException e) {
Expand Down
75 changes: 73 additions & 2 deletions runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/MethodHandleUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.redhat.ceylon.compiler.java.runtime.metamodel;

import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.List;

import com.redhat.ceylon.compiler.java.Util;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
import com.redhat.ceylon.compiler.java.runtime.model.TypeDescriptor;
import com.redhat.ceylon.compiler.typechecker.model.ProducedType;
import com.redhat.ceylon.compiler.typechecker.model.TypeDeclaration;
Expand All @@ -19,13 +24,79 @@ public static MethodHandle insertReifiedTypeArguments(MethodHandle constructor,
return MethodHandles.insertArguments(constructor, insertAt, typeDescriptors);
}

public static MethodHandle unboxArguments(MethodHandle method, int typeParameterCount, int filterIndex, java.lang.Class<?>[] parameterTypes, List<ProducedType> producedTypes) {
public static MethodHandle unboxArguments(MethodHandle method, int typeParameterCount, int filterIndex,
java.lang.Class<?>[] parameterTypes, List<ProducedType> producedTypes,
boolean variadic) {
MethodHandle[] filters = new MethodHandle[parameterTypes.length - typeParameterCount];
try {
for(int i=0;i<filters.length;i++){
java.lang.Class<?> paramType = parameterTypes[i + typeParameterCount];
ProducedType producedType = producedTypes.get(i);
if(paramType == java.lang.String.class){
if(variadic && i == filters.length - 1){
// we need to convert our ArraySequence instance to a T[] or primitive array
String methodName = null;
Object empty = null;
java.lang.Class<?> initialParamType = null;
if(paramType == boolean[].class){
methodName = "toBooleanArray";
empty = new boolean[0];
initialParamType = paramType;
}else if(paramType == byte[].class){
methodName = "toByteArray";
empty = new long[0];
initialParamType = long[].class;
}else if(paramType == short[].class){
methodName = "toShortArray";
empty = new long[0];
initialParamType = long[].class;
}else if(paramType == int[].class){
methodName = "toIntArray";
empty = new long[0];
initialParamType = long[].class;
}else if(paramType == long[].class){
methodName = "toLongArray";
empty = new long[0];
initialParamType = long[].class;
}else if(paramType == float[].class){
methodName = "toFloatArray";
empty = new double[0];
initialParamType = double[].class;
}else if(paramType == double[].class){
methodName = "toDoubleArray";
empty = new double[0];
initialParamType = double[].class;
}else if(paramType == char[].class){
methodName = "toCharArray";
empty = new int[0];
initialParamType = int[].class;
}else if(paramType == java.lang.String[].class){
methodName = "toJavaStringArray";
empty = new java.lang.String[0];
initialParamType = paramType;
}
if(methodName != null && empty != null && initialParamType != null){
MethodHandle convert = MethodHandles.lookup().findStatic(Util.class, methodName,
MethodType.methodType(paramType,
ceylon.language.List.class,
initialParamType));
// get rid of the second argument by fixing it to an empty array
convert = MethodHandles.insertArguments(convert, 1, empty);
filters[i] = convert.asType(MethodType.methodType(paramType, java.lang.Object.class));
}else{
// non-primitive object, use the array type
// if we have a T... and T has bounds "B0 & B1 ...", the underlying type will be B0[]
// if there are no bounds we will have Object[] so we're all good
MethodHandle convert = MethodHandles.lookup().findStatic(Util.class, "toArray",
MethodType.methodType(java.lang.Object[].class,
ceylon.language.List.class,
java.lang.Class.class,
java.lang.Object[].class));
// get rid of the second argument by fixing it to the array type
// get rid of the third argument by fixing it to an empty array
convert = MethodHandles.insertArguments(convert, 1, paramType.getComponentType(), new java.lang.Object[0]);
filters[i] = convert.asType(MethodType.methodType(paramType, java.lang.Object.class));
}
}else if(paramType == java.lang.String.class){
// ((ceylon.language.String)obj).toString()
MethodHandle unbox = MethodHandles.lookup().findVirtual(ceylon.language.String.class, "toString",
MethodType.methodType(java.lang.String.class));
Expand Down

0 comments on commit 08bd915

Please sign in to comment.