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

Support 'interceptResume' operator in frontend

Browse Source 
#KT-14891 In Progress
This commit is contained in:
Denis Zharkov
2016-11-15 17:28:18 +03:00
parent 99bfbd0a26
commit 5276c3c755
8 changed files with 141 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
+2
View File
@@ -58,6 +58,8 @@ object OperatorNameConventions {
@JvmField val MINUS_ASSIGN = Name.identifier("minusAssign")
@JvmField val COROUTINE_HANDLE_RESULT = Name.identifier("handleResult")
@JvmField val COROUTINE_HANDLE_EXCEPTION = Name.identifier("handleException")
@JvmField val COROUTINE_INTERCEPT_RESUME = Name.identifier("interceptResume")
@JvmField val PROPERTY_DELEGATED = Name.identifier("propertyDelegated")
core/descriptors/src/org/jetbrains/kotlin/util/modifierChecks.kt
+12 -4
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.util
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.builtins.*
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -37,6 +36,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions.COMPONENT_REGEX
import org.jetbrains.kotlin.util.OperatorNameConventions.CONTAINS
import org.jetbrains.kotlin.util.OperatorNameConventions.COROUTINE_HANDLE_EXCEPTION
import org.jetbrains.kotlin.util.OperatorNameConventions.COROUTINE_HANDLE_RESULT
import org.jetbrains.kotlin.util.OperatorNameConventions.COROUTINE_INTERCEPT_RESUME
import org.jetbrains.kotlin.util.OperatorNameConventions.DEC
import org.jetbrains.kotlin.util.OperatorNameConventions.EQUALS
import org.jetbrains.kotlin.util.OperatorNameConventions.GET
@@ -163,7 +163,7 @@ internal class Checks private constructor(
abstract class AbstractModifierChecks {
abstract internal val checks: List<Checks>
inline fun ensure(cond: Boolean, msg: () -> String) = if (!cond) msg() else null
fun check(functionDescriptor: FunctionDescriptor): CheckResult {
@@ -217,6 +217,14 @@ object OperatorChecks : AbstractModifierChecks() {
"First parameter should be 'Throwable'"
}
},
Checks(COROUTINE_INTERCEPT_RESUME, Member, ValueParameterCountCheck.Equals(1), ReturnsUnit, NoDefaultAndVarargsCheck,
NoTypeParametersCheck
) {
val parameterType = valueParameters.single().type
ensure(parameterType.isNonExtensionFunctionType && parameterType.getValueParameterTypesFromFunctionType().isEmpty() &&
parameterType.getReturnTypeFromFunctionType().isUnit()
) { "Value parameter must have a functional type '() -> Unit'" }
},
Checks(PROPERTY_DELEGATED, Member, ValueParameterCountCheck.Equals(1)) //TODO: more checks required!
)
@@ -236,4 +244,4 @@ object InfixChecks : AbstractModifierChecks() {
Checks(MemberKindCheck.MemberOrExtension, SingleValueParameter, NoDefaultAndVarargsCheck))
}
fun FunctionDescriptor.isValidOperator() = isOperator && OperatorChecks.check(this).isSuccess
fun FunctionDescriptor.isValidOperator() = isOperator && OperatorChecks.check(this).isSuccess