azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interop/StubGenerator: improve typedef handling

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-02-07 13:32:34 +07:00
committed by SvyatoslavScherbina
parent 5c90f6abc2
commit 29968f81a2
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt
+10 -4
View File
@@ -388,7 +388,7 @@ class StubGenerator(
* Constructs [OutValueBinding] for the value of given C type. * Constructs [OutValueBinding] for the value of given C type.
*/ */
fun getOutValueBinding(type: Type): OutValueBinding { fun getOutValueBinding(type: Type): OutValueBinding {
if (type is ArrayType) { if (type.unwrapTypedefs() is ArrayType) {
// array-typed C function argument or return value is actually a pointer to array. // array-typed C function argument or return value is actually a pointer to array.
return getOutValueBinding(PointerType(type)) return getOutValueBinding(PointerType(type))
} }
@@ -435,7 +435,7 @@ class StubGenerator(
* Constructs [InValueBinding] for the value of given C type. * Constructs [InValueBinding] for the value of given C type.
*/ */
fun getInValueBinding(type: Type): InValueBinding { fun getInValueBinding(type: Type): InValueBinding {
if (type is ArrayType) { if (type.unwrapTypedefs() is ArrayType) {
// array-typed C function argument or return value is actually a pointer to array. // array-typed C function argument or return value is actually a pointer to array.
return getInValueBinding(PointerType(type)) return getInValueBinding(PointerType(type))
} }
@@ -910,11 +910,17 @@ class StubGenerator(
} }
} }
private tailrec fun Type.unwrapTypedefs(): Type = if (this is Typedef) {
this.def.aliased.unwrapTypedefs()
} else {
this
}
/** /**
* Produces to [out] the implementation of JNI function used in Kotlin binding for given C function. * Produces to [out] the implementation of JNI function used in Kotlin binding for given C function.
*/ */
private fun generateCJniFunction(func: FunctionDecl) { private fun generateCJniFunction(func: FunctionDecl) {
val funcReturnType = func.returnType val funcReturnType = func.returnType.unwrapTypedefs()
val paramNames = paramNames(func) val paramNames = paramNames(func)
val paramBindings = paramBindings(func) val paramBindings = paramBindings(func)
val retValBinding = retValBinding(func) val retValBinding = retValBinding(func)
@@ -931,7 +937,7 @@ class StubGenerator(
val params = func.parameters.mapIndexed { i, parameter -> val params = func.parameters.mapIndexed { i, parameter ->
val cType = parameter.type.getStringRepresentation() val cType = parameter.type.getStringRepresentation()
if (parameter.type is RecordType) { if (parameter.type.unwrapTypedefs() is RecordType) {
"*($cType*)${paramNames[i]}" "*($cType*)${paramNames[i]}"
} else { } else {
"($cType)${paramNames[i]}" "($cType)${paramNames[i]}"