From 2f77202d29243f7877341e686df85b9074440a1a Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 9 Nov 2012 22:45:25 +0400
Subject: [PATCH] Refactoring: change signature

---
 .../expressions/ControlStructureTypingVisitor.java     |  2 +-
 .../lang/types/expressions/ExpressionTypingUtils.java  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 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 fbf89a009a2..510e0e0a90f 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
@@ -376,7 +376,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
             @NotNull WritableSlice<JetExpression, ResolvedCall<FunctionDescriptor>> resolvedCallKey
     ) {
         OverloadResolutionResults<FunctionDescriptor> nextResolutionResults = resolveFakeCall(
-                new TransientReceiver(iteratorType), context, Name.identifier(name));
+                context, new TransientReceiver(iteratorType), Name.identifier(name));
         if (nextResolutionResults.isAmbiguity()) {
             context.trace.report(ambiguity.on(loopRangeExpression, iteratorType));
         }
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 fd444d29892..e1d180791b3 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
@@ -274,8 +274,10 @@ public class ExpressionTypingUtils {
 
     @NotNull
     public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall(
-            @NotNull ExpressionTypingContext context, @NotNull ReceiverValue receiver,
-            @NotNull Name name, @NotNull JetType... argumentTypes
+            @NotNull ExpressionTypingContext context,
+            @NotNull ReceiverValue receiver,
+            @NotNull Name name,
+            @NotNull JetType... argumentTypes
     ) {
         TemporaryBindingTrace traceWithFakeArgumentInfo = TemporaryBindingTrace.create(context.trace, "trace to store fake argument for", name);
         int index = 0;
@@ -290,8 +292,8 @@ public class ExpressionTypingUtils {
 
     @NotNull
     public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall(
-            @NotNull ReceiverValue receiver,
             @NotNull ExpressionTypingContext context,
+            @NotNull ReceiverValue receiver,
             @NotNull Name name
     ) {
         return makeAndResolveFakeCall(receiver, context, Collections.<JetExpression>emptyList(), name).getSecond();
@@ -336,7 +338,7 @@ public class ExpressionTypingUtils {
 
             JetType expectedType = getExpectedTypeForComponent(context, entry);
             OverloadResolutionResults<FunctionDescriptor> results =
-                    resolveFakeCall(receiver, context.replaceExpectedType(expectedType), componentName);
+                    resolveFakeCall(context.replaceExpectedType(expectedType), receiver, componentName);
 
             JetType componentType = null;
             if (results.isSuccess()) {