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

Minor. Local variable renamed

Browse Source
This commit is contained in:
Andrey Breslav
2013-08-21 17:45:53 +04:00
parent 9e9916df6e
commit d97506476f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+4 -4
View File
@@ -477,7 +477,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
@Override @Override
public JetTypeInfo visitReturnExpression(JetReturnExpression expression, ExpressionTypingContext context) { public JetTypeInfo visitReturnExpression(JetReturnExpression expression, ExpressionTypingContext context) {
JetElement element = context.labelResolver.resolveLabel(expression, context); JetElement labelTargetElement = context.labelResolver.resolveLabel(expression, context);
JetExpression returnedExpression = expression.getReturnedExpression(); JetExpression returnedExpression = expression.getReturnedExpression();
@@ -516,10 +516,10 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
resultType = ErrorUtils.createErrorType("Return not allowed"); resultType = ErrorUtils.createErrorType("Return not allowed");
} }
} }
else if (element != null) { else if (labelTargetElement != null) {
SimpleFunctionDescriptor functionDescriptor = context.trace.get(FUNCTION, element); SimpleFunctionDescriptor functionDescriptor = context.trace.get(FUNCTION, labelTargetElement);
if (functionDescriptor != null) { if (functionDescriptor != null) {
expectedType = DescriptorUtils.getFunctionExpectedReturnType(functionDescriptor, element); expectedType = DescriptorUtils.getFunctionExpectedReturnType(functionDescriptor, labelTargetElement);
if (functionDescriptor != containingFunctionDescriptor) { if (functionDescriptor != containingFunctionDescriptor) {
// Qualified, non-local // Qualified, non-local
context.trace.report(RETURN_NOT_ALLOWED.on(expression)); context.trace.report(RETURN_NOT_ALLOWED.on(expression));