From 58b65360b15b2f14cbcfc0ab3d8ecada5843b87e Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 4 May 2012 17:58:15 +0400 Subject: [PATCH 1/2] List replaced with Collection in JLangIterables where it is possible --- libraries/stdlib/src/kotlin/JLangIterables.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/src/kotlin/JLangIterables.kt b/libraries/stdlib/src/kotlin/JLangIterables.kt index cee9694517d..c1c456245ea 100644 --- a/libraries/stdlib/src/kotlin/JLangIterables.kt +++ b/libraries/stdlib/src/kotlin/JLangIterables.kt @@ -80,7 +80,7 @@ public inline fun > java.lang.Iterable.filterTo(result * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > java.lang.Iterable.filterNotTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > java.lang.Iterable.filterNotTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -90,7 +90,7 @@ public inline fun > java.lang.Iterable.filterNotTo(result: L * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > java.lang.Iterable?.filterNotNullTo(result: L) : L { +public inline fun > java.lang.Iterable?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -173,7 +173,7 @@ public inline fun java.lang.Iterable.makeString(separator: String = ", ", } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > java.lang.Iterable.takeWhileTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > java.lang.Iterable.takeWhileTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } From 88e05e43d33819dca6db5688e07ce068639166ae Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 4 May 2012 22:12:12 +0400 Subject: [PATCH 2/2] List replaced with Collection in generated from JLangIterables code. --- libraries/stdlib/src/generated/ArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/BooleanArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/ByteArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/CharArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/DoubleArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/FloatArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/IntArraysFromJLangIterables.kt | 6 +++--- .../src/generated/JUtilIteratorsFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/LongArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/ShortArraysFromJLangIterables.kt | 6 +++--- .../stdlib/src/generated/StandardFromJLangIterables.kt | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt index 2d370e35619..33a65845f86 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > Array.filterTo(result: C, predicat * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > Array.filterNotTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > Array.filterNotTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > Array.filterNotTo(result: L, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > Array?.filterNotNullTo(result: L) : L { +public inline fun > Array?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun Array.makeString(separator: String = ", ", prefix: Stri } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > Array.takeWhileTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > Array.takeWhileTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt index 5a602b2773e..9a74504ac56 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > BooleanArray.filterTo(result: C, pred * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > BooleanArray.filterNotTo(result: L, predicate: (Boolean) -> Boolean) : L { +public inline fun > BooleanArray.filterNotTo(result: C, predicate: (Boolean) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > BooleanArray.filterNotTo(result: L, predica * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > BooleanArray?.filterNotNullTo(result: L) : L { +public inline fun > BooleanArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun BooleanArray.makeString(separator: String = ", ", prefix: Stri } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > BooleanArray.takeWhileTo(result: L, predicate: (Boolean) -> Boolean) : L { +public inline fun > BooleanArray.takeWhileTo(result: C, predicate: (Boolean) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt index 3188a83b549..752faa7a646 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > ByteArray.filterTo(result: C, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > ByteArray.filterNotTo(result: L, predicate: (Byte) -> Boolean) : L { +public inline fun > ByteArray.filterNotTo(result: C, predicate: (Byte) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > ByteArray.filterNotTo(result: L, predicate: (B * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > ByteArray?.filterNotNullTo(result: L) : L { +public inline fun > ByteArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun ByteArray.makeString(separator: String = ", ", prefix: String } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > ByteArray.takeWhileTo(result: L, predicate: (Byte) -> Boolean) : L { +public inline fun > ByteArray.takeWhileTo(result: C, predicate: (Byte) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt index 1206ff7c23b..dd17f78aa42 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > CharArray.filterTo(result: C, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > CharArray.filterNotTo(result: L, predicate: (Char) -> Boolean) : L { +public inline fun > CharArray.filterNotTo(result: C, predicate: (Char) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > CharArray.filterNotTo(result: L, predicate: (C * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > CharArray?.filterNotNullTo(result: L) : L { +public inline fun > CharArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun CharArray.makeString(separator: String = ", ", prefix: String } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > CharArray.takeWhileTo(result: L, predicate: (Char) -> Boolean) : L { +public inline fun > CharArray.takeWhileTo(result: C, predicate: (Char) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt index dd7ace59644..f508219bcae 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > DoubleArray.filterTo(result: C, predic * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > DoubleArray.filterNotTo(result: L, predicate: (Double) -> Boolean) : L { +public inline fun > DoubleArray.filterNotTo(result: C, predicate: (Double) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > DoubleArray.filterNotTo(result: L, predicate * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > DoubleArray?.filterNotNullTo(result: L) : L { +public inline fun > DoubleArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun DoubleArray.makeString(separator: String = ", ", prefix: Strin } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > DoubleArray.takeWhileTo(result: L, predicate: (Double) -> Boolean) : L { +public inline fun > DoubleArray.takeWhileTo(result: C, predicate: (Double) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt index faa3b25d640..46cc245e465 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > FloatArray.filterTo(result: C, predicat * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > FloatArray.filterNotTo(result: L, predicate: (Float) -> Boolean) : L { +public inline fun > FloatArray.filterNotTo(result: C, predicate: (Float) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > FloatArray.filterNotTo(result: L, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > FloatArray?.filterNotNullTo(result: L) : L { +public inline fun > FloatArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun FloatArray.makeString(separator: String = ", ", prefix: String } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > FloatArray.takeWhileTo(result: L, predicate: (Float) -> Boolean) : L { +public inline fun > FloatArray.takeWhileTo(result: C, predicate: (Float) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt index c971a10989a..335f6ac585b 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > IntArray.filterTo(result: C, predicate: ( * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > IntArray.filterNotTo(result: L, predicate: (Int) -> Boolean) : L { +public inline fun > IntArray.filterNotTo(result: C, predicate: (Int) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > IntArray.filterNotTo(result: L, predicate: (Int * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > IntArray?.filterNotNullTo(result: L) : L { +public inline fun > IntArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun IntArray.makeString(separator: String = ", ", prefix: String = } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > IntArray.takeWhileTo(result: L, predicate: (Int) -> Boolean) : L { +public inline fun > IntArray.takeWhileTo(result: C, predicate: (Int) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt index 3e3b1c39591..c3bf3ae6354 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt @@ -81,7 +81,7 @@ public inline fun > java.util.Iterator.filterTo(result * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > java.util.Iterator.filterNotTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > java.util.Iterator.filterNotTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -91,7 +91,7 @@ public inline fun > java.util.Iterator.filterNotTo(result: L * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > java.util.Iterator?.filterNotNullTo(result: L) : L { +public inline fun > java.util.Iterator?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -174,7 +174,7 @@ public inline fun java.util.Iterator.makeString(separator: String = ", ", } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > java.util.Iterator.takeWhileTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > java.util.Iterator.takeWhileTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt index 42f24d0fcf0..59cade200fc 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > LongArray.filterTo(result: C, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > LongArray.filterNotTo(result: L, predicate: (Long) -> Boolean) : L { +public inline fun > LongArray.filterNotTo(result: C, predicate: (Long) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > LongArray.filterNotTo(result: L, predicate: (L * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > LongArray?.filterNotNullTo(result: L) : L { +public inline fun > LongArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun LongArray.makeString(separator: String = ", ", prefix: String } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > LongArray.takeWhileTo(result: L, predicate: (Long) -> Boolean) : L { +public inline fun > LongArray.takeWhileTo(result: C, predicate: (Long) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt index da763e49581..96685f7ca39 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > ShortArray.filterTo(result: C, predicat * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > ShortArray.filterNotTo(result: L, predicate: (Short) -> Boolean) : L { +public inline fun > ShortArray.filterNotTo(result: C, predicate: (Short) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > ShortArray.filterNotTo(result: L, predicate: * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > ShortArray?.filterNotNullTo(result: L) : L { +public inline fun > ShortArray?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun ShortArray.makeString(separator: String = ", ", prefix: String } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > ShortArray.takeWhileTo(result: L, predicate: (Short) -> Boolean) : L { +public inline fun > ShortArray.takeWhileTo(result: C, predicate: (Short) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result } diff --git a/libraries/stdlib/src/generated/StandardFromJLangIterables.kt b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt index e9684b9457e..cb3a02d9236 100644 --- a/libraries/stdlib/src/generated/StandardFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt @@ -83,7 +83,7 @@ public inline fun > Iterable.filterTo(result: C, predi * * @includeFunctionBody ../../test/CollectionTest.kt filterNotIntoLinkedList */ -public inline fun > Iterable.filterNotTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > Iterable.filterNotTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (!predicate(element)) result.add(element) return result } @@ -93,7 +93,7 @@ public inline fun > Iterable.filterNotTo(result: L, predicat * * @includeFunctionBody ../../test/CollectionTest.kt filterNotNullIntoLinkedList */ -public inline fun > Iterable?.filterNotNullTo(result: L) : L { +public inline fun > Iterable?.filterNotNullTo(result: C) : C { if (this != null) { for (element in this) if (element != null) result.add(element) } @@ -176,7 +176,7 @@ public inline fun Iterable.makeString(separator: String = ", ", prefix: S } /** Returns a list containing the first elements that satisfy the given *predicate* */ -public inline fun > Iterable.takeWhileTo(result: L, predicate: (T) -> Boolean) : L { +public inline fun > Iterable.takeWhileTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break return result }