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

Minor refactoring: PatternMatchingTypingVisitor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-04-19 16:24:29 +03:00
parent 5ec7b5bef0
commit d7ecd12737
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt
+7 -6
View File
@@ -60,10 +60,11 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
contextWithExpectedType: ExpressionTypingContext, contextWithExpectedType: ExpressionTypingContext,
@Suppress("UNUSED_PARAMETER") isStatement: Boolean @Suppress("UNUSED_PARAMETER") isStatement: Boolean
): KotlinTypeInfo { ): KotlinTypeInfo {
WhenChecker.checkDeprecatedWhenSyntax(contextWithExpectedType.trace, expression) val trace = contextWithExpectedType.trace
WhenChecker.checkReservedPrefix(contextWithExpectedType.trace, expression) WhenChecker.checkDeprecatedWhenSyntax(trace, expression)
WhenChecker.checkReservedPrefix(trace, expression)
components.dataFlowAnalyzer.recordExpectedType(contextWithExpectedType.trace, expression, contextWithExpectedType.expectedType) components.dataFlowAnalyzer.recordExpectedType(trace, expression, contextWithExpectedType.expectedType)
val contextBeforeSubject = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT) val contextBeforeSubject = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT)
// TODO :change scope according to the bound value in the when header // TODO :change scope according to the bound value in the when header
@@ -86,7 +87,7 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
val (outputDataFlowInfo, jumpOutPossible) = val (outputDataFlowInfo, jumpOutPossible) =
joinWhenExpressionBranches(expression, contextAfterSubject, jumpOutPossibleInSubject, whenResultValue) joinWhenExpressionBranches(expression, contextAfterSubject, jumpOutPossibleInSubject, whenResultValue)
val isExhaustive = WhenChecker.isWhenExhaustive(expression, contextAfterSubject.trace) val isExhaustive = WhenChecker.isWhenExhaustive(expression, trace)
val resultDataFlowInfo = if (expression.elseExpression == null && !isExhaustive) { val resultDataFlowInfo = if (expression.elseExpression == null && !isExhaustive) {
// Without else expression in non-exhaustive when, we *must* take initial data flow info into account, // Without else expression in non-exhaustive when, we *must* take initial data flow info into account,
@@ -98,10 +99,10 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
} }
if (whenReturnType != null && isExhaustive && expression.elseExpression == null && KotlinBuiltIns.isNothing(whenReturnType)) { if (whenReturnType != null && isExhaustive && expression.elseExpression == null && KotlinBuiltIns.isNothing(whenReturnType)) {
contextAfterSubject.trace.record(BindingContext.IMPLICIT_EXHAUSTIVE_WHEN, expression) trace.record(BindingContext.IMPLICIT_EXHAUSTIVE_WHEN, expression)
} }
val resultType: KotlinType? = whenReturnType?.let { val resultType = whenReturnType?.let {
components.dataFlowAnalyzer.checkType(it, expression, contextWithExpectedType) components.dataFlowAnalyzer.checkType(it, expression, contextWithExpectedType)
} }