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

Added checking for same variance in alternative signatures.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-21 15:51:16 +04:00
parent 178a10716b
commit a02ab2b348
4 changed files with 53 additions and 5 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
+23 -5
View File
@@ -29,10 +29,7 @@ import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.Name;
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.*;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import org.jetbrains.jet.resolve.DescriptorRenderer;
@@ -110,7 +107,28 @@ class AlternativeSignatureParsing {
TypeProjection argument = arguments.get(i);
JetType alternativeType =
computeAlternativeTypeFromAnnotation(argumentAlternativeTypeElement, argument.getType());
altArguments.add(new TypeProjection(argument.getProjectionKind(), alternativeType));
Variance variance = argument.getProjectionKind();
if (type instanceof JetUserType) {
JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i);
Variance altVariance = Variance.INVARIANT;
switch (typeProjection.getProjectionKind()) {
case IN:
altVariance = Variance.IN_VARIANCE;
break;
case OUT:
altVariance = Variance.OUT_VARIANCE;
break;
case STAR:
throw new AlternativeSignatureMismatchException(
"Star projection is not available in alternative signatures");
default:
}
if (altVariance != variance) {
throw new AlternativeSignatureMismatchException(String.format(
"Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance));
}
}
altArguments.add(new TypeProjection(variance, alternativeType));
}
return new JetTypeImpl(autoType.getAnnotations(), autoType.getConstructor(), false,
altArguments, autoType.getMemberScope());
compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java
+15
View File
@@ -0,0 +1,15 @@
package test;
import java.lang.Number;
import java.lang.UnsupportedOperationException;
import java.util.*;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
public class WrongTypeVariance {
@KotlinSignature("fun copy(a : List<out Number>, b : List<Number>) : List<Number>")
public List<Number> copy(List<? extends Number> from, List<? super Number> to) {
throw new UnsupportedOperationException();
}
}
compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.kt
+9
View File
@@ -0,0 +1,9 @@
package test
import java.util.*
public open class WrongTypeVariance : Object() {
public open fun copy(p0 : List<out java.lang.Number?>?, p1 : List<in java.lang.Number?>?) : List<java.lang.Number?>? {
throw UnsupportedOperationException()
}
}
compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.txt
+6
View File
@@ -0,0 +1,6 @@
namespace test
public open class test.WrongTypeVariance : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeVariance
public open fun copy(/*0*/ p0: java.util.List<out java.lang.Number?>?, /*1*/ p1: java.util.List<in java.lang.Number?>?): java.util.List<java.lang.Number?>?
}