Skip to content

Commit 4337ec4

Browse files
JolanrensenJolanrensen
committed
1 parent 5088ce8 commit 4337ec4

File tree

18 files changed

+64
-96
lines changed

18 files changed

+64
-96
lines changed

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
8282
SingleColumnsSelectionDsl,
8383

8484
// col(name), col(5), [5]
85-
ColColumnsSelectionDsl,
85+
ColColumnsSelectionDsl<T>,
8686
// valueCol(name), valueCol(5)
87-
ValueColColumnsSelectionDsl,
87+
ValueColColumnsSelectionDsl<T>,
8888
// frameCol(name), frameCol(5)
89-
FrameColColumnsSelectionDsl,
89+
FrameColColumnsSelectionDsl<T>,
9090
// colGroup(name), colGroup(5)
91-
ColGroupColumnsSelectionDsl,
91+
ColGroupColumnsSelectionDsl<T>,
9292

9393
// cols {}, cols(), cols(colA, colB), cols(1, 5), cols(1..5), [{}]
94-
ColsColumnsSelectionDsl,
94+
ColsColumnsSelectionDsl<T>,
9595

9696
// colA.."colB"
9797
ColumnRangeColumnsSelectionDsl,
@@ -106,7 +106,7 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
106106
ColsOfKindColumnsSelectionDsl,
107107

