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

Loading java arrays as Array<out T> at method return type position, as well.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-15 19:19:58 +04:00
parent d2a308964d
commit 21e97b408c
21 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/ArrayTypeVariance.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package test
public class ArrayTypeVariance : java.lang.Object() {
public fun toArray(p0: Array<out Any?>?): Array<Any?>? {
public fun toArray(p0: Array<out Any?>?): Array<out Any?>? {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/ArrayTypeVariance.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public final class test.ArrayTypeVariance : java.lang.Object {
public final /*constructor*/ fun <init>(): test.ArrayTypeVariance
public final fun toArray(/*0*/ p0: jet.Array<out jet.Any?>?): jet.Array<jet.Any?>?
public final fun toArray(/*0*/ p0: jet.Array<out jet.Any?>?): jet.Array<out jet.Any?>?
}
compiler/testData/loadJava/FieldOfArrayType.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public open class FieldOfArrayType() : java.lang.Object() {
public var files: Array<java.io.File?>? = null
public var files: Array<out java.io.File?>? = null
}
compiler/testData/loadJava/FieldOfArrayType.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.FieldOfArrayType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.FieldOfArrayType
public final var files: jet.Array<java.io.File?>?
public final var files: jet.Array<out java.io.File?>?
}
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java
+3 -3
View File
@@ -22,12 +22,12 @@ import java.util.ArrayList;
import jet.runtime.typeinfo.KotlinSignature;
public class PropertyArrayTypes<T> {
@KotlinSignature("var arrayOfArrays : Array<Array<String>>")
@KotlinSignature("var arrayOfArrays : Array<out Array<out String>>")
public String[][] arrayOfArrays;
@KotlinSignature("var array : Array<String>")
@KotlinSignature("var array : Array<out String>")
public String[] array;
@KotlinSignature("var genericArray : Array<T>")
@KotlinSignature("var genericArray : Array<out T>")
public T[] genericArray;
}
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt
+3 -3
View File
@@ -3,7 +3,7 @@ package test
import java.util.*
public open class PropertyArrayTypes<T>() : java.lang.Object() {
public var arrayOfArrays : Array<Array<String>> = null!!
public var array : Array<String> = null!!
public var genericArray : Array<T> = null!!
public var arrayOfArrays : Array<out Array<out String>> = null!!
public var array : Array<out String> = null!!
public var genericArray : Array<out T> = null!!
}
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
+3 -3
View File
@@ -2,7 +2,7 @@ namespace test
public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
public final var array: jet.Array<jet.String>
public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
public final var genericArray: jet.Array<T>
public final var array: jet.Array<out jet.String>
public final var arrayOfArrays: jet.Array<out jet.Array<out jet.String>>
public final var genericArray: jet.Array<out T>
}
compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
+2 -2
View File
@@ -25,6 +25,6 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.Stri
public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String
public open override /*1*/ fun size(): jet.Int
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList<jet.String>
public open override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
public open override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<T>
public open override /*1*/ /*fake_override*/ fun toArray(): jet.Array<out jet.Any?>
public open override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<out T>
}