From 7cb591401d35921dfe88dff153ede1e6c1ef89ae Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 6 Jun 2012 16:37:56 +0400
Subject: [PATCH] Supported alternative signatures for vararg parameters.

---
 .../java/AlternativeSignatureParsing.java        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
index fe2e9032212..07eba765388 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.JetTypeImpl;
 import org.jetbrains.jet.lang.types.TypeProjection;
 import org.jetbrains.jet.lang.types.TypeUtils;
+import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -83,11 +84,20 @@ class AlternativeSignatureParsing {
         for (int i = 0, size = parameterDescriptors.size(); i < size; i++) {
             ValueParameterDescriptor pd = parameterDescriptors.get(i);
             JetTypeElement alternativeTypeElement = altFunDeclaration.getValueParameters().get(i).getTypeReference().getTypeElement();
-            JetType alternativeType = computeAlternativeTypeFromAnnotation(alternativeTypeElement, pd.getType());
-            // TODO vararg
+            JetType alternativeType;
+            JetType alternativeVarargElementType;
+            // TODO check that alternative PSI has "vararg" modifier
+            if (pd.getVarargElementType() == null) {
+                alternativeType = computeAlternativeTypeFromAnnotation(alternativeTypeElement, pd.getType());
+                alternativeVarargElementType = null;
+            }
+            else {
+                alternativeVarargElementType = computeAlternativeTypeFromAnnotation(alternativeTypeElement, pd.getVarargElementType());
+                alternativeType = JetStandardLibrary.getInstance().getArrayType(alternativeVarargElementType);
+            }
             altParamDescriptors.add(new ValueParameterDescriptorImpl(pd.getContainingDeclaration(), pd.getIndex(), pd.getAnnotations(),
                                                                      pd.getName(), pd.isVar(), alternativeType, pd.declaresDefaultValue(),
-                                                                     pd.getVarargElementType()));
+                                                                     alternativeVarargElementType));
         }
         JetType altReceiverType = null;
         if (valueParameterDescriptors.receiverType != null) {