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

Small refactoring in CandidateResolver

Browse Source
This commit is contained in:
Svetlana Isakova
2014-10-08 14:23:36 +04:00
parent a47729c626
commit c339df65a9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+6 -12
View File
@@ -106,8 +106,6 @@ public class CandidateResolver {
if (!argumentMappingStatus.isSuccess()) { if (!argumentMappingStatus.isSuccess()) {
if (argumentMappingStatus == ValueArgumentsToParametersMapper.Status.STRONG_ERROR) { if (argumentMappingStatus == ValueArgumentsToParametersMapper.Status.STRONG_ERROR) {
candidateCall.addStatus(RECEIVER_PRESENCE_ERROR); candidateCall.addStatus(RECEIVER_PRESENCE_ERROR);
checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS);
return;
} }
else { else {
candidateCall.addStatus(OTHER_ERROR); candidateCall.addStatus(OTHER_ERROR);
@@ -119,16 +117,7 @@ public class CandidateResolver {
} }
List<JetTypeProjection> jetTypeArguments = context.call.getTypeArguments(); List<JetTypeProjection> jetTypeArguments = context.call.getTypeArguments();
if (jetTypeArguments.isEmpty()) { if (!jetTypeArguments.isEmpty()) {
if (!candidate.getTypeParameters().isEmpty()) {
ResolutionStatus status = inferTypeArguments(context);
candidateCall.addStatus(status);
}
else {
candidateCall.addStatus(checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS).status);
}
}
else {
// Explicit type arguments passed // Explicit type arguments passed
List<JetType> typeArguments = new ArrayList<JetType>(); List<JetType> typeArguments = new ArrayList<JetType>();
@@ -157,7 +146,12 @@ public class CandidateResolver {
} }
candidateCall.setResultingSubstitutor(substitutor); candidateCall.setResultingSubstitutor(substitutor);
}
if (jetTypeArguments.isEmpty() && !candidate.getTypeParameters().isEmpty()) {
candidateCall.addStatus(inferTypeArguments(context));
}
else {
candidateCall.addStatus(checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS).status); candidateCall.addStatus(checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS).status);
} }