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

Fix name clashes between struct and typedef in interop

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-07-14 17:57:26 +03:00
committed by SvyatoslavScherbina
parent cf8fea5711
commit 0f20feb544
1 changed files with 2 additions and 1 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
+2 -1
View File
@@ -80,7 +80,8 @@ class StubGenerator(
val forbiddenStructNames = run { val forbiddenStructNames = run {
val functionNames = nativeIndex.functions.map { it.name } val functionNames = nativeIndex.functions.map { it.name }
val fieldNames = nativeIndex.structs.mapNotNull { it.def }.flatMap { it.fields }.map { it.name } val fieldNames = nativeIndex.structs.mapNotNull { it.def }.flatMap { it.fields }.map { it.name }
(functionNames + fieldNames).toSet() + keywords val typedefNames = nativeIndex.typedefs.map { it.name }
(functionNames + fieldNames + typedefNames).toSet()
} }
val StructDecl.isAnonymous: Boolean val StructDecl.isAnonymous: Boolean