Skip to content

Commit b4484f5

Browse files
committed
made renameToCamelCase clearer
1 parent 29975f5 commit b4484f5

File tree

2 files changed

+12
-6
lines changed
  • core
    • generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api
    • src/main/kotlin/org/jetbrains/kotlinx/dataframe/api

2 files changed

+12
-6
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,16 @@ public data class RenameClause<T, C>(val df: DataFrame<T>, val columns: ColumnsS
4444

4545
public fun <T> DataFrame<T>.renameToCamelCase(): DataFrame<T> = this
4646
.rename {
47-
cols { it.isColumnGroup() && it.name() matches DELIMITED_STRING_REGEX }.rec()
47+
// rename groups first, because groups and their children cannot be renamed/moved at the same time
48+
groups { it.name() matches DELIMITED_STRING_REGEX }.recursively()
4849
}.toCamelCase()
50+
4951
.rename {
50-
cols { !it.isColumnGroup() && it.name() matches DELIMITED_STRING_REGEX }.rec()
52+
cols { it.name() matches DELIMITED_STRING_REGEX }.recursively(includeGroups = false)
5153
}.toCamelCase()
54+
5255
.update {
53-
colsOf<AnyFrame>().rec()
56+
colsOf<AnyFrame>().recursively()
5457
}.with { it.renameToCamelCase() }
5558

5659
public fun <T, C> RenameClause<T, C>.into(vararg newColumns: ColumnReference<*>): DataFrame<T> =

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,16 @@ public data class RenameClause<T, C>(val df: DataFrame<T>, val columns: ColumnsS
4444

4545
public fun <T> DataFrame<T>.renameToCamelCase(): DataFrame<T> = this
4646
.rename {
47-
cols { it.isColumnGroup() && it.name() matches DELIMITED_STRING_REGEX }.rec()
47+
// rename groups first, because groups and their children cannot be renamed/moved at the same time
48+
groups { it.name() matches DELIMITED_STRING_REGEX }.recursively()
4849
}.toCamelCase()
50+
4951
.rename {
50-
cols { !it.isColumnGroup() && it.name() matches DELIMITED_STRING_REGEX }.rec()
52+
cols { it.name() matches DELIMITED_STRING_REGEX }.recursively(includeGroups = false)
5153
}.toCamelCase()
54+
5255
.update {
53-
colsOf<AnyFrame>().rec()
56+
colsOf<AnyFrame>().recursively()
5457
}.with { it.renameToCamelCase() }
5558

5659
public fun <T, C> RenameClause<T, C>.into(vararg newColumns: ColumnReference<*>): DataFrame<T> =

0 commit comments

Comments
 (0)