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

change dataFlowInfo after do-while loop

Browse Source
This commit is contained in:
Alexander Udalov
2012-06-14 18:45:20 +04:00
parent b97d44c480
commit d377a7c070
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
@@ -234,10 +234,14 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
} }
JetExpression condition = expression.getCondition(); JetExpression condition = expression.getCondition();
checkCondition(conditionScope, condition, context); checkCondition(conditionScope, condition, context);
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);
} }
@Override @Override