Add or functions

Author: JavierSegoviaCordoba

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Added
 
+- `T?.or(other: T): T`
+- `T?.or(block: () -> T): T`
 - `Iterable<T>.sixth(): T`
 - `Iterable<T>.sixthOrNull(): T?`
 - `Iterable<T>.seventh(): T`

kotlin-stdlib/api/android/kotlin-stdlib.api

@@ -209,6 +209,8 @@ public final class com/javiersc/kotlin/stdlib/StringsTransformKt {
 public final class com/javiersc/kotlin/stdlib/TKt {
 	public static final fun ifNotNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 	public static final fun ifNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 }
 
 public abstract interface class com/javiersc/kotlin/stdlib/graph/Graph : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {

kotlin-stdlib/api/jvm/kotlin-stdlib.api

@@ -215,6 +215,8 @@ public final class com/javiersc/kotlin/stdlib/StringsTransformKt {
 public final class com/javiersc/kotlin/stdlib/TKt {
 	public static final fun ifNotNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 	public static final fun ifNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 }
 
 public abstract interface class com/javiersc/kotlin/stdlib/graph/Graph : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {

kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/T.kt

@@ -9,3 +9,7 @@ public inline fun <T> T?.ifNull(block: () -> Unit): T? {
     if (this == null) block()
     return this
 }
+
+public inline infix fun <T> T?.or(other: T): T = this ?: other
+
+public inline infix fun <T> T?.or(block: () -> T): T = this ?: block()

kotlin-stdlib/common/test/kotlin/com/javiersc/kotlin/stdlib/TTest.kt

@@ -47,4 +47,46 @@ class TTest {
         assertFalse { isOne }
         assertTrue { isTwo }
     }
+
+    @Test
+    fun or() {
+        val aa = a.or { "aa" }
+        val aaa = a.or("aaa")
+        val bb = b.or { "bb" }
+        val bbb = b.or("bbb")
+        val eleven = one.or { 11 }
+        val oneHundredEleven = one.or(111)
+        val twentyTwo = two.or { 22 }
+        val twoHundredTwentyTwo = two.or(222)
+
+        assertTrue { aa == "a" }
+        assertTrue { aaa == "a" }
+        assertTrue { bb == "bb" }
+        assertTrue { bbb == "bbb" }
+        assertTrue { eleven == 1 }
+        assertTrue { oneHundredEleven == 1 }
+        assertTrue { twentyTwo == 22 }
+        assertTrue { twoHundredTwentyTwo == 222 }
+    }
+
+    @Test
+    fun infixOr() {
+        val aa = a or { "aa" }
+        val aaa = a or "aaa"
+        val bb = b or { "bb" }
+        val bbb = b or "bbb"
+        val eleven = one or { 11 }
+        val oneHundredEleven = one or 111
+        val twentyTwo = two or { 22 }
+        val twoHundredTwentyTwo = two or 222
+
+        assertTrue { aa == "a" }
+        assertTrue { aaa == "a" }
+        assertTrue { bb == "bb" }
+        assertTrue { bbb == "bbb" }
+        assertTrue { eleven == 1 }
+        assertTrue { oneHundredEleven == 1 }
+        assertTrue { twentyTwo == 22 }
+        assertTrue { twoHundredTwentyTwo == 222 }
+    }
 }