From d97506476fd3c8753c83f1cb6b9f96244b2a35c8 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 21 Aug 2013 17:45:53 +0400 Subject: [PATCH] Minor. Local variable renamed --- .../types/expressions/ControlStructureTypingVisitor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java index 1a80abbd776..78ab6045277 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java @@ -477,7 +477,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { @Override 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(); @@ -516,10 +516,10 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { resultType = ErrorUtils.createErrorType("Return not allowed"); } } - else if (element != null) { - SimpleFunctionDescriptor functionDescriptor = context.trace.get(FUNCTION, element); + else if (labelTargetElement != null) { + SimpleFunctionDescriptor functionDescriptor = context.trace.get(FUNCTION, labelTargetElement); if (functionDescriptor != null) { - expectedType = DescriptorUtils.getFunctionExpectedReturnType(functionDescriptor, element); + expectedType = DescriptorUtils.getFunctionExpectedReturnType(functionDescriptor, labelTargetElement); if (functionDescriptor != containingFunctionDescriptor) { // Qualified, non-local context.trace.report(RETURN_NOT_ALLOWED.on(expression));