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/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class JavaTypeTransformer {
}
Variance variance;
if (howThisTypeIsUsed == MEMBER_SIGNATURE_CONTRAVARIANT && !(arrayType instanceof PsiEllipsisType)) {
if (!(arrayType instanceof PsiEllipsisType)) {
variance = Variance.OUT_VARIANCE;
}
else {
compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt
+1 -1
View File
@@ -6,5 +6,5 @@ fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
// A type mismatch on this line means that jdk-annotations were not loaded
al.toArray(Array<Int>(3, {1})) : Array<Int>
al.toArray(Array<Int>(3, {1})) : Array<out Int>
}
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>
}
compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java
+4 -4
View File
@@ -123,7 +123,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
actualCompileTimeConstant = getCompileTimeConstant(annotation2, annotationTypeName2, "value");
assert actualCompileTimeConstant instanceof AnnotationValue;
checkAnnotationCompileTimeConstant((AnnotationValue) actualCompileTimeConstant, "value",
DEFAULT_PACKAGE + ".MyAnnotation2", "jet.Array<jet.String?>?", "[\"test\", \"test2\"]");
DEFAULT_PACKAGE + ".MyAnnotation2", "jet.Array<out jet.String?>?", "[\"test\", \"test2\"]");
String annotationTypeName3 = DEFAULT_PACKAGE + ".MyAnnotationWithParam3";
AnnotationDescriptor annotation3 = getAnnotationInClassByType("C", annotationTypeName3);
@@ -183,7 +183,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
CompileTimeConstant<?> actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value");
assert actualCompileTimeConstant instanceof ArrayValue;
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<java.lang.annotation.ElementType?>?",
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<out java.lang.annotation.ElementType?>?",
"java.lang.annotation.ElementType", values);
}
@@ -197,7 +197,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
CompileTimeConstant<?> actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value");
assert actualCompileTimeConstant instanceof ArrayValue;
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<jet.String?>?", "jet.String", values);
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<out jet.String?>?", "jet.String", values);
}
public void testAnnotationWithEmptyArrayInParam() throws IOException {
@@ -211,7 +211,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir {
CompileTimeConstant<?> actualCompileTimeConstant = getCompileTimeConstant(annotation, annotationTypeName, "value");
assert actualCompileTimeConstant instanceof ArrayValue;
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<jet.String?>?", "jet.String", values);
checkArrayCompileTimeConstant((ArrayValue) actualCompileTimeConstant, "jet.Array<out jet.String?>?", "jet.String", values);
}
private void compileJavaFile(@NotNull String fileRelativePath, @Nullable String classPath)
jdk-annotations/java/io/annotations.xml
+6 -6
View File
@@ -57,7 +57,7 @@
<item name='java.io.File java.lang.String[] list()'>
<annotation name='org.jetbrains.annotations.Nullable'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun list() : Array&lt;String&gt;?&quot;"/>
<val name="value" val="&quot;fun list() : Array&lt;out String&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File java.lang.String[] list(java.io.FilenameFilter) 0'>
@@ -66,22 +66,22 @@
<item name='java.io.File java.lang.String[] list(java.io.FilenameFilter)'>
<annotation name='org.jetbrains.annotations.Nullable'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun list(filter : FilenameFilter?) : Array&lt;String&gt;?&quot;"/>
<val name="value" val="&quot;fun list(filter : FilenameFilter?) : Array&lt;out String&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File java.io.File[] listFiles()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun listFiles() : Array&lt;File&gt;?&quot;"/>
<val name="value" val="&quot;fun listFiles() : Array&lt;out File&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File java.io.File[] listFiles(java.io.FilenameFilter)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun listFiles(filter : FilenameFilter?) : Array&lt;File&gt;?&quot;"/>
<val name="value" val="&quot;fun listFiles(filter : FilenameFilter?) : Array&lt;out File&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File java.io.File[] listFiles(java.io.FileFilter)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun listFiles(filter : FileFilter?) : Array&lt;File&gt;?&quot;"/>
<val name="value" val="&quot;fun listFiles(filter : FileFilter?) : Array&lt;out File&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File boolean renameTo(java.io.File) 0'>
@@ -89,7 +89,7 @@
</item>
<item name='java.io.File java.io.File[] listRoots()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun listRoots() : Array&lt;File&gt;?&quot;"/>
<val name="value" val="&quot;fun listRoots() : Array&lt;out File&gt;?&quot;"/>
</annotation>
</item>
<item name='java.io.File java.io.File createTempFile(java.lang.String, java.lang.String, java.io.File) 0'>
jdk-annotations/java/lang/annotations.xml
+12 -12
View File
@@ -428,7 +428,7 @@
<item name='java.lang.Thread java.lang.StackTraceElement[] getStackTrace()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getStackTrace() : Array&lt;StackTraceElement&gt;&quot;"/>
<val name="value" val="&quot;fun getStackTrace() : Array&lt;out StackTraceElement&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Thread java.util.Map&lt;java.lang.Thread,java.lang.StackTraceElement[]&gt; getAllStackTraces()'>
@@ -637,7 +637,7 @@
<item name='java.lang.String java.lang.String[] split(java.lang.String, int)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun split(regex : String, limit : Int) : Array&lt;String&gt;&quot;"/>
<val name="value" val="&quot;fun split(regex : String, limit : Int) : Array&lt;out String&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.String java.lang.String[] split(java.lang.String, int) 0'>
@@ -649,7 +649,7 @@
<item name='java.lang.String java.lang.String[] split(java.lang.String)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun split(regex : String) : Array&lt;String&gt;&quot;"/>
<val name="value" val="&quot;fun split(regex : String) : Array&lt;out String&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.String java.lang.String toLowerCase(java.util.Locale) 0'>
@@ -823,24 +823,24 @@
<item name='java.lang.Class java.lang.Class&lt;?&gt;[] getClasses()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getClasses() : Array&lt;Class&lt;out Any?&gt;&gt;&quot;"/>
<val name="value" val="&quot;fun getClasses() : Array&lt;out Class&lt;out Any?&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Field[] getFields()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getFields() : Array&lt;Field&gt;&quot;"/>
<val name="value" val="&quot;fun getFields() : Array&lt;out Field&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Method[] getMethods()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getMethods() : Array&lt;Method&gt;&quot;"/>
<val name="value" val="&quot;fun getMethods() : Array&lt;out Method&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Constructor&lt;?&gt;[] getConstructors()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getConstructors() : Array&lt;Constructor&lt;out Any?&gt;&gt;&quot;"/>
<val name="value" val="&quot;fun getConstructors() : Array&lt;out Constructor&lt;out Any?&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Field getField(java.lang.String)'>
@@ -863,26 +863,26 @@
<item name='java.lang.Class java.lang.Class&lt;?&gt;[] getDeclaredClasses()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getDeclaredClasses() : Array&lt;Class&lt;out Any?&gt;&gt;&quot;"/>
<val name="value" val="&quot;fun getDeclaredClasses() : Array&lt;out Class&lt;out Any?&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Field[] getDeclaredFields()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getDeclaredFields() : Array&lt;Field&gt;&quot;"/>
<val name="value" val="&quot;fun getDeclaredFields() : Array&lt;out Field&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Method[] getDeclaredMethods()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getDeclaredMethods() : Array&lt;Method&gt;&quot;"/>
<val name="value" val="&quot;fun getDeclaredMethods() : Array&lt;out Method&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Constructor&lt;?&gt;[] getDeclaredConstructors()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun getDeclaredConstructors() : Array&lt;Constructor&lt;out Any?&gt;&gt;&quot;"/>
val="&quot;fun getDeclaredConstructors() : Array&lt;out Constructor&lt;out Any?&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.reflect.Field getDeclaredField(java.lang.String)'>
@@ -920,7 +920,7 @@
<item name='java.lang.Class T[] getEnumConstants()'>
<annotation name='org.jetbrains.annotations.Nullable'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getEnumConstants() : Array&lt;T&gt;?&quot;"/>
<val name="value" val="&quot;fun getEnumConstants() : Array&lt;out T&gt;?&quot;"/>
</annotation>
</item>
<item name='java.lang.Class java.lang.Class&lt;? extends U&gt; asSubclass(java.lang.Class&lt;U&gt;)'>
jdk-annotations/java/lang/reflect/annotations.xml
+1 -1
View File
@@ -153,7 +153,7 @@
<!-- java.lang.reflect.Method -->
<item name='java.lang.reflect.Method java.lang.annotation.Annotation[][] getParameterAnnotations()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun getParameterAnnotations() : Array&lt;Array&lt;Annotation&gt;&gt;&quot;"/>
<val name="value" val="&quot;fun getParameterAnnotations() : Array&lt;out Array&lt;out Annotation&gt;&gt;&quot;"/>
</annotation>
</item>
</root>
jdk-annotations/java/math/annotations.xml
+1 -1
View File
@@ -180,7 +180,7 @@
<item name='java.math.BigInteger java.math.BigInteger[] divideAndRemainder(java.math.BigInteger)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun divideAndRemainder(val value: BigInteger) : Array&lt;BigInteger&gt;&quot;"/>
val="&quot;fun divideAndRemainder(val value: BigInteger) : Array&lt;out BigInteger&gt;&quot;"/>
</annotation>
</item>
<!-- java.math.BigDecimal -->
jdk-annotations/java/util/annotations.xml
+13 -13
View File
@@ -81,12 +81,12 @@
</item>
<item name='java.util.ArrayList java.lang.Object[] toArray()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun toArray() : Array&lt;Any?&gt;&quot;"/>
<val name="value" val="&quot;fun toArray() : Array&lt;out Any?&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.ArrayList T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.ArrayList java.util.Iterator&lt;E&gt; iterator()'>
@@ -169,7 +169,7 @@
</item>
<item name='java.util.List T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.HashSet boolean add(E)'>
@@ -219,7 +219,7 @@
</item>
<item name='java.util.Collection T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Map.Entry K getKey()'>
@@ -304,7 +304,7 @@
</item>
<item name='java.util.Set T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.AbstractCollection boolean add(E)'>
@@ -339,12 +339,12 @@
</item>
<item name='java.util.AbstractCollection java.lang.Object[] toArray()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun toArray() : Array&lt;Any?&gt;&quot;"/>
<val name="value" val="&quot;fun toArray() : Array&lt;out Any?&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.AbstractCollection T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Enumeration E nextElement()'>
@@ -554,12 +554,12 @@
</item>
<item name='java.util.LinkedList java.lang.Object[] toArray()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun toArray() : Array&lt;Any?&gt;&quot;"/>
<val name="value" val="&quot;fun toArray() : Array&lt;out Any?&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.LinkedList T[] toArray(T[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;T&gt;&quot;"/>
<val name="value" val="&quot;fun &lt;T&gt; toArray(a : Array&lt;out T&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Iterator E next()'>
@@ -1102,7 +1102,7 @@
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T, U&gt; copyOf(original : Array&lt;out U&gt;, newLength : Int, newType : Class&lt;out Array&lt;T&gt;&gt;) : Array&lt;T&gt;&quot;"/>
val="&quot;fun &lt;T, U&gt; copyOf(original : Array&lt;out U&gt;, newLength : Int, newType : Class&lt;out Array&lt;out T&gt;&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays byte[] copyOf(byte[], int)'>
@@ -1157,7 +1157,7 @@
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; copyOfRange(original : Array&lt;out T&gt;, from : Int, to : Int) : Array&lt;T&gt;&quot;"/>
val="&quot;fun &lt;T&gt; copyOfRange(original : Array&lt;out T&gt;, from : Int, to : Int) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays T[] copyOfRange(T[], int, int) 0'>
@@ -1167,7 +1167,7 @@
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T, U&gt; copyOfRange(original : Array&lt;out U&gt;, from : Int, to : Int, newType : Class&lt;out Array&lt;T&gt;&gt;) : Array&lt;T&gt;&quot;"/>
val="&quot;fun &lt;T, U&gt; copyOfRange(original : Array&lt;out U&gt;, from : Int, to : Int, newType : Class&lt;out Array&lt;out T&gt;&gt;) : Array&lt;out T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays T[] copyOfRange(U[], int, int, java.lang.Class&lt;? extends T[]&gt;) 0'>
@@ -1227,7 +1227,7 @@
<item name='java.util.Arrays T[] copyOf(T[], int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; copyOf(original : Array&lt;out T&gt;, newLength : Int) : Array&lt;T?&gt;&quot;"/>
val="&quot;fun &lt;T&gt; copyOf(original : Array&lt;out T&gt;, newLength : Int) : Array&lt;out T?&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays java.lang.String toString(long[]) 0'>
jdk-annotations/java/util/regex/annotations.xml
+2 -2
View File
@@ -36,7 +36,7 @@
<item name='java.util.regex.Pattern java.lang.String[] split(java.lang.CharSequence, int)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun split(input : CharSequence, limit : Int) : Array&lt;String&gt;&quot;"/>
<val name="value" val="&quot;fun split(input : CharSequence, limit : Int) : Array&lt;out String&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.regex.Pattern java.lang.String[] split(java.lang.CharSequence) 0'>
@@ -44,7 +44,7 @@
</item>
<item name='java.util.regex.Pattern java.lang.String[] split(java.lang.CharSequence)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun split(input : CharSequence) : Array&lt;String&gt;&quot;"/>
<val name="value" val="&quot;fun split(input : CharSequence) : Array&lt;out String&gt;&quot;"/>
</annotation>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
libraries/stdlib/src/kotlin/StringsJVM.kt
+3 -3
View File
@@ -34,9 +34,9 @@ public inline fun String.toCharList(): List<Char> = toCharArray().toList()
public inline fun String.format(format : String, vararg args : Any?) : String = java.lang.String.format(format, args)
public inline fun String.split(regex : String) : Array<String> = (this as java.lang.String).split(regex) as Array<String>
public inline fun String.split(regex : String) : Array<out String> = (this as java.lang.String).split(regex)
public inline fun String.split(ch : Char) : Array<String> = (this as java.lang.String).split(java.util.regex.Pattern.quote(ch.toString())) as Array<String>
public inline fun String.split(ch : Char) : Array<out String> = (this as java.lang.String).split(java.util.regex.Pattern.quote(ch.toString()))
public inline fun String.substring(beginIndex : Int) : String = (this as java.lang.String).substring(beginIndex)
@@ -78,7 +78,7 @@ public inline fun String.replaceFirst(regex : String, replacement : String) : St
public inline fun String.charAt(index : Int) : Char = (this as java.lang.String).charAt(index)
public inline fun String.split(regex : String, limit : Int) : Array<String> = (this as java.lang.String).split(regex, limit)
public inline fun String.split(regex : String, limit : Int) : Array<out String> = (this as java.lang.String).split(regex, limit)
public inline fun String.codePointAt(index : Int) : Int = (this as java.lang.String).codePointAt(index)
libraries/stdlib/src/kotlin/io/Files.kt
+1 -1
View File
@@ -206,7 +206,7 @@ fun File.readLines(charset : String = "UTF-8") : List<String> {
/**
* Returns an array of files and directories in the directory that satisfy the specified filter.
*/
fun File.listFiles(filter : (file : File) -> Boolean) : Array<File>? = listFiles(
fun File.listFiles(filter : (file : File) -> Boolean) : Array<out File>? = listFiles(
object : FileFilter {
override fun accept(file: File) = filter(file)
}
libraries/stdlib/test/StringUtilTest.kt
+1 -1
View File
@@ -10,7 +10,7 @@ class StringUtilTest() : TestCase() {
fun testToRegex() {
val re = """foo""".toRegex()
val list = re.split("hellofoobar").toList()
val list = (re.split("hellofoobar") as Array<String>).toList()
assertEquals(arrayList("hello", "bar"), list)
}
}
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
+3 -2
View File
@@ -9,6 +9,7 @@ import java.util.ArrayList
import java.util.TreeMap
import org.w3c.dom.*
import org.w3c.dom.events.*
import java.lang.reflect.*
/**
* This tool generates JavaScript stubs for classes available in the JDK which are already available in the browser environment
@@ -139,7 +140,7 @@ import js.noImpl
}
}
for (method in validMethods) {
val parameterTypes = method.getParameterTypes()!!
val parameterTypes = method.getParameterTypes()!! as jet.Array<Class<out Any?>?>
// TODO in java 7 its not easy with reflection to get the parameter argument name...
var counter = 0
@@ -148,7 +149,7 @@ import js.noImpl
println(" public fun ${method.getName()}($parameters): $returnType = js.noImpl")
}
}
val fields = klass.getDeclaredFields()
val fields = klass.getDeclaredFields() as jet.Array<Field>
if (fields != null) {
if (fields.notEmpty()) {
println("")