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

Optimize operations to return special collection implementations when result is empty or has single element.

Browse Source 
#KT-9990
This commit is contained in:
Ilya Gorbunov
2016-04-22 20:51:44 +03:00
parent 2d12ed68c8
commit a665b2183c
4 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Arrays.kt
+36 -36
View File
@@ -2526,7 +2526,7 @@ public fun <T> Array<out T>.drop(n: Int): List<T> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2542,7 +2542,7 @@ public fun ByteArray.drop(n: Int): List<Byte> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2558,7 +2558,7 @@ public fun ShortArray.drop(n: Int): List<Short> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2574,7 +2574,7 @@ public fun IntArray.drop(n: Int): List<Int> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2590,7 +2590,7 @@ public fun LongArray.drop(n: Int): List<Long> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2606,7 +2606,7 @@ public fun FloatArray.drop(n: Int): List<Float> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2622,7 +2622,7 @@ public fun DoubleArray.drop(n: Int): List<Double> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2638,7 +2638,7 @@ public fun BooleanArray.drop(n: Int): List<Boolean> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -2654,7 +2654,7 @@ public fun CharArray.drop(n: Int): List<Char> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3547,7 +3547,7 @@ public fun CharArray.slice(indices: IntRange): List<Char> {
*/ */
public fun <T> Array<out T>.slice(indices: Iterable<Int>): List<T> { public fun <T> Array<out T>.slice(indices: Iterable<Int>): List<T> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<T>(size) val list = ArrayList<T>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3560,7 +3560,7 @@ public fun <T> Array<out T>.slice(indices: Iterable<Int>): List<T> {
*/ */
public fun ByteArray.slice(indices: Iterable<Int>): List<Byte> { public fun ByteArray.slice(indices: Iterable<Int>): List<Byte> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Byte>(size) val list = ArrayList<Byte>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3573,7 +3573,7 @@ public fun ByteArray.slice(indices: Iterable<Int>): List<Byte> {
*/ */
public fun ShortArray.slice(indices: Iterable<Int>): List<Short> { public fun ShortArray.slice(indices: Iterable<Int>): List<Short> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Short>(size) val list = ArrayList<Short>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3586,7 +3586,7 @@ public fun ShortArray.slice(indices: Iterable<Int>): List<Short> {
*/ */
public fun IntArray.slice(indices: Iterable<Int>): List<Int> { public fun IntArray.slice(indices: Iterable<Int>): List<Int> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Int>(size) val list = ArrayList<Int>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3599,7 +3599,7 @@ public fun IntArray.slice(indices: Iterable<Int>): List<Int> {
*/ */
public fun LongArray.slice(indices: Iterable<Int>): List<Long> { public fun LongArray.slice(indices: Iterable<Int>): List<Long> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Long>(size) val list = ArrayList<Long>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3612,7 +3612,7 @@ public fun LongArray.slice(indices: Iterable<Int>): List<Long> {
*/ */
public fun FloatArray.slice(indices: Iterable<Int>): List<Float> { public fun FloatArray.slice(indices: Iterable<Int>): List<Float> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Float>(size) val list = ArrayList<Float>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3625,7 +3625,7 @@ public fun FloatArray.slice(indices: Iterable<Int>): List<Float> {
*/ */
public fun DoubleArray.slice(indices: Iterable<Int>): List<Double> { public fun DoubleArray.slice(indices: Iterable<Int>): List<Double> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Double>(size) val list = ArrayList<Double>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3638,7 +3638,7 @@ public fun DoubleArray.slice(indices: Iterable<Int>): List<Double> {
*/ */
public fun BooleanArray.slice(indices: Iterable<Int>): List<Boolean> { public fun BooleanArray.slice(indices: Iterable<Int>): List<Boolean> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Boolean>(size) val list = ArrayList<Boolean>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3651,7 +3651,7 @@ public fun BooleanArray.slice(indices: Iterable<Int>): List<Boolean> {
*/ */
public fun CharArray.slice(indices: Iterable<Int>): List<Char> { public fun CharArray.slice(indices: Iterable<Int>): List<Char> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<Char>(size) val list = ArrayList<Char>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -3853,7 +3853,7 @@ public fun <T> Array<out T>.take(n: Int): List<T> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3870,7 +3870,7 @@ public fun ByteArray.take(n: Int): List<Byte> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3887,7 +3887,7 @@ public fun ShortArray.take(n: Int): List<Short> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3904,7 +3904,7 @@ public fun IntArray.take(n: Int): List<Int> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3921,7 +3921,7 @@ public fun LongArray.take(n: Int): List<Long> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3938,7 +3938,7 @@ public fun FloatArray.take(n: Int): List<Float> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3955,7 +3955,7 @@ public fun DoubleArray.take(n: Int): List<Double> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3972,7 +3972,7 @@ public fun BooleanArray.take(n: Int): List<Boolean> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -3989,7 +3989,7 @@ public fun CharArray.take(n: Int): List<Char> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4003,7 +4003,7 @@ public fun <T> Array<out T>.takeLast(n: Int): List<T> {
val list = ArrayList<T>(n) val list = ArrayList<T>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4017,7 +4017,7 @@ public fun ByteArray.takeLast(n: Int): List<Byte> {
val list = ArrayList<Byte>(n) val list = ArrayList<Byte>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4031,7 +4031,7 @@ public fun ShortArray.takeLast(n: Int): List<Short> {
val list = ArrayList<Short>(n) val list = ArrayList<Short>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4045,7 +4045,7 @@ public fun IntArray.takeLast(n: Int): List<Int> {
val list = ArrayList<Int>(n) val list = ArrayList<Int>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4059,7 +4059,7 @@ public fun LongArray.takeLast(n: Int): List<Long> {
val list = ArrayList<Long>(n) val list = ArrayList<Long>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4073,7 +4073,7 @@ public fun FloatArray.takeLast(n: Int): List<Float> {
val list = ArrayList<Float>(n) val list = ArrayList<Float>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4087,7 +4087,7 @@ public fun DoubleArray.takeLast(n: Int): List<Double> {
val list = ArrayList<Double>(n) val list = ArrayList<Double>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4101,7 +4101,7 @@ public fun BooleanArray.takeLast(n: Int): List<Boolean> {
val list = ArrayList<Boolean>(n) val list = ArrayList<Boolean>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -4115,7 +4115,7 @@ public fun CharArray.takeLast(n: Int): List<Char> {
val list = ArrayList<Char>(n) val list = ArrayList<Char>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
} }
/** /**
libraries/stdlib/src/generated/_Collections.kt
+8 -8
View File
@@ -553,7 +553,7 @@ public fun <T> Iterable<T>.drop(n: Int): List<T> {
for (item in listIterator(n)) for (item in listIterator(n))
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
} }
else { else {
@@ -563,7 +563,7 @@ public fun <T> Iterable<T>.drop(n: Int): List<T> {
for (item in this) { for (item in this) {
if (count++ >= n) list.add(item) if (count++ >= n) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -699,7 +699,7 @@ public fun <T> List<T>.slice(indices: IntRange): List<T> {
*/ */
public fun <T> List<T>.slice(indices: Iterable<Int>): List<T> { public fun <T> List<T>.slice(indices: Iterable<Int>): List<T> {
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<T>(size) val list = ArrayList<T>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
@@ -721,7 +721,7 @@ public fun <T> Iterable<T>.take(n: Int): List<T> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -740,7 +740,7 @@ public fun <T> List<T>.takeLast(n: Int): List<T> {
for (item in listIterator(n)) for (item in listIterator(n))
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
/** /**
@@ -788,7 +788,7 @@ public fun <T> MutableList<T>.reverse(): Unit {
* Returns a list with elements in reversed order. * Returns a list with elements in reversed order.
*/ */
public fun <T> Iterable<T>.reversed(): List<T> { public fun <T> Iterable<T>.reversed(): List<T> {
if (this is Collection && isEmpty()) return emptyList() if (this is Collection && size <= 1) return toList()
val list = toMutableList() val list = toMutableList()
Collections.reverse(list) Collections.reverse(list)
return list return list
@@ -820,7 +820,7 @@ public fun <T : Comparable<T>> MutableList<T>.sortDescending(): Unit {
*/ */
public fun <T : Comparable<T>> Iterable<T>.sorted(): List<T> { public fun <T : Comparable<T>> Iterable<T>.sorted(): List<T> {
if (this is Collection) { if (this is Collection) {
if (size <= 1) return this.toMutableList() if (size <= 1) return this.toList()
@Suppress("CAST_NEVER_SUCCEEDS") @Suppress("CAST_NEVER_SUCCEEDS")
return (toTypedArray<Comparable<T>>() as Array<T>).apply { sort() }.asList() return (toTypedArray<Comparable<T>>() as Array<T>).apply { sort() }.asList()
} }
@@ -853,7 +853,7 @@ public fun <T : Comparable<T>> Iterable<T>.sortedDescending(): List<T> {
*/ */
public fun <T> Iterable<T>.sortedWith(comparator: Comparator<in T>): List<T> { public fun <T> Iterable<T>.sortedWith(comparator: Comparator<in T>): List<T> {
if (this is Collection) { if (this is Collection) {
if (size <= 1) return this.toMutableList() if (size <= 1) return this.toList()
@Suppress("CAST_NEVER_SUCCEEDS") @Suppress("CAST_NEVER_SUCCEEDS")
return (toTypedArray<Any?>() as Array<T>).apply { sortWith(comparator) }.asList() return (toTypedArray<Any?>() as Array<T>).apply { sortWith(comparator) }.asList()
} }
libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt
+8 -8
View File
@@ -56,7 +56,7 @@ fun filtering(): List<GenericFunction> {
for (item in listIterator(n)) for (item in listIterator(n))
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
} }
} }
else { else {
@@ -66,7 +66,7 @@ fun filtering(): List<GenericFunction> {
for (item in this) { for (item in this) {
if (count++ >= n) list.add(item) if (count++ >= n) list.add(item)
} }
return list return list.optimizeReadOnlyList()
""" """
} }
@@ -105,7 +105,7 @@ fun filtering(): List<GenericFunction> {
for (index in n..size - 1) { for (index in n..size - 1) {
list.add(this[index]) list.add(this[index])
} }
return list return list.optimizeReadOnlyList()
""" """
} }
} }
@@ -126,7 +126,7 @@ fun filtering(): List<GenericFunction> {
break break
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
""" """
} }
@@ -165,7 +165,7 @@ fun filtering(): List<GenericFunction> {
break; break;
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
""" """
} }
} }
@@ -215,7 +215,7 @@ fun filtering(): List<GenericFunction> {
val list = ArrayList<T>(n) val list = ArrayList<T>(n)
for (index in size - n .. size - 1) for (index in size - n .. size - 1)
list.add(this[index]) list.add(this[index])
return list return list.optimizeReadOnlyList()
""" """
} }
body(Lists) { body(Lists) {
@@ -232,7 +232,7 @@ fun filtering(): List<GenericFunction> {
for (item in listIterator(n)) for (item in listIterator(n))
list.add(item) list.add(item)
} }
return list return list.optimizeReadOnlyList()
""" """
} }
} }
@@ -663,7 +663,7 @@ fun filtering(): List<GenericFunction> {
body { body {
""" """
val size = indices.collectionSizeOrDefault(10) val size = indices.collectionSizeOrDefault(10)
if (size == 0) return listOf() if (size == 0) return emptyList()
val list = ArrayList<T>(size) val list = ArrayList<T>(size)
for (index in indices) { for (index in indices) {
list.add(get(index)) list.add(get(index))
libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt
+3 -3
View File
@@ -31,7 +31,7 @@ fun ordering(): List<GenericFunction> {
returns { "List<T>" } returns { "List<T>" }
body { body {
""" """
if (this is Collection && isEmpty()) return emptyList() if (this is Collection && size <= 1) return toList()
val list = toMutableList() val list = toMutableList()
Collections.reverse(list) Collections.reverse(list)
return list return list
@@ -101,7 +101,7 @@ fun ordering(): List<GenericFunction> {
body { body {
""" """
if (this is Collection) { if (this is Collection) {
if (size <= 1) return this.toMutableList() if (size <= 1) return this.toList()
@Suppress("CAST_NEVER_SUCCEEDS") @Suppress("CAST_NEVER_SUCCEEDS")
return (toTypedArray<Comparable<T>>() as Array<T>).apply { sort() }.asList() return (toTypedArray<Comparable<T>>() as Array<T>).apply { sort() }.asList()
} }
@@ -231,7 +231,7 @@ fun ordering(): List<GenericFunction> {
body { body {
""" """
if (this is Collection) { if (this is Collection) {
if (size <= 1) return this.toMutableList() if (size <= 1) return this.toList()
@Suppress("CAST_NEVER_SUCCEEDS") @Suppress("CAST_NEVER_SUCCEEDS")
return (toTypedArray<Any?>() as Array<T>).apply { sortWith(comparator) }.asList() return (toTypedArray<Any?>() as Array<T>).apply { sortWith(comparator) }.asList()
} }