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

Fixed #KT-6476. last(predicate) and lastOrNull(predicate) use reverse iteration when possible.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-03-27 15:11:18 +03:00
committed by Ilya Gorbunov
parent d81895df77
commit f87dcff723
2 changed files with 159 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Elements.kt
+103 -139
View File
@@ -1788,16 +1788,11 @@ public fun String.last(): Char {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun <T> Array<out T>.last(predicate: (T) -> Boolean): T { public inline fun <T> Array<out T>.last(predicate: (T) -> Boolean): T {
var last: T? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T
} }
/** /**
@@ -1805,16 +1800,11 @@ public inline fun <T> Array<out T>.last(predicate: (T) -> Boolean): T {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun BooleanArray.last(predicate: (Boolean) -> Boolean): Boolean { public inline fun BooleanArray.last(predicate: (Boolean) -> Boolean): Boolean {
var last: Boolean? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Boolean
} }
/** /**
@@ -1822,16 +1812,11 @@ public inline fun BooleanArray.last(predicate: (Boolean) -> Boolean): Boolean {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun ByteArray.last(predicate: (Byte) -> Boolean): Byte { public inline fun ByteArray.last(predicate: (Byte) -> Boolean): Byte {
var last: Byte? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Byte
} }
/** /**
@@ -1839,16 +1824,11 @@ public inline fun ByteArray.last(predicate: (Byte) -> Boolean): Byte {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun CharArray.last(predicate: (Char) -> Boolean): Char { public inline fun CharArray.last(predicate: (Char) -> Boolean): Char {
var last: Char? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Char
} }
/** /**
@@ -1856,16 +1836,11 @@ public inline fun CharArray.last(predicate: (Char) -> Boolean): Char {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun DoubleArray.last(predicate: (Double) -> Boolean): Double { public inline fun DoubleArray.last(predicate: (Double) -> Boolean): Double {
var last: Double? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Double
} }
/** /**
@@ -1873,16 +1848,11 @@ public inline fun DoubleArray.last(predicate: (Double) -> Boolean): Double {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun FloatArray.last(predicate: (Float) -> Boolean): Float { public inline fun FloatArray.last(predicate: (Float) -> Boolean): Float {
var last: Float? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Float
} }
/** /**
@@ -1890,16 +1860,11 @@ public inline fun FloatArray.last(predicate: (Float) -> Boolean): Float {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun IntArray.last(predicate: (Int) -> Boolean): Int { public inline fun IntArray.last(predicate: (Int) -> Boolean): Int {
var last: Int? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Int
} }
/** /**
@@ -1907,16 +1872,11 @@ public inline fun IntArray.last(predicate: (Int) -> Boolean): Int {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun LongArray.last(predicate: (Long) -> Boolean): Long { public inline fun LongArray.last(predicate: (Long) -> Boolean): Long {
var last: Long? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Long
} }
/** /**
@@ -1924,16 +1884,11 @@ public inline fun LongArray.last(predicate: (Long) -> Boolean): Long {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun ShortArray.last(predicate: (Short) -> Boolean): Short { public inline fun ShortArray.last(predicate: (Short) -> Boolean): Short {
var last: Short? = null for (index in this.indices.reversed()) {
var found = false val element = this[index]
for (element in this) { if (predicate(element)) return element
if (predicate(element)) {
last = element
found = true
}
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Short
} }
/** /**
@@ -1941,6 +1896,8 @@ public inline fun ShortArray.last(predicate: (Short) -> Boolean): Short {
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
*/ */
public inline fun <T> Iterable<T>.last(predicate: (T) -> Boolean): T { public inline fun <T> Iterable<T>.last(predicate: (T) -> Boolean): T {
if (this is List<T>)
return this.last(predicate)
var last: T? = null var last: T? = null
var found = false var found = false
for (element in this) { for (element in this) {
@@ -1949,10 +1906,22 @@ public inline fun <T> Iterable<T>.last(predicate: (T) -> Boolean): T {
found = true found = true
} }
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T return last as T
} }
/**
* Returns the last element matching the given [predicate].
* @throws NoSuchElementException if no such element is found.
*/
public inline fun <T> List<T>.last(predicate: (T) -> Boolean): T {
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
}
/** /**
* Returns the last element matching the given [predicate]. * Returns the last element matching the given [predicate].
* @throws NoSuchElementException if no such element is found. * @throws NoSuchElementException if no such element is found.
@@ -1966,7 +1935,7 @@ public inline fun <T> Sequence<T>.last(predicate: (T) -> Boolean): T {
found = true found = true
} }
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T return last as T
} }
@@ -1985,7 +1954,7 @@ public inline fun <T> Stream<T>.last(predicate: (T) -> Boolean): T {
found = true found = true
} }
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T return last as T
} }
@@ -2002,7 +1971,7 @@ public inline fun String.last(predicate: (Char) -> Boolean): Char {
found = true found = true
} }
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Char return last as Char
} }
@@ -2293,123 +2262,107 @@ public fun String.lastOrNull(): Char? {
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun <T> Array<out T>.lastOrNull(predicate: (T) -> Boolean): T? { public inline fun <T> Array<out T>.lastOrNull(predicate: (T) -> Boolean): T? {
var last: T? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun BooleanArray.lastOrNull(predicate: (Boolean) -> Boolean): Boolean? { public inline fun BooleanArray.lastOrNull(predicate: (Boolean) -> Boolean): Boolean? {
var last: Boolean? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun ByteArray.lastOrNull(predicate: (Byte) -> Boolean): Byte? { public inline fun ByteArray.lastOrNull(predicate: (Byte) -> Boolean): Byte? {
var last: Byte? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun CharArray.lastOrNull(predicate: (Char) -> Boolean): Char? { public inline fun CharArray.lastOrNull(predicate: (Char) -> Boolean): Char? {
var last: Char? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun DoubleArray.lastOrNull(predicate: (Double) -> Boolean): Double? { public inline fun DoubleArray.lastOrNull(predicate: (Double) -> Boolean): Double? {
var last: Double? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun FloatArray.lastOrNull(predicate: (Float) -> Boolean): Float? { public inline fun FloatArray.lastOrNull(predicate: (Float) -> Boolean): Float? {
var last: Float? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun IntArray.lastOrNull(predicate: (Int) -> Boolean): Int? { public inline fun IntArray.lastOrNull(predicate: (Int) -> Boolean): Int? {
var last: Int? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun LongArray.lastOrNull(predicate: (Long) -> Boolean): Long? { public inline fun LongArray.lastOrNull(predicate: (Long) -> Boolean): Long? {
var last: Long? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun ShortArray.lastOrNull(predicate: (Short) -> Boolean): Short? { public inline fun ShortArray.lastOrNull(predicate: (Short) -> Boolean): Short? {
var last: Short? = null for (index in this.indices.reversed()) {
for (element in this) { val element = this[index]
if (predicate(element)) { if (predicate(element)) return element
last = element
}
} }
return last return null
} }
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
public inline fun <T> Iterable<T>.lastOrNull(predicate: (T) -> Boolean): T? { public inline fun <T> Iterable<T>.lastOrNull(predicate: (T) -> Boolean): T? {
if (this is List<T>)
return this.lastOrNull(predicate)
var last: T? = null var last: T? = null
for (element in this) { for (element in this) {
if (predicate(element)) { if (predicate(element)) {
@@ -2419,6 +2372,17 @@ public inline fun <T> Iterable<T>.lastOrNull(predicate: (T) -> Boolean): T? {
return last return last
} }
/**
* Returns the last element matching the given [predicate], or `null` if no such element was found.
*/
public inline fun <T> List<T>.lastOrNull(predicate: (T) -> Boolean): T? {
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
return null
}
/** /**
* Returns the last element matching the given [predicate], or `null` if no such element was found. * Returns the last element matching the given [predicate], or `null` if no such element was found.
*/ */
libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+56 -1
View File
@@ -411,10 +411,38 @@ fun elements(): List<GenericFunction> {
found = true found = true
} }
} }
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching predicate") if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T return last as T
""" """
} }
body(Iterables) {
"""
if (this is List<T>)
return this.last(predicate)
var last: T? = null
var found = false
for (element in this) {
if (predicate(element)) {
last = element
found = true
}
}
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as T
"""
}
body(ArraysOfPrimitives, ArraysOfObjects, Lists) {
"""
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
"""
}
} }
templates add f("lastOrNull(predicate: (T) -> Boolean)") { templates add f("lastOrNull(predicate: (T) -> Boolean)") {
@@ -433,6 +461,33 @@ fun elements(): List<GenericFunction> {
return last return last
""" """
} }
body(Iterables) {
"""
if (this is List<T>)
return this.lastOrNull(predicate)
var last: T? = null
for (element in this) {
if (predicate(element)) {
last = element
}
}
return last
"""
}
body(ArraysOfPrimitives, ArraysOfObjects, Lists) {
"""
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
return null
"""
}
} }
templates add f("single()") { templates add f("single()") {