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

change dataFlowInfo after while loop

Browse Source
This commit is contained in:
Alexander Udalov
2012-06-14 18:35:51 +04:00
parent f5bb00240a
commit b97d44c480
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+6 -2
View File
@@ -164,10 +164,14 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
DataFlowInfo conditionInfo = condition == null ? context.dataFlowInfo : DataFlowUtils.extractDataFlowInfoFromCondition(condition, true, scopeToExtend, context); DataFlowInfo conditionInfo = condition == null ? context.dataFlowInfo : DataFlowUtils.extractDataFlowInfoFromCondition(condition, true, scopeToExtend, context);
context.expressionTypingServices.getBlockReturnedTypeWithWritableScope(scopeToExtend, Collections.singletonList(body), CoercionStrategy.NO_COERCION, context.replaceDataFlowInfo(conditionInfo), context.trace); context.expressionTypingServices.getBlockReturnedTypeWithWritableScope(scopeToExtend, Collections.singletonList(body), CoercionStrategy.NO_COERCION, context.replaceDataFlowInfo(conditionInfo), context.trace);
} }
DataFlowInfo dataFlowInfo;
if (!containsBreak(expression, context)) { if (!containsBreak(expression, context)) {
facade.setResultingDataFlowInfo(DataFlowUtils.extractDataFlowInfoFromCondition(condition, false, null, context)); dataFlowInfo = DataFlowUtils.extractDataFlowInfoFromCondition(condition, false, null, context);
} }
return DataFlowUtils.checkType(JetStandardClasses.getUnitType(), expression, contextWithExpectedType, context.dataFlowInfo); else {
dataFlowInfo = context.dataFlowInfo;
}
return DataFlowUtils.checkType(JetStandardClasses.getUnitType(), expression, contextWithExpectedType, dataFlowInfo);
} }
private boolean containsBreak(final JetLoopExpression loopExpression, final ExpressionTypingContext context) { private boolean containsBreak(final JetLoopExpression loopExpression, final ExpressionTypingContext context) {