From 36224dd32cc0533921f96d2d49893b4bf85c740d Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 30 Apr 2012 15:41:24 +0400 Subject: [PATCH] ResolutionCandidate's small change --- .../lang/resolve/calls/ResolutionCandidate.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionCandidate.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionCandidate.java index 829185e3e31..b134964b378 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionCandidate.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionCandidate.java @@ -31,15 +31,21 @@ import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor */ public class ResolutionCandidate { private final D candidateDescriptor; - private ReceiverDescriptor thisObject = NO_RECEIVER; // receiver object of a method - private ReceiverDescriptor receiverArgument = NO_RECEIVER; // receiver of an extension function + private ReceiverDescriptor thisObject; // receiver object of a method + private ReceiverDescriptor receiverArgument; // receiver of an extension function - private ResolutionCandidate(@NotNull D descriptor) { - candidateDescriptor = descriptor; + private ResolutionCandidate(@NotNull D descriptor, @NotNull ReceiverDescriptor thisObject, @NotNull ReceiverDescriptor receiverArgument) { + this.candidateDescriptor = descriptor; + this.thisObject = thisObject; + this.receiverArgument = receiverArgument; } public static ResolutionCandidate create(@NotNull D descriptor) { - return new ResolutionCandidate(descriptor); + return new ResolutionCandidate(descriptor, NO_RECEIVER, NO_RECEIVER); + } + + public static ResolutionCandidate create(@NotNull D descriptor, @NotNull ReceiverDescriptor thisObject, @NotNull ReceiverDescriptor receiverArgument) { + return new ResolutionCandidate(descriptor, thisObject, receiverArgument); } public void setThisObject(@NotNull ReceiverDescriptor thisObject) {