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

Optimize selection functions, add guard checks.

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-04-08 15:38:50 +04:00
committed by Andrey Breslav
parent a3ad79e5d9
commit d9d5631a16
2 changed files with 658 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Elements.kt
+576 -553
View File
File diff suppressed because it is too large Load Diff
libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+82 -57
View File
@@ -9,7 +9,17 @@ fun elements(): List<GenericFunction> {
doc { "Returns true if *element* is found in the collection" }
returns("Boolean")
body {
"return indexOf(element) >= 0"
"""
if (this is Collection<*>)
return contains(element)
return indexOf(element) >= 0
"""
}
exclude(Lists, Collections)
body(ArraysOfPrimitives, ArraysOfObjects) {
"""
return indexOf(element) >= 0
"""
}
}
@@ -74,7 +84,6 @@ fun elements(): List<GenericFunction> {
"""
}
include(Lists)
body(Lists, ArraysOfObjects) {
"""
if (element == null) {
@@ -146,14 +155,26 @@ fun elements(): List<GenericFunction> {
returns("T")
body {
"""
val iterator = iterator()
if (!iterator.hasNext())
throw IllegalArgumentException("Collection is empty")
return iterator.next()
when (this) {
is List<*> -> {
if (size == 0)
throw IllegalArgumentException("Collection is empty")
else
return this[0] as T
}
else -> {
val iterator = iterator()
if (!iterator.hasNext())
throw IllegalArgumentException("Collection is empty")
return iterator.next()
}
}
"""
}
body(Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (size == 0)
throw IllegalArgumentException("Collection is empty")
return this[0]
"""
}
@@ -163,10 +184,20 @@ fun elements(): List<GenericFunction> {
returns("T?")
body {
"""
val iterator = iterator()
if (!iterator.hasNext())
return null
return iterator.next()
when (this) {
is List<*> -> {
if (size == 0)
return null
else
return this[0] as T
}
else -> {
val iterator = iterator()
if (!iterator.hasNext())
return null
return iterator.next()
}
}
"""
}
body(Lists, ArraysOfObjects, ArraysOfPrimitives) {
@@ -208,7 +239,10 @@ fun elements(): List<GenericFunction> {
body {
"""
when (this) {
is List<*> -> return this[size - 1] as T
is List<*> -> if (size == 0)
throw IllegalArgumentException("Collection is empty")
else
return this[size - 1] as T
else -> {
val iterator = iterator()
if (!iterator.hasNext())
@@ -258,43 +292,36 @@ fun elements(): List<GenericFunction> {
}
templates add f("last(predicate: (T) -> Boolean)") {
inline(true)
doc { "Returns last element matching the given *predicate*" }
returns("T")
body {
"""
fun first(it : Iterator<T>) : T {
for (element in it) if (predicate(element)) return element
throw IllegalArgumentException("Collection doesn't contain any element matching predicate")
}
val iterator = iterator()
var last = first(iterator)
while (iterator.hasNext()) {
val element = iterator.next()
if (predicate(element))
var last: T? = null
var found = false
for (element in this) {
if (predicate(element)) {
last = element
found = true
}
}
return last
if (!found) throw IllegalArgumentException("Collection doesn't contain any element matching predicate")
return last as T
"""
}
}
templates add f("lastOrNull(predicate: (T) -> Boolean)") {
inline(true)
doc { "Returns last element matching the given *predicate*, or null if element was not found" }
returns("T?")
body {
"""
fun first(it : Iterator<T>) : T? {
for (element in it) if (predicate(element)) return element
return null
}
val iterator = iterator()
var last = first(iterator)
if (last == null)
return null
while (iterator.hasNext()) {
val element = iterator.next()
if (predicate(element))
var last: T? = null
for (element in this) {
if (predicate(element)) {
last = element
}
}
return last
"""
@@ -321,7 +348,7 @@ fun elements(): List<GenericFunction> {
}
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (size != 1)
throw IllegalArgumentException("Collection has ${bucks}size elements")
@@ -349,7 +376,7 @@ fun elements(): List<GenericFunction> {
}
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (size == 0)
return null
@@ -361,44 +388,42 @@ fun elements(): List<GenericFunction> {
}
templates add f("single(predicate: (T) -> Boolean)") {
inline(true)
doc { "Returns single element matching the given *predicate*, or throws exception if there is no or more than one element" }
returns("T")
body {
"""
fun first(it : Iterator<T>) : T {
for (element in it) if (predicate(element)) return element
throw IllegalArgumentException("Collection doesn't have matching element")
var single: T? = null
var found = false
for (element in this) {
if (predicate(element)) {
if (found) throw IllegalArgumentException("Collection contains more than one matching element")
single = element
found = true
}
}
val iterator = iterator()
var single = first(iterator)
while (iterator.hasNext()) {
val element = iterator.next()
if (predicate(element))
throw IllegalArgumentException("Collection has more than one matching element")
}
return single
if (!found) throw IllegalArgumentException("Collection doesn't contain any element matching predicate")
return single as T
"""
}
}
templates add f("singleOrNull(predicate: (T) -> Boolean)") {
inline(true)
doc { "Returns single element matching the given *predicate*, or null if element was not found or more than one elements were found" }
returns("T?")
body {
"""
fun first(it : Iterator<T>) : T? {
for (element in it) if (predicate(element)) return element
return null
}
val iterator = iterator()
var single = first(iterator)
if (single == null)
return null
while (iterator.hasNext()) {
val element = iterator.next()
if (predicate(element))
throw IllegalArgumentException("Collection has more than one matching element")
var single: T? = null
var found = false
for (element in this) {
if (predicate(element)) {
if (found) throw IllegalArgumentException("Collection contains more than one matching element")
single = element
found = true
}
}
if (!found) return null
return single
"""
}