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

Use reverse indexed iteration in last and lastOrNull with predicate for CharSequences and Strings.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-28 21:55:51 +03:00
parent 8c16fad8b1
commit 0dd7e398c7
2 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Strings.kt
+16 -30
View File
@@ -265,16 +265,11 @@ public fun String.last(): Char {
* @throws [NoSuchElementException] if no such character is found.
*/
public inline fun CharSequence.last(predicate: (Char) -> Boolean): Char {
var last: Char? = null
var found = false
for (element in this) {
if (predicate(element)) {
last = element
found = true
}
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Char
throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
}
/**
@@ -283,16 +278,11 @@ public inline fun CharSequence.last(predicate: (Char) -> Boolean): Char {
*/
@Deprecated("Provided for binary compatibility", level = DeprecationLevel.HIDDEN)
public inline fun String.last(predicate: (Char) -> Boolean): Char {
var last: Char? = null
var found = false
for (element in this) {
if (predicate(element)) {
last = element
found = true
}
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
if (!found) throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
return last as Char
throw NoSuchElementException("Collection doesn't contain any element matching the predicate.")
}
/**
@@ -314,13 +304,11 @@ public fun String.lastOrNull(): Char? {
* Returns the last character matching the given [predicate], or `null` if no such character was found.
*/
public inline fun CharSequence.lastOrNull(predicate: (Char) -> Boolean): Char? {
var last: Char? = null
for (element in this) {
if (predicate(element)) {
last = element
}
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
return last
return null
}
/**
@@ -328,13 +316,11 @@ public inline fun CharSequence.lastOrNull(predicate: (Char) -> Boolean): Char? {
*/
@Deprecated("Provided for binary compatibility", level = DeprecationLevel.HIDDEN)
public inline fun String.lastOrNull(predicate: (Char) -> Boolean): Char? {
var last: Char? = null
for (element in this) {
if (predicate(element)) {
last = element
}
for (index in this.indices.reversed()) {
val element = this[index]
if (predicate(element)) return element
}
return last
return null
}
/**
libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+2 -2
View File
@@ -643,7 +643,7 @@ fun elements(): List<GenericFunction> {
"""
}
body(ArraysOfPrimitives, ArraysOfObjects, Lists) {
body(CharSequences, Strings, ArraysOfPrimitives, ArraysOfObjects, Lists) {
"""
for (index in this.indices.reversed()) {
val element = this[index]
@@ -678,7 +678,7 @@ fun elements(): List<GenericFunction> {
"""
}
body(ArraysOfPrimitives, ArraysOfObjects, Lists) {
body(CharSequences, Strings, ArraysOfPrimitives, ArraysOfObjects, Lists) {
"""
for (index in this.indices.reversed()) {
val element = this[index]