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

Fix facet validation: change ArgumentParseErrors to a data class

Browse Source 
BaseCompilerSettings.validateInheritedFieldsUnchanged() compares
old and new properties of the compiler settings, and the check requires
ArgumentParseErrors.equals() to be correctly implemented
This commit is contained in:
Dmitry Jemerov
2017-04-21 12:42:41 +02:00
parent 7346fee513
commit 4e8fe18ca8
1 changed files with 7 additions and 7 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
+7 -7
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.common.arguments
import com.intellij.util.SmartList import com.intellij.util.SmartList
import java.lang.reflect.Field import java.lang.reflect.Field
import java.util.LinkedHashMap import java.util.*
annotation class Argument( annotation class Argument(
val value: String, val value: String,
@@ -34,20 +34,20 @@ val Argument.isAdvanced: Boolean
private val ADVANCED_ARGUMENT_PREFIX = "-X" private val ADVANCED_ARGUMENT_PREFIX = "-X"
private val FREE_ARGS_DELIMITER = "--" private val FREE_ARGS_DELIMITER = "--"
class ArgumentParseErrors { data class ArgumentParseErrors(
val unknownArgs: MutableList<String> = SmartList<String>() val unknownArgs: MutableList<String> = SmartList<String>(),
val unknownExtraFlags: MutableList<String> = SmartList<String>() val unknownExtraFlags: MutableList<String> = SmartList<String>(),
// Names of extra (-X...) arguments which have been passed in an obsolete form ("-Xaaa bbb", instead of "-Xaaa=bbb") // Names of extra (-X...) arguments which have been passed in an obsolete form ("-Xaaa bbb", instead of "-Xaaa=bbb")
val extraArgumentsPassedInObsoleteForm: MutableList<String> = SmartList<String>() val extraArgumentsPassedInObsoleteForm: MutableList<String> = SmartList<String>(),
// Non-boolean arguments which have been passed multiple times, possibly with different values. // Non-boolean arguments which have been passed multiple times, possibly with different values.
// The key in the map is the name of the argument, the value is the last passed value. // The key in the map is the name of the argument, the value is the last passed value.
val duplicateArguments: MutableMap<String, String> = LinkedHashMap<String, String>() val duplicateArguments: MutableMap<String, String> = LinkedHashMap<String, String>(),
var argumentWithoutValue: String? = null var argumentWithoutValue: String? = null
} )
// Parses arguments in the passed [result] object, or throws an [IllegalArgumentException] with the message to be displayed to the user // Parses arguments in the passed [result] object, or throws an [IllegalArgumentException] with the message to be displayed to the user
fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>, result: A) { fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>, result: A) {