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

getOrElse() and getOrPut() fixed to respect how maps work with nulls

Browse Source
This commit is contained in:
Andrey Breslav
2012-09-27 13:51:55 +04:00
parent 1b37f13a34
commit c8e711f84b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/Maps.kt
+5 -7
View File
@@ -44,10 +44,9 @@ fun <K,V> Map.Entry<K,V>.component2() : V {
* *
* @includeFunctionBody ../../test/MapTest.kt getOrElse * @includeFunctionBody ../../test/MapTest.kt getOrElse
*/ */
public inline fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V?) : V? { public inline fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V {
val current = this.get(key) if (this.containsKey(key)) {
if (current != null) { return this.get(key)
return current
} else { } else {
return defaultValue() return defaultValue()
} }
@@ -59,9 +58,8 @@ public inline fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V?) : V? {
* @includeFunctionBody ../../test/MapTest.kt getOrElse * @includeFunctionBody ../../test/MapTest.kt getOrElse
*/ */
public inline fun <K,V> MutableMap<K,V>.getOrPut(key: K, defaultValue: ()-> V) : V { public inline fun <K,V> MutableMap<K,V>.getOrPut(key: K, defaultValue: ()-> V) : V {
val current = this.get(key) if (this.containsKey(key)) {
if (current != null) { return this.get(key)
return current
} else { } else {
val answer = defaultValue() val answer = defaultValue()
this.put(key, answer) this.put(key, answer)