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

equals() fixed for types

Browse Source
This commit is contained in:
Andrey Breslav
2013-06-07 16:24:24 +04:00
parent a6edc21c49
commit 9d248d5c4a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
+7 -1
View File
@@ -96,7 +96,13 @@ public class DeferredType implements JetType {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return getActualType().equals(obj); if (this == obj) return true;
JetType actualType = getActualType();
if (actualType == obj) return true;
if (!(obj instanceof JetType)) return false;
return TypeUtils.equalTypes(actualType, (JetType) obj);
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
+3 -3
View File
@@ -102,11 +102,11 @@ public final class JetTypeImpl extends AnnotatedImpl implements JetType {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (!(o instanceof JetType)) return false;
JetTypeImpl type = (JetTypeImpl) o; JetType type = (JetType) o;
return nullable == type.nullable && JetTypeChecker.INSTANCE.equalTypes(this, type); return nullable == type.isNullable() && JetTypeChecker.INSTANCE.equalTypes(this, type);
} }
@Override @Override