From 78a898651bf80a98ee2f9330acea8b9f1b7b9896 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 1 Apr 2016 19:18:27 +0300 Subject: [PATCH] Code cleanup: VarianceChecker --- .../org/jetbrains/kotlin/resolve/VarianceChecker.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index 0bf2433a9dc..93396631911 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -58,9 +58,9 @@ class VarianceChecker(private val trace: BindingTrace) { for (jetClassOrObject in c.declaredClasses!!.keys) { if (jetClassOrObject is KtClass) { for (specifier in jetClassOrObject.getSuperTypeListEntries()) { - specifier.getTypeReference()?.checkTypePosition(trace.bindingContext, OUT_VARIANCE, trace) + specifier.typeReference?.checkTypePosition(trace.bindingContext, OUT_VARIANCE, trace) } - jetClassOrObject.checkTypeParameters(trace.getBindingContext(), OUT_VARIANCE, trace) + jetClassOrObject.checkTypeParameters(trace.bindingContext, OUT_VARIANCE, trace) } } } @@ -128,7 +128,7 @@ class VarianceChecker(private val trace: BindingTrace) { noError = noError and declaration.receiverTypeReference?.checkTypePosition(trace, IN_VARIANCE, diagnosticSink) for (parameter in declaration.valueParameters) { - noError = noError and parameter.getTypeReference()?.checkTypePosition(trace, IN_VARIANCE, diagnosticSink) + noError = noError and parameter.typeReference?.checkTypePosition(trace, IN_VARIANCE, diagnosticSink) } val returnTypePosition = if (descriptor is VariableDescriptor && descriptor.isVar) INVARIANT else OUT_VARIANCE @@ -144,10 +144,10 @@ class VarianceChecker(private val trace: BindingTrace) { ): Boolean { var noError = true for (typeParameter in typeParameters) { - noError = noError and typeParameter.getExtendsBound()?.checkTypePosition(trace, typePosition, diagnosticSink) + noError = noError and typeParameter.extendsBound?.checkTypePosition(trace, typePosition, diagnosticSink) } for (typeConstraint in typeConstraints) { - noError = noError and typeConstraint.getBoundTypeReference()?.checkTypePosition(trace, typePosition, diagnosticSink) + noError = noError and typeConstraint.boundTypeReference?.checkTypePosition(trace, typePosition, diagnosticSink) } return noError }