azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Supported alternative signatures for vararg parameters.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-06 16:37:56 +04:00
parent bb0f3f733b
commit 7cb591401d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
+13 -3
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.JetTypeImpl; import org.jetbrains.jet.lang.types.JetTypeImpl;
import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -83,11 +84,20 @@ class AlternativeSignatureParsing {
for (int i = 0, size = parameterDescriptors.size(); i < size; i++) { for (int i = 0, size = parameterDescriptors.size(); i < size; i++) {
ValueParameterDescriptor pd = parameterDescriptors.get(i); ValueParameterDescriptor pd = parameterDescriptors.get(i);
JetTypeElement alternativeTypeElement = altFunDeclaration.getValueParameters().get(i).getTypeReference().getTypeElement(); JetTypeElement alternativeTypeElement = altFunDeclaration.getValueParameters().get(i).getTypeReference().getTypeElement();
JetType alternativeType = computeAlternativeTypeFromAnnotation(alternativeTypeElement, pd.getType()); JetType alternativeType;
// TODO vararg 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(), altParamDescriptors.add(new ValueParameterDescriptorImpl(pd.getContainingDeclaration(), pd.getIndex(), pd.getAnnotations(),
pd.getName(), pd.isVar(), alternativeType, pd.declaresDefaultValue(), pd.getName(), pd.isVar(), alternativeType, pd.declaresDefaultValue(),
pd.getVarargElementType())); alternativeVarargElementType));
} }
JetType altReceiverType = null; JetType altReceiverType = null;
if (valueParameterDescriptors.receiverType != null) { if (valueParameterDescriptors.receiverType != null) {