Skip to content

Commit 8a30f96

Browse files
move implementations + apiDump
1 parent 9696c32 commit 8a30f96

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

core/api/core.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,6 +2609,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/InsertKt {
26092609
public static final fun after (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnAccessor;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
26102610
public static final fun after (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
26112611
public static final fun at (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;I)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
2612+
public static final fun before (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
2613+
public static final fun before (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
26122614
public static final fun insert (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;
26132615
public static final fun under (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
26142616
public static final fun under (Lorg/jetbrains/kotlinx/dataframe/api/InsertClause;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
1616
import org.jetbrains.kotlinx.dataframe.documentation.Indent
1717
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
1818
import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns
19+
import org.jetbrains.kotlinx.dataframe.impl.api.afterImpl
20+
import org.jetbrains.kotlinx.dataframe.impl.api.beforeImpl
1921
import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl
2022
import org.jetbrains.kotlinx.dataframe.impl.columnName
2123
import org.jetbrains.kotlinx.dataframe.impl.removeAt
@@ -338,11 +340,6 @@ public fun <T> InsertClause<T>.after(columnPath: ColumnPath): DataFrame<T> {
338340
return df.insertImpl(dstPath, column).move { dstPath }.after { columnPath }
339341
}
340342

341-
internal fun <T> InsertClause<T>.afterImpl(columnPath: ColumnPath): DataFrame<T> {
342-
val dstPath = ColumnPath(columnPath.removeAt(columnPath.size - 1) + column.name())
343-
return df.insertImpl(dstPath, column).move { dstPath }.after { columnPath }
344-
}
345-
346343
// endregion
347344

348345
// region before
@@ -397,11 +394,6 @@ public fun <T> InsertClause<T>.before(column: ColumnSelector<T, *>): DataFrame<T
397394
public fun <T> InsertClause<T>.before(column: String): DataFrame<T> =
398395
df.add(this.column).move(this.column).before(column)
399396

400-
internal fun <T> InsertClause<T>.beforeImpl(columnPath: ColumnPath): DataFrame<T> {
401-
val dstPath = ColumnPath(columnPath.removeAt(columnPath.size - 1) + column.name())
402-
return df.insertImpl(dstPath, column).move { dstPath }.before { columnPath }
403-
}
404-
405397
// endregion
406398

407399
// region at

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/insert.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ import org.jetbrains.kotlinx.dataframe.AnyBaseCol
44
import org.jetbrains.kotlinx.dataframe.AnyCol
55
import org.jetbrains.kotlinx.dataframe.DataColumn
66
import org.jetbrains.kotlinx.dataframe.DataFrame
7+
import org.jetbrains.kotlinx.dataframe.api.InsertClause
8+
import org.jetbrains.kotlinx.dataframe.api.after
9+
import org.jetbrains.kotlinx.dataframe.api.before
710
import org.jetbrains.kotlinx.dataframe.api.cast
11+
import org.jetbrains.kotlinx.dataframe.api.move
812
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
913
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1014
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
1115
import org.jetbrains.kotlinx.dataframe.impl.columns.tree.ReadonlyTreeNode
1216
import org.jetbrains.kotlinx.dataframe.impl.columns.tree.ReferenceData
1317
import org.jetbrains.kotlinx.dataframe.impl.columns.tree.getAncestor
1418
import org.jetbrains.kotlinx.dataframe.impl.columns.withDf
19+
import org.jetbrains.kotlinx.dataframe.impl.removeAt
1520

1621
internal data class ColumnToInsert(
1722
val insertionPath: ColumnPath,
@@ -148,3 +153,13 @@ internal fun <T> insertImpl(
148153

149154
return newColumns.toDataFrame().cast()
150155
}
156+
157+
internal fun <T> InsertClause<T>.afterImpl(columnPath: ColumnPath): DataFrame<T> {
158+
val dstPath = ColumnPath(columnPath.removeAt(columnPath.size - 1) + column.name())
159+
return df.insertImpl(dstPath, column).move { dstPath }.after { columnPath }
160+
}
161+
162+
internal fun <T> InsertClause<T>.beforeImpl(columnPath: ColumnPath): DataFrame<T> {
163+
val dstPath = ColumnPath(columnPath.removeAt(columnPath.size - 1) + column.name())
164+
return df.insertImpl(dstPath, column).move { dstPath }.before { columnPath }
165+
}

0 commit comments

Comments
 (0)