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

Changing default nullability for type arguments to NotNull

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-07 16:34:36 +04:00
parent f09054d1a0
commit f925bfccd0
33 changed files with 107 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
import java.util.*
public open class WrongReturnTypeStructure : Object() {
public open fun foo(p0 : String?, p1 : List<Map.Entry<String?, String?>?>?) : String? = ""
public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
}
compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongReturnTypeStructure : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongReturnTypeStructure
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package test
import java.util.*
public open class WrongTypeParameterBoundStructure1 : Object() {
public open fun <erased A, erased B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable?>? {
public open fun <erased A, erased B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable>? {
}
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeParameterBoundStructure1 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure1
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java
+1 -1
View File
@@ -6,7 +6,7 @@ import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
public class WrongTypeParameterBoundStructure2 {
@ExpectLoadError("'jet.List<java.lang.Cloneable?>?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them")
@ExpectLoadError("'jet.List<java.lang.Cloneable>?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them")
@KotlinSignature("fun <A, B : Runnable> foo(a : A, b : List<B>) where B : List")
public <A, B extends Runnable & List<Cloneable>> void foo(A a, List<? extends B> b) {
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package test
import java.util.*
public open class WrongTypeParameterBoundStructure2 : Object() {
public open fun <erased A, erased B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable?>? {
public open fun <erased A, erased B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable>? {
}
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeParameterBoundStructure2 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure2
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.*
public open class WrongTypeVariance : Object() {
public open fun copy(p0 : Array<out Number?>?, p1 : Array<out Number?>?) : MutableList<Number?>? {
public open fun copy(p0 : Array<out Number>?, p1 : Array<out Number>?) : MutableList<Number>? {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeVariance : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeVariance
public open fun copy(/*0*/ p0: jet.Array<out jet.Number?>?, /*1*/ p1: jet.Array<out jet.Number?>?): jet.MutableList<jet.Number?>?
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/error/WrongValueParameterStructure1.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
import java.util.*
public open class WrongValueParameterStructure1 : Object() {
public open fun foo(p0 : String?, p1 : List<Map.Entry<String?, String?>?>?) : String? = ""
public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
}
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongValueParameterStructure1 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure1
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
}
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java
+1 -1
View File
@@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature;
import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError;
public class WrongValueParameterStructure2 {
@ExpectLoadError("'jet.Map.Entry<jet.String?, jet.String?>?' type in method signature has 2 type arguments, while 'Map.Entry<String?>' in alternative signature has 1 of them")
@ExpectLoadError("'jet.Map.Entry<jet.String, jet.String>' type in method signature has 2 type arguments, while 'Map.Entry<String?>' in alternative signature has 1 of them")
@KotlinSignature("fun foo(a : String, b : List<Map.Entry<String?>?>) : String")
public String foo(String a, List<Map.Entry<String, String>> b) {
throw new UnsupportedOperationException();
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
import java.util.*
public open class WrongValueParameterStructure2 : Object() {
public open fun foo(p0 : String?, p1 : List<Map.Entry<String?, String?>?>?) : String? = ""
public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
}
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongValueParameterStructure2 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure2
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
}