Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nullable accessors and fixed convertTo #175

Merged
merged 8 commits into from
Oct 10, 2022
Merged

Nullable accessors and fixed convertTo #175

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da18b89
TODO tests, added nullable accessors for DataRow<Object?> since its p…
Jolanrensen Oct 4, 2022
81f2eed
added toNullable converters for FieldType column types and added test…
Jolanrensen Oct 5, 2022
046b490
fixed more tests
Jolanrensen Oct 5, 2022
7d9a199
fixed more tests
Jolanrensen Oct 5, 2022
20ae0d7
fixed convertTo for nullable sub-objects
Jolanrensen Oct 5, 2022
8a3a396
added test that broke before
Jolanrensen Oct 5, 2022
6d90246
added test that requires other fix
Jolanrensen Oct 5, 2022
33fd23a
Merge branch 'master' into nullable-accessors
Jolanrensen Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 76 additions & 19 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,39 +131,96 @@ internal open class ExtensionsCodeGeneratorImpl(

private fun generateExtensionProperties(markers: List<Marker>) = markers.map { generateExtensionProperties(it) }

private fun generatePropertyCode(
marker: IsolatedMarker,
shortMarkerName: String,
typeName: String,
name: String,
propertyType: String,
getter: String,
visibility: String,
nullableAs: Boolean,
): String {
val jvmName = "${shortMarkerName}_${name.removeQuotes()}"
val typeParameters = marker.typeParameters.let {
if (it.isNotEmpty() && !it.startsWith(" ")) {
" $it"
} else {
it
}
}
val `as` = if (nullableAs) "as?" else "as"
return "${visibility}val$typeParameters $typeName.$name: $propertyType @JvmName(\"${renderStringLiteral(jvmName)}\") get() = $getter $`as` $propertyType"
}

protected fun generateExtensionProperties(marker: IsolatedMarker): Code {
val markerName = marker.name
val markerType = "$markerName${marker.typeArguments}"
val visibility = renderTopLevelDeclarationVisibility(marker)
val shortMarkerName = markerName.substring(markerName.lastIndexOf('.') + 1)
fun generatePropertyCode(
typeName: String,
name: String,
propertyType: String,
getter: String,
visibility: String
): String {
val jvmName = "${shortMarkerName}_${name.removeQuotes()}"
val typeParameters = marker.typeParameters.let {
if (it.isNotEmpty() && !it.startsWith(" ")) {
" $it"
} else {
it
}
}
return "${visibility}val$typeParameters $typeName.$name: $propertyType @JvmName(\"${renderStringLiteral(jvmName)}\") get() = $getter as $propertyType"
}
val nullableShortMarkerName = "Nullable$shortMarkerName"

fun String.toNullable() = if (this.last() == '?') this else "$this?"

val declarations = mutableListOf<String>()
val dfTypename = renderDfTypename(markerType)
val nullableDfTypename = renderDfTypename(markerType.toNullable())
val rowTypename = renderRowTypename(markerType)
val nullableRowTypename = renderRowTypename(markerType.toNullable())

marker.fields.sortedBy { it.fieldName.quotedIfNeeded }.forEach {
val getter = "this[\"${renderStringLiteral(it.columnName)}\"]"
val name = it.fieldName
val fieldType = it.renderFieldType()
val columnType = it.renderColumnType()
declarations.add(generatePropertyCode(dfTypename, name.quotedIfNeeded, columnType, getter, visibility))
declarations.add(generatePropertyCode(rowTypename, name.quotedIfNeeded, fieldType, getter, visibility))

declarations.addAll(
listOf(
// non nullable
generatePropertyCode(
marker = marker,
shortMarkerName = shortMarkerName,
typeName = dfTypename,
name = name.quotedIfNeeded,
propertyType = columnType,
getter = getter,
visibility = visibility,
nullableAs = false,
),
generatePropertyCode(
marker = marker,
shortMarkerName = shortMarkerName,
typeName = rowTypename,
name = name.quotedIfNeeded,
propertyType = fieldType,
getter = getter,
visibility = visibility,
nullableAs = false,
),

// nullable
generatePropertyCode(
marker = marker,
shortMarkerName = nullableShortMarkerName,
typeName = nullableDfTypename,
name = name.quotedIfNeeded,
propertyType = columnType.toNullable(),
getter = getter,
visibility = visibility,
nullableAs = true,
),
generatePropertyCode(
marker = marker,
shortMarkerName = nullableShortMarkerName,
typeName = nullableRowTypename,
name = name.quotedIfNeeded,
propertyType = fieldType.toNullable(),
getter = getter,
visibility = visibility,
nullableAs = true,
),
)
)
}
return declarations.joinToString("\n")
}
Expand Down