From 6285e5a9f4570bdc8b578f01858ae8dd8d24b3da Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 10 Apr 2013 15:39:16 +0400 Subject: [PATCH] Renamed method. --- .../src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java | 3 +-- .../lang/types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../jet/lang/types/expressions/ExpressionTypingUtils.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index daad110dde0..eb07f95bcb5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -27,7 +27,6 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.context.*; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace; import org.jetbrains.jet.lang.resolve.calls.results.*; @@ -143,7 +142,7 @@ public class CallResolver { JetSimpleNameExpression expression = (JetSimpleNameExpression) calleeExpression; functionReference = expression; - ExpressionTypingUtils.checkWrappingInRef(expression, context.trace, context.scope); + ExpressionTypingUtils.checkCapturingInClosure(expression, context.trace, context.scope); Name name = expression.getReferencedNameAsName(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 7a29fdb62bf..b7b731eda2b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -73,7 +73,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { CallExpressionResolver callExpressionResolver = context.expressionTypingServices.getCallExpressionResolver(); JetTypeInfo typeInfo = callExpressionResolver.getSimpleNameExpressionTypeInfo(expression, NO_RECEIVER, null, context); JetType type = DataFlowUtils.checkType(typeInfo.getType(), expression, context); - ExpressionTypingUtils.checkWrappingInRef(expression, context.trace, context.scope); + ExpressionTypingUtils.checkCapturingInClosure(expression, context.trace, context.scope); return JetTypeInfo.create(type, typeInfo.getDataFlowInfo()); // TODO : Extensions to this } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index 6daa8c74ec0..cd1ab8703e1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -139,7 +139,7 @@ public class ExpressionTypingUtils { ).contains(expression.getNode().getElementType()); } - public static void checkWrappingInRef(JetSimpleNameExpression expression, BindingTrace trace, JetScope scope) { + public static void checkCapturingInClosure(JetSimpleNameExpression expression, BindingTrace trace, JetScope scope) { VariableDescriptor variable = BindingContextUtils.extractVariableDescriptorIfAny(trace.getBindingContext(), expression, true); if (variable != null) { DeclarationDescriptor containingDeclaration = variable.getContainingDeclaration();