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

Replaced variance with projection kind.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-31 21:15:39 +04:00
parent d0b18287c8
commit e1b7126ae3
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+1 -1
View File
@@ -157,7 +157,7 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
altProjectionKind = Variance.INVARIANT;
}
if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT) {
throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s",
throw new AlternativeSignatureMismatchException("Projection kind mismatch, actual: %s, in alternative signature: %s",
projectionKind, altProjectionKind);
}
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java → compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java
+2 -2
View File
@@ -6,8 +6,8 @@ import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeVariance {
@ExpectLoadError("Variance mismatch, actual: out, in alternative signature: ")
public class WrongProjectionKind {
@ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ")
@KotlinSignature("fun copy(a : Array<out Number>, b : Array<Number>) : MutableList<Number>")
public List<Number> copy(Number[] from, Number[] to) {
throw new UnsupportedOperationException();
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt → compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
import java.util.*
public open class WrongTypeVariance : Object() {
public open class WrongProjectionKind : Object() {
public open fun copy(p0 : Array<out Number>?, p1 : Array<out Number>?) : MutableList<Number>? {
throw UnsupportedOperationException()
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt → compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public open class WrongTypeVariance : java.lang.Object {
public constructor WrongTypeVariance()
public open class WrongProjectionKind : java.lang.Object {
public constructor WrongProjectionKind()
public open fun copy(/*0*/ p0 : jet.Array<out jet.Number>?, /*1*/ p1 : jet.Array<out jet.Number>?) : jet.MutableList<jet.Number>?
}
compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java
+1 -1
View File
@@ -13,7 +13,7 @@ public interface ChangeProjectionKind1 {
}
public interface Sub extends Super {
@ExpectLoadError("Variance mismatch, actual: in, in alternative signature: ")
@ExpectLoadError("Projection kind mismatch, actual: in, in alternative signature: ")
@KotlinSignature("fun foo(p: MutableList<String>)")
void foo(List<String> p);
}
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+5 -5
View File
@@ -408,6 +408,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java");
}
@TestMetadata("WrongProjectionKind.java")
public void testWrongProjectionKind() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java");
}
@TestMetadata("WrongReturnTypeStructure.java")
public void testWrongReturnTypeStructure() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java");
@@ -443,11 +448,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java");
}
@TestMetadata("WrongTypeVariance.java")
public void testWrongTypeVariance() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java");
}
@TestMetadata("WrongValueParameterStructure1.java")
public void testWrongValueParameterStructure1() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+5 -5
View File
@@ -1343,6 +1343,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt");
}
@TestMetadata("WrongProjectionKind.kt")
public void testWrongProjectionKind() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt");
}
@TestMetadata("WrongReturnTypeStructure.kt")
public void testWrongReturnTypeStructure() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
@@ -1378,11 +1383,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
}
@TestMetadata("WrongTypeVariance.kt")
public void testWrongTypeVariance() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt");
}
@TestMetadata("WrongValueParameterStructure1.kt")
public void testWrongValueParameterStructure1() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");