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

Minor. If's with the same condition merged

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-29 20:58:01 +04:00
parent 204fa76691
commit a0d8cefe16
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+4 -7
View File
@@ -99,7 +99,10 @@ public class OverridingUtil {
List<JetType> subValueParameters = compiledValueParameters(subDescriptor); List<JetType> subValueParameters = compiledValueParameters(subDescriptor);
if (forOverride) { if (forOverride) {
if (superDescriptor.getTypeParameters().size() != subDescriptor.getTypeParameters().size()) { List<TypeParameterDescriptor> superTypeParameters = superDescriptor.getTypeParameters();
List<TypeParameterDescriptor> subTypeParameters = subDescriptor.getTypeParameters();
if (superTypeParameters.size() != subTypeParameters.size()) {
for (int i = 0; i < superValueParameters.size(); ++i) { for (int i = 0; i < superValueParameters.size(); ++i) {
JetType superValueParameterType = getUpperBound(superValueParameters.get(i)); JetType superValueParameterType = getUpperBound(superValueParameters.get(i));
JetType subValueParameterType = getUpperBound(subValueParameters.get(i)); JetType subValueParameterType = getUpperBound(subValueParameters.get(i));
@@ -110,12 +113,6 @@ public class OverridingUtil {
} }
return OverrideCompatibilityInfo.valueParameterTypeMismatch(null, null, OverrideCompatibilityInfo.Result.CONFLICT); return OverrideCompatibilityInfo.valueParameterTypeMismatch(null, null, OverrideCompatibilityInfo.Result.CONFLICT);
} }
}
if (forOverride) {
List<TypeParameterDescriptor> superTypeParameters = superDescriptor.getTypeParameters();
List<TypeParameterDescriptor> subTypeParameters = subDescriptor.getTypeParameters();
BiMap<TypeConstructor, TypeConstructor> axioms = HashBiMap.create(); BiMap<TypeConstructor, TypeConstructor> axioms = HashBiMap.create();
for (int i = 0, typeParametersSize = superTypeParameters.size(); i < typeParametersSize; i++) { for (int i = 0, typeParametersSize = superTypeParameters.size(); i < typeParametersSize; i++) {