108108
// all(Cols), allAfter(colA), allBefore(colA), allFrom(colA), allUpTo(colA)
109-
AllColumnsSelectionDsl,
109+
AllColumnsSelectionDsl<T>,
110110
// colsAtAnyDepth {}, colsAtAnyDepth()
111111
ColsAtAnyDepthColumnsSelectionDsl,
112112
// colsInGroups {}, colsInGroups()

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.CommonAllSubse
1616
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.CommonAllSubsetDocs.FunctionArg
1717
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.CommonAllSubsetDocs.FunctionColsArg
1818
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.CommonAllSubsetDocs.TitleArg
19+
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.Grammar
1920
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.Grammar.After
2021
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.Grammar.Before
2122
import org.jetbrains.kotlinx.dataframe.api.AllColumnsSelectionDsl.Grammar.ColumnGroupName
@@ -36,6 +37,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
3637
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
3738
import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
3839
import org.jetbrains.kotlinx.dataframe.documentation.Indent
40+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
3941
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
4042
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
4143
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
@@ -88,8 +90,9 @@ public fun <T> DataFrame<T>.all(predicate: RowFilter<T>): Boolean = rows().all {
8890
* ## All Flavors of All (Cols) [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
8991
*
9092
* See [Grammar] for all functions in this interface.
93+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
9194
*/
92-
public interface AllColumnsSelectionDsl {
95+
public interface AllColumnsSelectionDsl<out _UNUSED> {
9396

9497
/**
9598
* ## Grammar of All Flavors of All (Cols):

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1616
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
1717
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1818
import org.jetbrains.kotlinx.dataframe.documentation.Indent
19+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
1920
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2021
import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2122
import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl
@@ -30,8 +31,9 @@ import kotlin.reflect.KProperty
3031
* ## Col [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
3132
*
3233
* See [Grammar] for all functions in this interface.
34+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
3335
*/
34-
public interface ColColumnsSelectionDsl {
36+
public interface ColColumnsSelectionDsl<out _UNUSED> {
3537

3638
/**
3739
* ## Col Grammar

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1717
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
1818
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1919
import org.jetbrains.kotlinx.dataframe.documentation.Indent
20+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
2021
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2122
import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2223
import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve
@@ -30,8 +31,9 @@ import kotlin.reflect.KProperty
3031
* ## Column Group [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
3132
*
3233
* See [Grammar] for all functions in this interface.
34+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
3335
*/
34-
public interface ColGroupColumnsSelectionDsl {
36+
public interface ColGroupColumnsSelectionDsl<out _UNUSED> {
3537

3638
/**
3739
* ## Col Group Grammar

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1717
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
1818
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1919
import org.jetbrains.kotlinx.dataframe.documentation.Indent
20+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
2021
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2122
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
2223
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
@@ -28,8 +29,9 @@ import kotlin.reflect.KProperty
2829
* ## Cols [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
2930
*
3031
* See [Grammar] for all functions in this interface.
32+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
3133
*/
32-
public interface ColsColumnsSelectionDsl {
34+
public interface ColsColumnsSelectionDsl<out _UNUSED> {
3335

3436
/**
3537
* ## Cols Grammar

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1717
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
1818
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1919
import org.jetbrains.kotlinx.dataframe.documentation.Indent
20+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
2021
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2122
import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2223
import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve
@@ -30,8 +31,9 @@ import kotlin.reflect.KProperty
3031
* ## Frame Col [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
3132
*
3233
* See [Grammar] for all functions in this interface.
34+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
3335
*/
34-
public interface FrameColColumnsSelectionDsl {
36+
public interface FrameColColumnsSelectionDsl<out _UNUSED> {
3537

3638
/**
3739
* ## Frame Col Grammar

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.jetbrains.kotlinx.dataframe.AnyColumnGroupAccessor
44
import org.jetbrains.kotlinx.dataframe.ColumnGroupReference
55
import org.jetbrains.kotlinx.dataframe.DataFrame
66
import org.jetbrains.kotlinx.dataframe.DataRow
7+
import org.jetbrains.kotlinx.dataframe.api.ValueColColumnsSelectionDsl.Grammar
78
import org.jetbrains.kotlinx.dataframe.api.ValueColColumnsSelectionDsl.Grammar.ColumnGroupName
89
import org.jetbrains.kotlinx.dataframe.api.ValueColColumnsSelectionDsl.Grammar.ColumnSetName
910
import org.jetbrains.kotlinx.dataframe.api.ValueColColumnsSelectionDsl.Grammar.PlainDslName
@@ -17,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ValueColumn
1718
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
1819
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1920
import org.jetbrains.kotlinx.dataframe.documentation.Indent
21+
import org.jetbrains.kotlinx.dataframe.documentation.Issues
2022
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2123
import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2224
import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve
@@ -30,8 +32,9 @@ import kotlin.reflect.KProperty
3032
* ## Value Col [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]
3133
*
3234
* See [Grammar] for all functions in this interface.
35+
* @param _UNUSED [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0)
3336
*/
34-
public interface ValueColColumnsSelectionDsl {
37+
public interface ValueColColumnsSelectionDsl<out _UNUSED> {
3538

3639
/**
3740
* ## Value Col Grammar

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,3 @@
11
package org.jetbrains.kotlinx.dataframe.documentation
22

3-
internal interface DocumentationUrls {
43

5-
/** https://kotlin.github.io/dataframe */
6-
interface Url
7-
8-
/** [See Access APIs on the documentation website.](https://kotlin.github.io/dataframe/apilevels.html) */
9-
interface AccessApis {
10-
11-
/** [See String API on the documentation website.](https://kotlin.github.io/dataframe/stringapi.html) */
12-
interface StringApi
13-
14-
/** [See Column Accessors API on the documentation website.](https://kotlin.github.io/dataframe/columnaccessorsapi.html) */
15-
interface ColumnAccessorsApi
16-
17-
/** [See KProperties API on the documentation website.](https://kotlin.github.io/dataframe/kpropertiesapi.html) */
18-
interface KPropertiesApi
19-
20-
/** [See Extension Properties API on the documentation website.](https://kotlin.github.io/dataframe/extensionpropertiesapi.html) */
21-
interface ExtensionPropertiesApi
22-
}
23-
24-
/** [See Column Selectors on the documentation website.](https://kotlin.github.io/dataframe/columnselectors.html) */
25-
interface ColumnSelectors
26-
27-
interface DataRow {
28-
/** [See Row Expressions on the documentation website.](https://kotlin.github.io/dataframe/datarow.html#row-expressions) */
29-
interface RowExpressions
30-
31-
/** [See Row Conditions on the documentation website.](https://kotlin.github.io/dataframe/datarow.html#row-conditions) */
32-
interface RowConditions
33-
}
34-
35-
/** [See `drop` on the documentation website.](https://kotlin.github.io/dataframe/drop.html) */
36-
interface Drop {
37-
38-
/** [See `dropNulls` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnulls) */
39-
interface DropNulls
40-
41-
/** [See `dropNaNs` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnans) */
42-
interface DropNaNs
43-
44-
/** [See `dropNA` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropna) */
45-
interface DropNA
46-
}
47-
48-
/** [See `fill` on the documentation website.](https://kotlin.github.io/dataframe/fill.html) */
49-
interface Fill {
50-
/** [See `fillNulls` on the documentation website.](https://kotlin.github.io/dataframe/fill.html#fillnulls) */
51-
interface FillNulls
52-
53-
/** [See `fillNaNs` on the documentation website.](https://kotlin.github.io/dataframe/fill.html#fillnans) */
54-
interface FillNaNs
55-
56-
/** [See `fillNA` on the documentation website.](https://kotlin.github.io/dataframe/fill.html#fillna) */
57-
interface FillNA
58-
}
59-
60-
/** [See `NaN` and `NA` on the documentation website.](https://kotlin.github.io/dataframe/nanAndNa.html) */
61-
interface NanAndNa {
62-
63-
/** [See `NaN` on the documentation website.](https://kotlin.github.io/dataframe/nanAndNa.html#nan) */
64-
interface NaN
65-
66-
/** [See `NA` on the documentation website.](https://kotlin.github.io/dataframe/nanAndNa.html#na) */
67-
interface NA
68-
}
69-
70-
/** [See `select` on the documentation website.](https://kotlin.github.io/dataframe/select.html) */
71-
interface Select
72-
73-
/** [See `update` on the documentation website.](https://kotlin.github.io/dataframe/update.html) */
74-
interface Update
75-
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/Issues.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.jetbrains.kotlinx.dataframe.documentation
2+
3+

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
5656
SingleColumnsSelectionDsl,
5757

5858
// col(name), col(5), [5]
59-
ColColumnsSelectionDsl,
59+
ColColumnsSelectionDsl<T>,
6060
// valueCol(name), valueCol(5)
61-
ValueColColumnsSelectionDsl,
61+
ValueColColumnsSelectionDsl<T>,
6262
// frameCol(name), frameCol(5)
63-
FrameColColumnsSelectionDsl,
63+
FrameColColumnsSelectionDsl<T>,
6464
// colGroup(name), colGroup(5)
65-
ColGroupColumnsSelectionDsl,
65+
ColGroupColumnsSelectionDsl<T>,
6666

6767
// cols {}, cols(), cols(colA, colB), cols(1, 5), cols(1..5), [{}]
68-
ColsColumnsSelectionDsl,
68+
ColsColumnsSelectionDsl<T>,
6969

7070
// colA.."colB"
7171
ColumnRangeColumnsSelectionDsl,
@@ -80,7 +80,7 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
8080
ColsOfKindColumnsSelectionDsl,
8181

8282
// all(Cols), allAfter(colA), allBefore(colA), allFrom(colA), allUpTo(colA)
83-
AllColumnsSelectionDsl,
83+
AllColumnsSelectionDsl<T>,
8484
// colsAtAnyDepth {}, colsAtAnyDepth()
8585
ColsAtAnyDepthColumnsSelectionDsl,
8686
// colsInGroups {}, colsInGroups()

0 commit comments

Comments
 (0)