diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/AbstractAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/AbstractAction.kt index 1802e488..00201a90 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/AbstractAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/AbstractAction.kt @@ -21,7 +21,7 @@ internal fun MutableMap.removeWhatStartsWith(name: Name) { /** * An action that caches results on-demand and recalculates them on source push */ -public abstract class AbstractAction( +public abstract class AbstractAction( public val outputType: KType, ) : Action { diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt index fafb2d55..ffa1d93d 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt @@ -50,7 +50,7 @@ public class MapActionBuilder( } @PublishedApi -internal class MapAction( +internal class MapAction( outputType: KType, private val block: MapActionBuilder.() -> Unit, ) : AbstractAction(outputType) { @@ -96,7 +96,7 @@ internal class MapAction( * A one-to-one mapping action */ @DFExperimental -public inline fun Action.Companion.mapping( +public inline fun Action.Companion.mapping( noinline builder: MapActionBuilder.() -> Unit, ): Action = MapAction(typeOf(), builder) diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt index 9440be55..0da9b61c 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt @@ -12,7 +12,7 @@ import kotlin.reflect.KType import kotlin.reflect.typeOf -public class JoinGroup( +public class JoinGroup( public var name: String, internal val set: DataTree, @PublishedApi internal var outputType: KType, @@ -35,7 +35,7 @@ public class JoinGroup( } @DFBuilder -public class ReduceGroupBuilder( +public class ReduceGroupBuilder( public val actionMeta: Meta, private val outputType: KType, ) { @@ -79,7 +79,7 @@ public class ReduceGroupBuilder( } @PublishedApi -internal class ReduceAction( +internal class ReduceAction( outputType: KType, private val action: ReduceGroupBuilder.() -> Unit, ) : AbstractAction(outputType) { diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt index cacbf1ee..b2937515 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt @@ -13,9 +13,9 @@ import kotlin.reflect.KType import kotlin.reflect.typeOf -public class SplitBuilder(public val name: Name, public val meta: Meta) { +public class SplitBuilder(public val name: Name, public val meta: Meta) { - public class FragmentRule( + public class FragmentRule( public val name: Name, public var meta: MutableMeta, @PublishedApi internal var outputType: KType, @@ -44,7 +44,7 @@ public class SplitBuilder(public val name: Name, public val me * Action that splits each incoming element into a number of fragments defined in builder */ @PublishedApi -internal class SplitAction( +internal class SplitAction( outputType: KType, private val action: SplitBuilder.() -> Unit, ) : AbstractAction(outputType) { diff --git a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt index 90486d85..ff7c94a8 100644 --- a/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt @@ -20,7 +20,7 @@ import space.kscience.dataforge.meta.string import space.kscience.dataforge.misc.DFInternal public interface GroupRule { - public fun gather(set: DataTree): Map> + public fun gather(set: DataTree): Map> public companion object { /** @@ -37,7 +37,7 @@ public interface GroupRule { defaultTagValue: String, ): GroupRule = object : GroupRule { - override fun gather( + override fun gather( set: DataTree, ): Map> { val map = HashMap>()