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

Stricter override check.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-05-07 15:51:59 +04:00
parent 4b656d8c8d
commit dd87c38ea3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+10 -10
View File
@@ -119,15 +119,6 @@ public class OverridingUtil {
}
return parameters;
}
private static int compiledValueParameterCount(CallableDescriptor callableDescriptor) {
if (callableDescriptor.getReceiverParameter() != null) {
return 1 + callableDescriptor.getValueParameters().size();
}
else {
return callableDescriptor.getValueParameters().size();
}
}
/**
* @param forOverride true for override, false for overload
@@ -136,7 +127,11 @@ public class OverridingUtil {
// TODO : Visibility
if (compiledValueParameterCount(superDescriptor) != compiledValueParameterCount(subDescriptor)) {
if ((superDescriptor.getReceiverParameter() == null) != (subDescriptor.getReceiverParameter() == null)) {
return OverrideCompatibilityInfo.receiverPresenseMismatch();
}
if (superDescriptor.getValueParameters().size() != subDescriptor.getValueParameters().size()) {
return OverrideCompatibilityInfo.valueParameterNumberMismatch();
}
@@ -326,6 +321,11 @@ public class OverridingUtil {
return new OverrideCompatibilityInfo(Result.INCOMPATIBLE, "typeParameterNumberMismatch"); // TODO
}
@NotNull
public static OverrideCompatibilityInfo receiverPresenseMismatch() {
return new OverrideCompatibilityInfo(Result.INCOMPATIBLE, "receiverPresenseMismatch"); // TODO
}
@NotNull
public static OverrideCompatibilityInfo valueParameterNumberMismatch() {
return new OverrideCompatibilityInfo(Result.INCOMPATIBLE, "valueParameterNumberMismatch"); // TODO