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

Functions on iterators are deprecated

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-03-17 19:39:13 +04:00
committed by Andrey Breslav
parent 33415c2333
commit f07b7cc58d
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/util.runtime/src/org/jetbrains/jet/utils/collections.kt
+30 -12
View File
@@ -19,18 +19,7 @@ package org.jetbrains.jet.utils
import java.util.LinkedHashMap import java.util.LinkedHashMap
import java.util.ArrayList import java.util.ArrayList
public fun <K, V> Iterable<V>.valuesToMap(key: (V) -> K): Map<K, V> { [deprecated("use streams instead")]
return iterator().valuesToMap(key)
}
public fun <K, V> Iterable<K>.keysToMap(value: (K) -> V): Map<K, V> {
return iterator().keysToMap(value)
}
public fun <K, V: Any> Iterable<K>.keysToMapExceptNulls(value: (K) -> V?): Map<K, V> {
return iterator().keysToMapExceptNulls(value)
}
public fun <K, V> Iterator<V>.valuesToMap(key: (V) -> K): Map<K, V> { public fun <K, V> Iterator<V>.valuesToMap(key: (V) -> K): Map<K, V> {
val map = LinkedHashMap<K, V>() val map = LinkedHashMap<K, V>()
for (v in this) { for (v in this) {
@@ -39,6 +28,7 @@ public fun <K, V> Iterator<V>.valuesToMap(key: (V) -> K): Map<K, V> {
return map return map
} }
[deprecated("use streams instead")]
public fun <K, V> Iterator<K>.keysToMap(value: (K) -> V): Map<K, V> { public fun <K, V> Iterator<K>.keysToMap(value: (K) -> V): Map<K, V> {
val map = LinkedHashMap<K, V>() val map = LinkedHashMap<K, V>()
for (k in this) { for (k in this) {
@@ -47,6 +37,7 @@ public fun <K, V> Iterator<K>.keysToMap(value: (K) -> V): Map<K, V> {
return map return map
} }
[deprecated("use streams instead")]
public fun <K, V: Any> Iterator<K>.keysToMapExceptNulls(value: (K) -> V?): Map<K, V> { public fun <K, V: Any> Iterator<K>.keysToMapExceptNulls(value: (K) -> V?): Map<K, V> {
val map = LinkedHashMap<K, V>() val map = LinkedHashMap<K, V>()
for (k in this) { for (k in this) {
@@ -58,6 +49,33 @@ public fun <K, V: Any> Iterator<K>.keysToMapExceptNulls(value: (K) -> V?): Map<K
return map return map
} }
public fun <K, V> Iterable<V>.valuesToMap(key: (V) -> K): Map<K, V> {
val map = LinkedHashMap<K, V>()
for (v in this) {
map[key(v)] = v
}
return map
}
public fun <K, V> Iterable<K>.keysToMap(value: (K) -> V): Map<K, V> {
val map = LinkedHashMap<K, V>()
for (k in this) {
map[k] = value(k)
}
return map
}
public fun <K, V: Any> Iterable<K>.keysToMapExceptNulls(value: (K) -> V?): Map<K, V> {
val map = LinkedHashMap<K, V>()
for (k in this) {
val v = value(k)
if (v != null) {
map[k] = v
}
}
return map
}
public fun <T, C: Collection<T>> C.ifEmpty(body: () -> C): C = if (isEmpty()) body() else this public fun <T, C: Collection<T>> C.ifEmpty(body: () -> C): C = if (isEmpty()) body() else this
public fun <T> Iterable<Iterable<T>>.flatten(): List<T> { public fun <T> Iterable<Iterable<T>>.flatten(): List<T> {