From aa88f05688199c51a4aa725e7f2123844fe391cb Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 19 Feb 2024 11:41:27 +0300 Subject: [PATCH] Replace `branch` data builder with `putAll` --- .../kotlin/space/kscience/dataforge/data/DataSource.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSource.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSource.kt index 40086ca2..d379d027 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSource.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSource.kt @@ -98,15 +98,15 @@ public val DataTree<*>.meta: Meta? get() = data?.meta /** * Provide subtree if it exists */ -public tailrec fun > GenericDataTree.putAll(name: Name): TR? = +public tailrec fun > GenericDataTree.branch(name: Name): TR? = when (name.length) { 0 -> self 1 -> items[name.first()] - else -> items[name.first()]?.putAll(name.cutFirst()) + else -> items[name.first()]?.branch(name.cutFirst()) } -public fun > GenericDataTree.putAll(name: String): TR? = - this@branch.putAll(name.parseAsName()) +public fun > GenericDataTree.branch(name: String): TR? = + branch(name.parseAsName()) public fun GenericDataTree<*, *>.isEmpty(): Boolean = data == null && items.isEmpty()