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

A quick and dirty fix for error reporting when no function is applicable

Browse Source
This commit is contained in:
Andrey Breslav
2011-11-12 18:25:35 +04:00
parent bf4fef9a03
commit 3f6838be36
1 changed files with 8 additions and 6 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 -6
View File
@@ -692,7 +692,7 @@ public class CallResolver {
// TODO : maybe it's better to filter overrides out first, and only then look for the maximally specific // TODO : maybe it's better to filter overrides out first, and only then look for the maximally specific
if (successfulCandidates.size() > 0) { if (successfulCandidates.size() > 0) {
OverloadResolutionResults<D> results = chooseAndReportMaximallySpecific(successfulCandidates); OverloadResolutionResults<D> results = chooseAndReportMaximallySpecific(successfulCandidates, true);
if (results.isAmbiguity()) { if (results.isAmbiguity()) {
// This check is needed for the following case: // This check is needed for the following case:
// x.foo(unresolved) -- if there are multiple foo's, we'd report an ambiguity, and it does not make sense here // x.foo(unresolved) -- if there are multiple foo's, we'd report an ambiguity, and it does not make sense here
@@ -716,7 +716,7 @@ public class CallResolver {
} }
} }
if (!thisLevel.isEmpty()) { if (!thisLevel.isEmpty()) {
OverloadResolutionResults<D> results = chooseAndReportMaximallySpecific(thisLevel); OverloadResolutionResults<D> results = chooseAndReportMaximallySpecific(thisLevel, false);
if (results.isSuccess()) { if (results.isSuccess()) {
results.getResult().getTrace().commit(); results.getResult().getTrace().commit();
return OverloadResolutionResults.singleFailedCandidate(results.getResult()); return OverloadResolutionResults.singleFailedCandidate(results.getResult());
@@ -754,7 +754,7 @@ public class CallResolver {
return true; return true;
} }
private <D extends CallableDescriptor> OverloadResolutionResults<D> chooseAndReportMaximallySpecific(Set<ResolvedCallImpl<D>> candidates) { private <D extends CallableDescriptor> OverloadResolutionResults<D> chooseAndReportMaximallySpecific(Set<ResolvedCallImpl<D>> candidates, boolean discriminateGenerics) {
if (candidates.size() != 1) { if (candidates.size() != 1) {
Set<ResolvedCallImpl<D>> cleanCandidates = Sets.newLinkedHashSet(candidates); Set<ResolvedCallImpl<D>> cleanCandidates = Sets.newLinkedHashSet(candidates);
for (Iterator<ResolvedCallImpl<D>> iterator = cleanCandidates.iterator(); iterator.hasNext(); ) { for (Iterator<ResolvedCallImpl<D>> iterator = cleanCandidates.iterator(); iterator.hasNext(); ) {
@@ -772,9 +772,11 @@ public class CallResolver {
return OverloadResolutionResults.success(maximallySpecific); return OverloadResolutionResults.success(maximallySpecific);
} }
ResolvedCallImpl<D> maximallySpecificGenericsDiscriminated = overloadingConflictResolver.findMaximallySpecific(cleanCandidates, true); if (discriminateGenerics) {
if (maximallySpecificGenericsDiscriminated != null) { ResolvedCallImpl<D> maximallySpecificGenericsDiscriminated = overloadingConflictResolver.findMaximallySpecific(cleanCandidates, true);
return OverloadResolutionResults.success(maximallySpecificGenericsDiscriminated); if (maximallySpecificGenericsDiscriminated != null) {
return OverloadResolutionResults.success(maximallySpecificGenericsDiscriminated);
}
} }
Set<ResolvedCallImpl<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT); Set<ResolvedCallImpl<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT);