diff --git a/js/js.libraries/src/core/javautilCode.kt b/js/js.libraries/src/core/javautilCode.kt index 3e4a935a5b6..ce3e78e66e2 100644 --- a/js/js.libraries/src/core/javautilCode.kt +++ b/js/js.libraries/src/core/javautilCode.kt @@ -26,12 +26,12 @@ public object Collections { public fun emptyMap(): Map = emptyMap as Map library - public fun sort(list: List): Unit { + public fun sort(list: MutableList): Unit { throw UnsupportedOperationException() } library("sortWithComp") - public fun sort(list: List, comparator: java.util.Comparator): Unit { + public fun sort(list: MutableList, comparator: java.util.Comparator): Unit { throw UnsupportedOperationException() } diff --git a/libraries/stdlib/src/generated/ArraysFromIterables.kt b/libraries/stdlib/src/generated/ArraysFromIterables.kt index 7c715288ecd..53ea29019f8 100644 --- a/libraries/stdlib/src/generated/ArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterables.kt @@ -248,7 +248,7 @@ public inline fun > Array.takeWhileTo(result: C } /** Copies all elements into the given collection */ -public inline fun > Array.toCollection(result: C) : C { +public inline fun > Array.toCollection(result: C) : C { for (element in this) result.add(element) return result } @@ -265,16 +265,16 @@ public inline fun Array.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun Array.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun Array.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun Array.toList() : List = toCollection(ArrayList()) +public inline fun Array.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun Array.toCollection() : Collection = toCollection(ArrayList()) +public inline fun Array.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun Array.toSet() : Set = toCollection(HashSet()) +public inline fun Array.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt index 2375ef4de1c..7a2658981f3 100644 --- a/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun Array.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun Array.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt index 8e366a995fc..9a8382ef08a 100644 --- a/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun Array.flatMap(transform: (T)-> Collection) : Coll * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun Array.plus(element: T): List { +public inline fun Array.plus(element: T): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun Array.plus(element: T): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun Array.plus(elements: Array): List { +public inline fun Array.plus(elements: Array): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun Array.plus(elements: Array): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun Array.requireNoNulls() : List { +public inline fun Array.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt index 870f3c56398..ad1b65ec85a 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun BooleanArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun BooleanArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun BooleanArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun BooleanArray.toList() : List = toCollection(ArrayList()) +public inline fun BooleanArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun BooleanArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun BooleanArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun BooleanArray.toSet() : Set = toCollection(HashSet()) +public inline fun BooleanArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt index a663980710b..1575286598c 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun BooleanArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun BooleanArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt index 4bc8baede93..d12e52f1adf 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun BooleanArray.flatMap(transform: (Boolean)-> Collection) * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun BooleanArray.plus(element: Boolean): List { +public inline fun BooleanArray.plus(element: Boolean): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun BooleanArray.plus(element: Boolean): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun BooleanArray.plus(elements: BooleanArray): List { +public inline fun BooleanArray.plus(elements: BooleanArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun BooleanArray.plus(elements: BooleanArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun BooleanArray.requireNoNulls() : List { +public inline fun BooleanArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/ByteArraysFromIterables.kt b/libraries/stdlib/src/generated/ByteArraysFromIterables.kt index 6bdedbc0c8a..f7b83a00c63 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun ByteArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun ByteArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun ByteArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun ByteArray.toList() : List = toCollection(ArrayList()) +public inline fun ByteArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun ByteArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun ByteArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun ByteArray.toSet() : Set = toCollection(HashSet()) +public inline fun ByteArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt index 14507d8f39d..5a0f7780042 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun ByteArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun ByteArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt index c4fec37f7d6..fda727c7c07 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun ByteArray.flatMap(transform: (Byte)-> Collection) : Col * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun ByteArray.plus(element: Byte): List { +public inline fun ByteArray.plus(element: Byte): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun ByteArray.plus(element: Byte): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun ByteArray.plus(elements: ByteArray): List { +public inline fun ByteArray.plus(elements: ByteArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun ByteArray.plus(elements: ByteArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun ByteArray.requireNoNulls() : List { +public inline fun ByteArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/CharArraysFromIterables.kt b/libraries/stdlib/src/generated/CharArraysFromIterables.kt index 1d09d591637..63f0896f23b 100644 --- a/libraries/stdlib/src/generated/CharArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun CharArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun CharArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun CharArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun CharArray.toList() : List = toCollection(ArrayList()) +public inline fun CharArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun CharArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun CharArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun CharArray.toSet() : Set = toCollection(HashSet()) +public inline fun CharArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt index b9d62135175..1a27a24096c 100644 --- a/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun CharArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun CharArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt index 2225ee0fffa..d84077dc06a 100644 --- a/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun CharArray.flatMap(transform: (Char)-> Collection) : Col * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun CharArray.plus(element: Char): List { +public inline fun CharArray.plus(element: Char): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun CharArray.plus(element: Char): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun CharArray.plus(elements: CharArray): List { +public inline fun CharArray.plus(elements: CharArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun CharArray.plus(elements: CharArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun CharArray.requireNoNulls() : List { +public inline fun CharArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt index e215381686e..d33ce8e1ce6 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun DoubleArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun DoubleArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun DoubleArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun DoubleArray.toList() : List = toCollection(ArrayList()) +public inline fun DoubleArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun DoubleArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun DoubleArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun DoubleArray.toSet() : Set = toCollection(HashSet()) +public inline fun DoubleArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt index accecd0d205..b8015d5bf5b 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun DoubleArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun DoubleArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt index 05b27c643a0..06ce8491160 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun DoubleArray.flatMap(transform: (Double)-> Collection) : * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun DoubleArray.plus(element: Double): List { +public inline fun DoubleArray.plus(element: Double): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun DoubleArray.plus(element: Double): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun DoubleArray.plus(elements: DoubleArray): List { +public inline fun DoubleArray.plus(elements: DoubleArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun DoubleArray.plus(elements: DoubleArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun DoubleArray.requireNoNulls() : List { +public inline fun DoubleArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/FloatArraysFromIterables.kt b/libraries/stdlib/src/generated/FloatArraysFromIterables.kt index 66f3270af02..b4b99c2b18e 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun FloatArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun FloatArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun FloatArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun FloatArray.toList() : List = toCollection(ArrayList()) +public inline fun FloatArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun FloatArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun FloatArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun FloatArray.toSet() : Set = toCollection(HashSet()) +public inline fun FloatArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt index 721ddb39518..6ba6ef279c3 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun FloatArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun FloatArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt index b3baff78c96..045808a46a2 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun FloatArray.flatMap(transform: (Float)-> Collection) : C * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun FloatArray.plus(element: Float): List { +public inline fun FloatArray.plus(element: Float): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun FloatArray.plus(element: Float): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun FloatArray.plus(elements: FloatArray): List { +public inline fun FloatArray.plus(elements: FloatArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun FloatArray.plus(elements: FloatArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun FloatArray.requireNoNulls() : List { +public inline fun FloatArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/IntArraysFromIterables.kt b/libraries/stdlib/src/generated/IntArraysFromIterables.kt index 7f90411d1c3..588b28c5c0a 100644 --- a/libraries/stdlib/src/generated/IntArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun IntArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun IntArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun IntArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun IntArray.toList() : List = toCollection(ArrayList()) +public inline fun IntArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun IntArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun IntArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun IntArray.toSet() : Set = toCollection(HashSet()) +public inline fun IntArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt index 7ca6a7acb81..b51bec3c1bf 100644 --- a/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun IntArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun IntArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt index 84e7c2a42fe..38500e7a116 100644 --- a/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun IntArray.flatMap(transform: (Int)-> Collection) : Colle * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun IntArray.plus(element: Int): List { +public inline fun IntArray.plus(element: Int): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun IntArray.plus(element: Int): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun IntArray.plus(elements: IntArray): List { +public inline fun IntArray.plus(elements: IntArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun IntArray.plus(elements: IntArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun IntArray.requireNoNulls() : List { +public inline fun IntArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/IteratorsFromIterables.kt b/libraries/stdlib/src/generated/IteratorsFromIterables.kt index 25644807237..2812df00553 100644 --- a/libraries/stdlib/src/generated/IteratorsFromIterables.kt +++ b/libraries/stdlib/src/generated/IteratorsFromIterables.kt @@ -247,7 +247,7 @@ public inline fun > Iterator.takeWhileTo(result } /** Copies all elements into the given collection */ -public inline fun > Iterator.toCollection(result: C) : C { +public inline fun > Iterator.toCollection(result: C) : C { for (element in this) result.add(element) return result } @@ -264,16 +264,16 @@ public inline fun Iterator.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun Iterator.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun Iterator.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun Iterator.toList() : List = toCollection(ArrayList()) +public inline fun Iterator.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun Iterator.toCollection() : Collection = toCollection(ArrayList()) +public inline fun Iterator.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun Iterator.toSet() : Set = toCollection(HashSet()) +public inline fun Iterator.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt b/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt index 0440442a909..5872d1c6b66 100644 --- a/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt @@ -11,5 +11,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun Iterator.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun Iterator.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/LongArraysFromIterables.kt b/libraries/stdlib/src/generated/LongArraysFromIterables.kt index a7bf7fd69a9..4d0fa535e61 100644 --- a/libraries/stdlib/src/generated/LongArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun LongArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun LongArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun LongArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun LongArray.toList() : List = toCollection(ArrayList()) +public inline fun LongArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun LongArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun LongArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun LongArray.toSet() : Set = toCollection(HashSet()) +public inline fun LongArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt index b6c3664547d..153103b5966 100644 --- a/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun LongArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun LongArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt index 5fb3b7910c5..b6672234880 100644 --- a/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun LongArray.flatMap(transform: (Long)-> Collection) : Col * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun LongArray.plus(element: Long): List { +public inline fun LongArray.plus(element: Long): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun LongArray.plus(element: Long): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun LongArray.plus(elements: LongArray): List { +public inline fun LongArray.plus(elements: LongArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun LongArray.plus(elements: LongArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun LongArray.requireNoNulls() : List { +public inline fun LongArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/generated/ShortArraysFromIterables.kt b/libraries/stdlib/src/generated/ShortArraysFromIterables.kt index bec27c9d800..71fe6af7fa9 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterables.kt @@ -265,16 +265,16 @@ public inline fun ShortArray.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun ShortArray.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun ShortArray.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun ShortArray.toList() : List = toCollection(ArrayList()) +public inline fun ShortArray.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun ShortArray.toCollection() : Collection = toCollection(ArrayList()) +public inline fun ShortArray.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun ShortArray.toSet() : Set = toCollection(HashSet()) +public inline fun ShortArray.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt b/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt index 10ad4594d72..3a30a6f1bb8 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt @@ -12,5 +12,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun ShortArray.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun ShortArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt b/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt index 793f512eaf2..b390069b522 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt @@ -51,7 +51,7 @@ public inline fun ShortArray.flatMap(transform: (Short)-> Collection) : C * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun ShortArray.plus(element: Short): List { +public inline fun ShortArray.plus(element: Short): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -63,7 +63,7 @@ public inline fun ShortArray.plus(element: Short): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun ShortArray.plus(elements: ShortArray): List { +public inline fun ShortArray.plus(elements: ShortArray): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -74,7 +74,7 @@ public inline fun ShortArray.plus(elements: ShortArray): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun ShortArray.requireNoNulls() : List { +public inline fun ShortArray.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/kotlin/Arrays.kt b/libraries/stdlib/src/kotlin/Arrays.kt index 63ddb61e49b..177a10421d0 100644 --- a/libraries/stdlib/src/kotlin/Arrays.kt +++ b/libraries/stdlib/src/kotlin/Arrays.kt @@ -33,5 +33,5 @@ public inline val DoubleArray.lastIndex : Int public inline val CharArray.lastIndex : Int get() = this.size - 1 -public inline val Array.lastIndex : Int +public inline val Array.lastIndex : Int get() = this.size - 1 diff --git a/libraries/stdlib/src/kotlin/ArraysJVM.kt b/libraries/stdlib/src/kotlin/ArraysJVM.kt index f50e7c7cd43..0b068cfe98c 100644 --- a/libraries/stdlib/src/kotlin/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/ArraysJVM.kt @@ -57,7 +57,7 @@ public inline fun FloatArray.fill(value: Float) : Unit = Arrays.fill(this, public inline fun DoubleArray.fill(value: Double) : Unit = Arrays.fill(this, value) public inline fun CharArray.fill(value: Char) : Unit = Arrays.fill(this, value) -public inline fun Array.fill(value: T) : Unit = Arrays.fill(this, value) +public inline fun Array.fill(value: T) : Unit = Arrays.fill(this, value) public inline fun ByteArray.sort() : Unit = Arrays.sort(this) public inline fun ShortArray.sort() : Unit = Arrays.sort(this) diff --git a/libraries/stdlib/src/kotlin/Iterables.kt b/libraries/stdlib/src/kotlin/Iterables.kt index 95777062fbc..ec134190a66 100644 --- a/libraries/stdlib/src/kotlin/Iterables.kt +++ b/libraries/stdlib/src/kotlin/Iterables.kt @@ -239,7 +239,7 @@ public inline fun > Iterable.takeWhileTo(result } /** Copies all elements into the given collection */ -public inline fun > Iterable.toCollection(result: C) : C { +public inline fun > Iterable.toCollection(result: C) : C { for (element in this) result.add(element) return result } @@ -256,16 +256,16 @@ public inline fun Iterable.reverse() : List { } /** Copies all elements into a [[LinkedList]] */ -public inline fun Iterable.toLinkedList() : LinkedList = toCollection(LinkedList()) +public inline fun Iterable.toLinkedList() : LinkedList = toCollection(LinkedList()) /** Copies all elements into a [[List]] */ -public inline fun Iterable.toList() : List = toCollection(ArrayList()) +public inline fun Iterable.toList() : List = toCollection(ArrayList()) /** Copies all elements into a [[List] */ -public inline fun Iterable.toCollection() : Collection = toCollection(ArrayList()) +public inline fun Iterable.toCollection() : Collection = toCollection(ArrayList()) /** Copies all elements into a [[Set]] */ -public inline fun Iterable.toSet() : Set = toCollection(HashSet()) +public inline fun Iterable.toSet() : Set = toCollection(HashSet()) /** TODO figure out necessary variance/generics ninja stuff... :) diff --git a/libraries/stdlib/src/kotlin/IterablesJVM.kt b/libraries/stdlib/src/kotlin/IterablesJVM.kt index 741986182f8..825915b9001 100644 --- a/libraries/stdlib/src/kotlin/IterablesJVM.kt +++ b/libraries/stdlib/src/kotlin/IterablesJVM.kt @@ -3,5 +3,5 @@ package kotlin import java.util.* /** Copies all elements into a [[SortedSet]] */ -public inline fun Iterable.toSortedSet() : SortedSet = toCollection(TreeSet()) +public inline fun Iterable.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/kotlin/IterablesLazy.kt b/libraries/stdlib/src/kotlin/IterablesLazy.kt index af7763bf6a1..2650d0c7221 100644 --- a/libraries/stdlib/src/kotlin/IterablesLazy.kt +++ b/libraries/stdlib/src/kotlin/IterablesLazy.kt @@ -42,7 +42,7 @@ public inline fun Iterable.flatMap(transform: (T)-> Collection) : C * * @includeFunctionBody ../../test/CollectionTest.kt plus */ -public inline fun Iterable.plus(element: T): List { +public inline fun Iterable.plus(element: T): List { val list = toCollection(ArrayList()) list.add(element) return list @@ -54,7 +54,7 @@ public inline fun Iterable.plus(element: T): List { * * @includeFunctionBody ../../test/CollectionTest.kt plusCollection */ -public inline fun Iterable.plus(elements: Iterable): List { +public inline fun Iterable.plus(elements: Iterable): List { val list = toCollection(ArrayList()) list.addAll(elements.toCollection()) return list @@ -65,7 +65,7 @@ public inline fun Iterable.plus(elements: Iterable): List { * * @includeFunctionBody ../../test/CollectionTest.kt requireNoNulls */ -public inline fun Iterable.requireNoNulls() : List { +public inline fun Iterable.requireNoNulls() : List { val list = ArrayList() for (element in this) { if (element == null) { diff --git a/libraries/stdlib/src/kotlin/IterablesSpecial.kt b/libraries/stdlib/src/kotlin/IterablesSpecial.kt index fc1ed85728e..5d573ad44d3 100644 --- a/libraries/stdlib/src/kotlin/IterablesSpecial.kt +++ b/libraries/stdlib/src/kotlin/IterablesSpecial.kt @@ -106,13 +106,13 @@ public fun Iterable.withIndices(): List> { return answer } -public inline fun > MutableIterable.sort() : List { +public inline fun > MutableIterable.sort() : List { val list = toCollection(ArrayList()) java.util.Collections.sort(list) return list } -public inline fun Iterable.sort(comparator: java.util.Comparator) : List { +public inline fun Iterable.sort(comparator: java.util.Comparator) : List { val list = toCollection(ArrayList()) java.util.Collections.sort(list, comparator) return list diff --git a/libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt b/libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt index f4936d60f61..dfaec4be239 100644 --- a/libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt +++ b/libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt @@ -13,7 +13,7 @@ import java.util.ArrayList * * @includeFunctionBody ../../test/CollectionTest.kt sortBy */ -public inline fun > Iterable.sortBy(f: (T) -> R): List { +public inline fun > Iterable.sortBy(f: (T) -> R): List { val sortedList = toCollection(ArrayList()) val sortBy: Comparator = comparator {(x: T, y: T) -> val xr = f(x) diff --git a/libraries/stdlib/src/kotlin/Iterators.kt b/libraries/stdlib/src/kotlin/Iterators.kt index 269362aa01a..c70657584b2 100644 --- a/libraries/stdlib/src/kotlin/Iterators.kt +++ b/libraries/stdlib/src/kotlin/Iterators.kt @@ -99,7 +99,7 @@ private class FlatMapIterator(val iterator : Iterator, val transform: ( * * @includeFunctionBody ../../test/iterators/IteratorsTest.kt plus */ -public inline fun Iterator.plus(element: T): Iterator { +public inline fun Iterator.plus(element: T): Iterator { return CompositeIterator(this, SingleIterator(element)) } @@ -109,7 +109,7 @@ public inline fun Iterator.plus(element: T): Iterator { * * @includeFunctionBody ../../test/iterators/IteratorsTest.kt plusCollection */ -public inline fun Iterator.plus(iterator: Iterator): Iterator { +public inline fun Iterator.plus(iterator: Iterator): Iterator { return CompositeIterator(this, iterator) } @@ -118,7 +118,7 @@ public inline fun Iterator.plus(iterator: Iterator): Iterator { * * @includeFunctionBody ../../test/iterators/IteratorsTest.kt plusCollection */ -public inline fun Iterator.plus(collection: Iterable): Iterator = plus(collection.iterator()) +public inline fun Iterator.plus(collection: Iterable): Iterator = plus(collection.iterator()) /** * Returns an iterator containing all the non-*null* elements, lazily throwing an [[IllegalArgumentException]] @@ -126,7 +126,7 @@ public inline fun Iterator.plus(collection: Iterable): Iterator * * @includeFunctionBody ../../test/iterators/IteratorsTest.kt requireNoNulls */ -public inline fun Iterator.requireNoNulls(): Iterator { +public inline fun Iterator.requireNoNulls(): Iterator { return map{ if (it == null) throw IllegalArgumentException("null element in iterator $this") else it } diff --git a/libraries/stdlib/src/kotlin/JLangJVM.kt b/libraries/stdlib/src/kotlin/JLangJVM.kt index 15d1f642cff..41c366bff84 100644 --- a/libraries/stdlib/src/kotlin/JLangJVM.kt +++ b/libraries/stdlib/src/kotlin/JLangJVM.kt @@ -5,10 +5,10 @@ import java.lang.Object import jet.runtime.Intrinsic -public val T.javaClass : Class +public val T.javaClass : Class [Intrinsic("kotlin.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class -[Intrinsic("kotlin.javaClass.function")] fun javaClass() : Class = null as Class +[Intrinsic("kotlin.javaClass.function")] fun javaClass() : Class = null as Class /** diff --git a/libraries/stdlib/src/kotlin/JUtil.kt b/libraries/stdlib/src/kotlin/JUtil.kt index 48bf009d685..2c05dce61f6 100644 --- a/libraries/stdlib/src/kotlin/JUtil.kt +++ b/libraries/stdlib/src/kotlin/JUtil.kt @@ -36,9 +36,9 @@ public inline fun Collection?.orEmpty() : Collection /** TODO these functions don't work when they generate the Array versions when they are in JLIterables */ -public inline fun > Iterable.toSortedList() : List = toCollection(ArrayList()).sort() +public inline fun > Iterable.toSortedList() : List = toCollection(ArrayList()).sort() -public inline fun > Iterable.toSortedList(comparator: java.util.Comparator) : List = toList().sort(comparator) +public inline fun > Iterable.toSortedList(comparator: java.util.Comparator) : List = toList().sort(comparator) // List APIs