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

Minor. Clean up the code in OperatorChecker.kt

Browse Source
This commit is contained in:
Andrey Breslav
2015-12-09 13:57:24 +03:00
parent 3eeab68261
commit 0a0e4f1ba2
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/util/OperatorChecker.kt
+8 -9
View File
@@ -42,12 +42,10 @@ import org.jetbrains.kotlin.util.OperatorNameConventions.INC
import org.jetbrains.kotlin.util.OperatorNameConventions.INVOKE import org.jetbrains.kotlin.util.OperatorNameConventions.INVOKE
import org.jetbrains.kotlin.util.OperatorNameConventions.ITERATOR import org.jetbrains.kotlin.util.OperatorNameConventions.ITERATOR
import org.jetbrains.kotlin.util.OperatorNameConventions.NEXT import org.jetbrains.kotlin.util.OperatorNameConventions.NEXT
import org.jetbrains.kotlin.util.OperatorNameConventions.NOT
import org.jetbrains.kotlin.util.OperatorNameConventions.RANGE_TO import org.jetbrains.kotlin.util.OperatorNameConventions.RANGE_TO
import org.jetbrains.kotlin.util.OperatorNameConventions.SET import org.jetbrains.kotlin.util.OperatorNameConventions.SET
import org.jetbrains.kotlin.util.OperatorNameConventions.SET_VALUE import org.jetbrains.kotlin.util.OperatorNameConventions.SET_VALUE
import org.jetbrains.kotlin.util.OperatorNameConventions.UNARY_MINUS import org.jetbrains.kotlin.util.OperatorNameConventions.SIMPLE_UNARY_OPERATION_NAMES
import org.jetbrains.kotlin.util.OperatorNameConventions.UNARY_PLUS
object OperatorChecks { object OperatorChecks {
fun canBeOperator(functionDescriptor: FunctionDescriptor): Boolean { fun canBeOperator(functionDescriptor: FunctionDescriptor): Boolean {
@@ -81,19 +79,20 @@ object OperatorChecks {
} }
COMPARE_TO == name -> returnsInt && singleValueParameter && noDefaultsAndVarargs COMPARE_TO == name -> returnsInt && singleValueParameter && noDefaultsAndVarargs
BINARY_OPERATION_NAMES.any { it == name } -> name in BINARY_OPERATION_NAMES -> singleValueParameter && noDefaultsAndVarargs
singleValueParameter && noDefaultsAndVarargs
(UNARY_PLUS == name) || (UNARY_MINUS == name) || (NOT == name) -> name in SIMPLE_UNARY_OPERATION_NAMES -> noValueParameters
noValueParameters
(INC == name) || (DEC == name) -> { INC == name || DEC == name -> {
val receiver = dispatchReceiverParameter ?: extensionReceiverParameter val receiver = dispatchReceiverParameter ?: extensionReceiverParameter
isMemberOrExtension && (receiver != null) && (returnType?.let { it.isSubtypeOf(receiver.type) } ?: false) isMemberOrExtension && (receiver != null) && (returnType?.let { it.isSubtypeOf(receiver.type) } ?: false)
} }
ASSIGNMENT_OPERATIONS.any { it == name } -> name in ASSIGNMENT_OPERATIONS ->
returnsUnit && singleValueParameter && noDefaultsAndVarargs returnsUnit && singleValueParameter && noDefaultsAndVarargs
name.asString().matches(COMPONENT_REGEX) -> noValueParameters name.asString().matches(COMPONENT_REGEX) -> noValueParameters
else -> false else -> false
} }
} }
core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
+1
View File
@@ -65,6 +65,7 @@ object OperatorNameConventions {
val UNARY_OPERATION_NAMES_WITH_DEPRECATED = Collections.unmodifiableSet(setOf(INC, DEC, UNARY_PLUS, PLUS, UNARY_MINUS, MINUS, NOT)) val UNARY_OPERATION_NAMES_WITH_DEPRECATED = Collections.unmodifiableSet(setOf(INC, DEC, UNARY_PLUS, PLUS, UNARY_MINUS, MINUS, NOT))
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 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) internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN)