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

Minor. Methods reordered

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-29 21:14:09 +04:00
parent b022395cb8
commit 67b8d3a875
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+14 -14
View File
@@ -68,18 +68,6 @@ public class OverridingUtil {
return isOverridableByImpl(superDescriptor, subDescriptor, true); return isOverridableByImpl(superDescriptor, subDescriptor, true);
} }
private static List<JetType> compiledValueParameters(CallableDescriptor callableDescriptor) {
ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter();
ArrayList<JetType> parameters = new ArrayList<JetType>();
if (receiverParameter != null) {
parameters.add(receiverParameter.getType());
}
for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) {
parameters.add(valueParameterDescriptor.getType());
}
return parameters;
}
/** /**
* @param forOverride true for override, false for overload * @param forOverride true for override, false for overload
*/ */
@@ -169,7 +157,7 @@ public class OverridingUtil {
return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameterType, subValueParameterType, OverrideCompatibilityInfo.Result.INCOMPATIBLE); return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameterType, subValueParameterType, OverrideCompatibilityInfo.Result.INCOMPATIBLE);
} }
} }
return OverrideCompatibilityInfo.success(); return OverrideCompatibilityInfo.success();
} }
@@ -178,7 +166,19 @@ public class OverridingUtil {
return OverrideCompatibilityInfo.success(); return OverrideCompatibilityInfo.success();
} }
private static List<JetType> compiledValueParameters(CallableDescriptor callableDescriptor) {
ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter();
ArrayList<JetType> parameters = new ArrayList<JetType>();
if (receiverParameter != null) {
parameters.add(receiverParameter.getType());
}
for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) {
parameters.add(valueParameterDescriptor.getType());
}
return parameters;
}
private static JetType getUpperBound(JetType type) { private static JetType getUpperBound(JetType type) {
if (type.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) { if (type.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) {
return type; return type;