From 5f852c33a8a57bd8fad58747b339961ac6c835ef Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 27 Apr 2016 22:28:29 +0100 Subject: Support passing arrays as vararg argument --- .../org/zwobble/couscous/frontends/java/JavaExpressionReader.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java index fcce1e1..e6b3822 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java @@ -317,7 +317,11 @@ public class JavaExpressionReader { ITypeBinding[] parameterTypes = method.getParameterTypes(); return IntStream.range(0, parameterTypes.length) .mapToObj(index -> { - if (method.isVarargs() && index == parameterTypes.length - 1) { + boolean isVarargs = + method.isVarargs() && + index == parameterTypes.length - 1 && + (javaArguments.size() != parameterTypes.length || !javaArguments.get(index).resolveTypeBinding().isEqualTo(parameterTypes[index])); + if (isVarargs) { Type elementType = typeOf(parameterTypes[index].getElementType()); List elements = IntStream.range(index, javaArguments.size()) .mapToObj(argumentIndex -> readExpression(elementType, javaArguments.get(argumentIndex))) -- cgit v1.2.3