1
1
package org.jetbrains.kotlinx.dataframe.api
2
2
3
- import org.jetbrains.kotlinx.dataframe.*
3
+ import org.jetbrains.kotlinx.dataframe.AnyCol
4
+ import org.jetbrains.kotlinx.dataframe.AnyColumnReference
5
+ import org.jetbrains.kotlinx.dataframe.AnyRow
4
6
import org.jetbrains.kotlinx.dataframe.ColumnFilter
7
+ import org.jetbrains.kotlinx.dataframe.ColumnGroupReference
5
8
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
6
9
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
7
10
import org.jetbrains.kotlinx.dataframe.DataColumn
11
+ import org.jetbrains.kotlinx.dataframe.DataFrame
12
+ import org.jetbrains.kotlinx.dataframe.DataRow
8
13
import org.jetbrains.kotlinx.dataframe.Predicate
9
14
import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
10
15
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
@@ -16,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
16
21
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
17
22
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
18
23
import org.jetbrains.kotlinx.dataframe.columns.renamedReference
24
+ import org.jetbrains.kotlinx.dataframe.hasNulls
19
25
import org.jetbrains.kotlinx.dataframe.impl.columnName
20
26
import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnsList
21
27
import org.jetbrains.kotlinx.dataframe.impl.columns.DistinctColumnSet
@@ -74,7 +80,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
74
80
75
81
public operator fun String.rangeTo (endInclusive : String ): ColumnSet <* > = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor())
76
82
77
- public operator fun Column .rangeTo (endInclusive : Column ): ColumnSet <* > = object : ColumnSet <Any ?> {
83
+ public operator fun AnyColumnReference .rangeTo (endInclusive : AnyColumnReference ): ColumnSet <* > = object : ColumnSet <Any ?> {
78
84
override fun resolve (context : ColumnResolutionContext ): List <ColumnWithPath <Any ?>> {
79
85
val startPath = this @rangeTo.resolveSingle(context)!! .path
80
86
val endPath = endInclusive.resolveSingle(context)!! .path
@@ -168,7 +174,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
168
174
}
169
175
170
176
public fun SingleColumn <* >.allAfter (colName : String ): ColumnSet <Any ?> = allAfter(pathOf(colName))
171
- public fun SingleColumn <* >.allAfter (column : Column ): ColumnSet <Any ?> = allAfter(column.path())
177
+ public fun SingleColumn <* >.allAfter (column : AnyColumnReference ): ColumnSet <Any ?> = allAfter(column.path())
172
178
173
179
// endregion
174
180
@@ -187,7 +193,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
187
193
}
188
194
189
195
public fun SingleColumn <* >.allSince (colName : String ): ColumnSet <Any ?> = allSince(pathOf(colName))
190
- public fun SingleColumn <* >.allSince (column : Column ): ColumnSet <Any ?> = allSince(column.path())
196
+ public fun SingleColumn <* >.allSince (column : AnyColumnReference ): ColumnSet <Any ?> = allSince(column.path())
191
197
192
198
// endregion
193
199
@@ -206,7 +212,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
206
212
}
207
213
208
214
public fun SingleColumn <* >.allBefore (colName : String ): ColumnSet <Any ?> = allBefore(pathOf(colName))
209
- public fun SingleColumn <* >.allBefore (column : Column ): ColumnSet <Any ?> = allBefore(column.path())
215
+ public fun SingleColumn <* >.allBefore (column : AnyColumnReference ): ColumnSet <Any ?> = allBefore(column.path())
210
216
211
217
// endregion
212
218
@@ -225,7 +231,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
225
231
}
226
232
227
233
public fun SingleColumn <* >.allUntil (colName : String ): ColumnSet <Any ?> = allUntil(pathOf(colName))
228
- public fun SingleColumn <* >.allUntil (column : Column ): ColumnSet <Any ?> = allUntil(column.path())
234
+ public fun SingleColumn <* >.allUntil (column : AnyColumnReference ): ColumnSet <Any ?> = allUntil(column.path())
229
235
230
236
// endregion
231
237
0 commit comments