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

Complete nested calls (arguments) for not successfully resolved calls.

Browse Source 
When resolved call isn't single; when nested calls are unmapped arguments.
This commit is contained in:
svtk
2013-11-01 14:07:30 +04:00
parent 9023e96a07
commit 4d999bbb1f
2 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+8 -3
View File
@@ -54,6 +54,7 @@ import javax.inject.Inject;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
@@ -313,12 +314,15 @@ public class CallResolver {
}
traceToResolveCall.commit();
if (!prioritizedTasks.isEmpty() && context.contextDependency == ContextDependency.INDEPENDENT) {
if (context.contextDependency == ContextDependency.INDEPENDENT) {
results = completeTypeInferenceDependentOnExpectedType(context, results, tracing);
if (results.isSingleResult()) {
//todo clean internal data for several resulting calls
results.getResultingCall().markCallAsCompleted();
}
else {
candidateResolver.completeNestedCallsForNotResolvedInvocation(context);
}
}
context.callResolverExtension.run(results, context);
@@ -350,8 +354,9 @@ public class CallResolver {
@NotNull TracingStrategy tracing
) {
if (results.isSingleResult()) {
argumentTypeResolver.checkUnmappedArgumentTypes(
context, results.getResultingCall().getCallToCompleteTypeArgumentInference().getUnmappedArguments());
Set<ValueArgument> unmappedArguments = results.getResultingCall().getCallToCompleteTypeArgumentInference().getUnmappedArguments();
argumentTypeResolver.checkUnmappedArgumentTypes(context, unmappedArguments);
candidateResolver.completeNestedCallsForNotResolvedInvocation(context, unmappedArguments);
}
if (!results.isSingleResult()) return results;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+39 -4
View File
@@ -377,18 +377,53 @@ public class CandidateResolver {
JetType result = BindingContextUtils.updateRecordedType(
type, expression, context.trace, isFairSafeCallExpression(expression, context.trace));
contextForArgument.candidateCall.markCallAsCompleted();
markResultingCallAsCompleted(context, keyExpression);
DataFlowUtils.checkType(result, expression, contextForArgument);
}
public void completeNestedCallsForNotResolvedInvocation(@NotNull CallResolutionContext<?> context) {
completeNestedCallsForNotResolvedInvocation(context, context.call.getValueArguments());
}
public void completeNestedCallsForNotResolvedInvocation(@NotNull CallResolutionContext<?> context, @NotNull Collection<? extends ValueArgument> arguments) {
if (context.checkArguments == CheckValueArgumentsMode.DISABLED) return;
for (ValueArgument argument : arguments) {
JetExpression expression = argument.getArgumentExpression();
JetExpression keyExpression = getDeferredComputationKeyExpression(expression);
markResultingCallAsCompleted(context, keyExpression);
CallCandidateResolutionContext<? extends CallableDescriptor> storedContextForArgument =
context.resolutionResultsCache.getDeferredComputation(keyExpression);
if (storedContextForArgument != null) {
completeNestedCallsForNotResolvedInvocation(storedContextForArgument);
}
}
}
private static void markResultingCallAsCompleted(
@NotNull CallResolutionContext<?> context,
@Nullable JetExpression keyExpression
) {
if (keyExpression == null) return;
CallCandidateResolutionContext<? extends CallableDescriptor> storedContextForArgument =
context.resolutionResultsCache.getDeferredComputation(keyExpression);
if (storedContextForArgument == null) return;
storedContextForArgument.candidateCall.markCallAsCompleted();
// clean data for "invoke" calls
ResolvedCallWithTrace<? extends CallableDescriptor> resolvedCall = context.resolutionResultsCache.getCallForArgument(keyExpression);
assert resolvedCall != null : "Resolved call for '" + keyExpression + "' is not stored, but CallCandidateResolutionContext is.";
resolvedCall.markCallAsCompleted();
DataFlowUtils.checkType(result, expression, contextForArgument);
}
@Nullable
private JetExpression getDeferredComputationKeyExpression(@NotNull JetExpression expression) {
private JetExpression getDeferredComputationKeyExpression(@Nullable JetExpression expression) {
if (expression == null) return null;
return expression.accept(new JetVisitor<JetExpression, Void>() {
@Nullable
private JetExpression visitInnerExpression(@Nullable JetElement expression) {