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

CLI: support delimiter for array arguments

Browse Source 
The " " delimiter is used in kotlin-native (see
K2NativeCompilerArguments)
This commit is contained in:
Alexander Udalov
2017-04-14 21:06:07 +03:00
parent ae1fb16fe8
commit b7de272884
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/parseCommandLineArguments.kt
+4 -3
View File
@@ -21,6 +21,7 @@ import java.lang.reflect.Field
annotation class Argument( annotation class Argument(
val value: String, val value: String,
val shortName: String = "", val shortName: String = "",
val delimiter: String = ",",
val valueDescription: String = "", val valueDescription: String = "",
val description: String val description: String
) )
@@ -81,15 +82,15 @@ fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>,
result.duplicateArguments.put(argument.value, value) result.duplicateArguments.put(argument.value, value)
} }
updateField(field, result, value) updateField(field, result, value, argument.delimiter)
} }
} }
private fun <A : CommonCompilerArguments> updateField(field: Field, result: A, value: Any) { private fun <A : CommonCompilerArguments> updateField(field: Field, result: A, value: Any, delimiter: String) {
when (field.type) { when (field.type) {
Boolean::class.java, String::class.java -> field.set(result, value) Boolean::class.java, String::class.java -> field.set(result, value)
Array<String>::class.java -> { Array<String>::class.java -> {
val newElements = (value as String).split(",").toTypedArray() val newElements = (value as String).split(delimiter).toTypedArray()
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val oldValue = field.get(result) as Array<String>? val oldValue = field.get(result) as Array<String>?
field.set(result, if (oldValue != null) arrayOf(*oldValue, *newElements) else newElements) field.set(result, if (oldValue != null) arrayOf(*oldValue, *newElements) else newElements)