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

Refactoring: change signature

Browse Source
This commit is contained in:
Svetlana Isakova
2012-11-09 22:45:25 +04:00
parent 82e9d1f4fa
commit 2f77202d29
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+1 -1
View File
@@ -376,7 +376,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
@NotNull WritableSlice<JetExpression, ResolvedCall<FunctionDescriptor>> resolvedCallKey @NotNull WritableSlice<JetExpression, ResolvedCall<FunctionDescriptor>> resolvedCallKey
) { ) {
OverloadResolutionResults<FunctionDescriptor> nextResolutionResults = resolveFakeCall( OverloadResolutionResults<FunctionDescriptor> nextResolutionResults = resolveFakeCall(
new TransientReceiver(iteratorType), context, Name.identifier(name)); context, new TransientReceiver(iteratorType), Name.identifier(name));
if (nextResolutionResults.isAmbiguity()) { if (nextResolutionResults.isAmbiguity()) {
context.trace.report(ambiguity.on(loopRangeExpression, iteratorType)); context.trace.report(ambiguity.on(loopRangeExpression, iteratorType));
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java
+6 -4
View File
@@ -274,8 +274,10 @@ public class ExpressionTypingUtils {
@NotNull @NotNull
public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall( public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall(
@NotNull ExpressionTypingContext context, @NotNull ReceiverValue receiver, @NotNull ExpressionTypingContext context,
@NotNull Name name, @NotNull JetType... argumentTypes @NotNull ReceiverValue receiver,
@NotNull Name name,
@NotNull JetType... argumentTypes
) { ) {
TemporaryBindingTrace traceWithFakeArgumentInfo = TemporaryBindingTrace.create(context.trace, "trace to store fake argument for", name); TemporaryBindingTrace traceWithFakeArgumentInfo = TemporaryBindingTrace.create(context.trace, "trace to store fake argument for", name);
int index = 0; int index = 0;
@@ -290,8 +292,8 @@ public class ExpressionTypingUtils {
@NotNull @NotNull
public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall( public static OverloadResolutionResults<FunctionDescriptor> resolveFakeCall(
@NotNull ReceiverValue receiver,
@NotNull ExpressionTypingContext context, @NotNull ExpressionTypingContext context,
@NotNull ReceiverValue receiver,
@NotNull Name name @NotNull Name name
) { ) {
return makeAndResolveFakeCall(receiver, context, Collections.<JetExpression>emptyList(), name).getSecond(); return makeAndResolveFakeCall(receiver, context, Collections.<JetExpression>emptyList(), name).getSecond();
@@ -336,7 +338,7 @@ public class ExpressionTypingUtils {
JetType expectedType = getExpectedTypeForComponent(context, entry); JetType expectedType = getExpectedTypeForComponent(context, entry);
OverloadResolutionResults<FunctionDescriptor> results = OverloadResolutionResults<FunctionDescriptor> results =
resolveFakeCall(receiver, context.replaceExpectedType(expectedType), componentName); resolveFakeCall(context.replaceExpectedType(expectedType), receiver, componentName);
JetType componentType = null; JetType componentType = null;
if (results.isSuccess()) { if (results.isSuccess()) {