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

Minor, fix warnings related to OperatorNameConventions

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-21 20:41:45 +03:00
parent 97ce61ac44
commit ed2ad8e8e3
1 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
+39 -36
View File
@@ -17,55 +17,58 @@
package org.jetbrains.kotlin.util package org.jetbrains.kotlin.util
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import kotlin.text.Regex
object OperatorNameConventions { object OperatorNameConventions {
@JvmField val GET_VALUE = Name.identifier("getValue")
@JvmField val SET_VALUE = Name.identifier("setValue")
val GET_VALUE = Name.identifier("getValue") @JvmField val EQUALS = Name.identifier("equals")
val SET_VALUE = Name.identifier("setValue") @JvmField val IDENTITY_EQUALS = Name.identifier("identityEquals")
@JvmField val COMPARE_TO = Name.identifier("compareTo")
@JvmField val CONTAINS = Name.identifier("contains")
@JvmField val INVOKE = Name.identifier("invoke")
@JvmField val ITERATOR = Name.identifier("iterator")
@JvmField val GET = Name.identifier("get")
@JvmField val SET = Name.identifier("set")
@JvmField val NEXT = Name.identifier("next")
@JvmField val HAS_NEXT = Name.identifier("hasNext")
val EQUALS = Name.identifier("equals") @JvmField val COMPONENT_REGEX = Regex("component\\d+")
val IDENTITY_EQUALS = Name.identifier("identityEquals");
val COMPARE_TO = Name.identifier("compareTo")
val CONTAINS = Name.identifier("contains")
val INVOKE = Name.identifier("invoke")
val ITERATOR = Name.identifier("iterator")
val GET = Name.identifier("get")
val SET = Name.identifier("set")
val NEXT = Name.identifier("next")
val HAS_NEXT = Name.identifier("hasNext")
val COMPONENT_REGEX = Regex("component\\d+") @JvmField val AND = Name.identifier("and")
@JvmField val OR = Name.identifier("or")
val AND = Name.identifier("and") @JvmField val INC = Name.identifier("inc")
val OR = Name.identifier("or") @JvmField val DEC = Name.identifier("dec")
@JvmField val PLUS = Name.identifier("plus")
@JvmField val MINUS = Name.identifier("minus")
@JvmField val NOT = Name.identifier("not")
val INC = Name.identifier("inc") @JvmField val UNARY_MINUS = Name.identifier("unaryMinus")
val DEC = Name.identifier("dec") @JvmField val UNARY_PLUS = Name.identifier("unaryPlus")
val PLUS = Name.identifier("plus")
val MINUS = Name.identifier("minus")
val NOT = Name.identifier("not")
val UNARY_MINUS = Name.identifier("unaryMinus") @JvmField val TIMES = Name.identifier("times")
val UNARY_PLUS = Name.identifier("unaryPlus") @JvmField val DIV = Name.identifier("div")
@JvmField val MOD = Name.identifier("mod")
@JvmField val RANGE_TO = Name.identifier("rangeTo")
val TIMES = Name.identifier("times") @JvmField val TIMES_ASSIGN = Name.identifier("timesAssign")
val DIV = Name.identifier("div") @JvmField val DIV_ASSIGN = Name.identifier("divAssign")
val MOD = Name.identifier("mod") @JvmField val MOD_ASSIGN = Name.identifier("modAssign")
val RANGE_TO = Name.identifier("rangeTo") @JvmField val PLUS_ASSIGN = Name.identifier("plusAssign")
@JvmField val MINUS_ASSIGN = Name.identifier("minusAssign")
val TIMES_ASSIGN = Name.identifier("timesAssign")
val DIV_ASSIGN = Name.identifier("divAssign")
val MOD_ASSIGN = Name.identifier("modAssign")
val PLUS_ASSIGN = Name.identifier("plusAssign")
val MINUS_ASSIGN = Name.identifier("minusAssign")
// If you add new unary, binary or assignment operators, add it to OperatorConventions as well // If you add new unary, binary or assignment operators, add it to OperatorConventions as well
@JvmField @JvmField
internal val UNARY_OPERATION_NAMES = setOf(INC, DEC, UNARY_PLUS, UNARY_MINUS, NOT) internal val UNARY_OPERATION_NAMES = setOf(INC, DEC, UNARY_PLUS, UNARY_MINUS, NOT)
internal val SIMPLE_UNARY_OPERATION_NAMES = setOf(UNARY_PLUS, UNARY_MINUS, NOT)
internal val BINARY_OPERATION_NAMES = setOf(TIMES, PLUS, MINUS, DIV, MOD, RANGE_TO)
internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN)
@JvmField
internal val SIMPLE_UNARY_OPERATION_NAMES = setOf(UNARY_PLUS, UNARY_MINUS, NOT)
@JvmField
internal val BINARY_OPERATION_NAMES = setOf(TIMES, PLUS, MINUS, DIV, MOD, RANGE_TO)
@JvmField
internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN)
} }