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

Improve argument handling in interop stub generator

Browse Source 
Use `atMostOne` instead of `singleOrNull`.
This commit is contained in:
Svyatoslav Scherbina
2017-03-30 10:28:00 +03:00
committed by SvyatoslavScherbina
parent ebced0aa2d
commit 10a3e3d0e1
1 changed files with 3 additions and 3 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/main.kt
+3 -3
View File
@@ -314,14 +314,14 @@ private fun processLib(konanHome: String,
val language = Language.C val language = Language.C
val excludeSystemLibs = config.getProperty("excludeSystemLibs")?.toBoolean() ?: false val excludeSystemLibs = config.getProperty("excludeSystemLibs")?.toBoolean() ?: false
val entryPoint = config.getSpaceSeparated("entryPoint").singleOrNull() val entryPoint = config.getSpaceSeparated("entryPoint").atMostOne()
val linkerOpts = val linkerOpts =
config.getSpaceSeparated("linkerOpts").toTypedArray() + config.getSpaceSeparated("linkerOpts").toTypedArray() +
defaultOpts + additionalLinkerOpts defaultOpts + additionalLinkerOpts
val linker = args["-linker"]?.singleOrNull() ?: config.getProperty("linker") ?: "clang" val linker = args["-linker"]?.atMostOne() ?: config.getProperty("linker") ?: "clang"
val excludedFunctions = config.getSpaceSeparated("excludedFunctions").toSet() val excludedFunctions = config.getSpaceSeparated("excludedFunctions").toSet()
val fqParts = args["-pkg"]?.singleOrNull()?.let { val fqParts = args["-pkg"]?.atMostOne()?.let {
it.split('.') it.split('.')
} ?: defFile!!.name.split('.').reversed().drop(1) } ?: defFile!!.name.split('.').reversed().drop(1)