Replace identityEqulas with ===

This commit is contained in:
Ilya Gorbunov
2015-10-01 20:04:25 +03:00
parent b50c106648
commit ec416c5210
6 changed files with 6 additions and 6 deletions
@@ -74,7 +74,7 @@ public class DeclarationResolver(
for (descriptor in descriptors) { for (descriptor in descriptors) {
if (descriptor is ClassDescriptor) { if (descriptor is ClassDescriptor) {
for (descriptor2 in descriptors) { for (descriptor2 in descriptors) {
if (descriptor identityEquals descriptor2) { if (descriptor === descriptor2) {
continue continue
} }
@@ -112,7 +112,7 @@ fun JetType.replaceAnnotations(newAnnotations: Annotations): JetType {
} }
public fun JetTypeChecker.equalTypesOrNulls(type1: JetType?, type2: JetType?): Boolean { public fun JetTypeChecker.equalTypesOrNulls(type1: JetType?, type2: JetType?): Boolean {
if (type1 identityEquals type2) return true if (type1 === type2) return true
if (type1 == null || type2 == null) return false if (type1 == null || type2 == null) return false
return equalTypes(type1, type2) return equalTypes(type1, type2)
} }
@@ -59,7 +59,7 @@ public abstract class DeclarationLookupObjectImpl(
} }
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this identityEquals other) return true if (this === other) return true
if (other == null || javaClass != other.javaClass) return false if (other == null || javaClass != other.javaClass) return false
val lookupObject = other as DeclarationLookupObjectImpl val lookupObject = other as DeclarationLookupObjectImpl
return descriptorsEqualWithSubstitution(descriptor, lookupObject.descriptor) && psiElement == lookupObject.psiElement return descriptorsEqualWithSubstitution(descriptor, lookupObject.descriptor) && psiElement == lookupObject.psiElement
@@ -58,7 +58,7 @@ class TypeVisitor(
} }
override fun visitClassType(classType: PsiClassType): Type { override fun visitClassType(classType: PsiClassType): Type {
val mutability = if (classType identityEquals topLevelType) topLevelTypeMutability else Mutability.Default val mutability = if (classType === topLevelType) topLevelTypeMutability else Mutability.Default
val refElement = constructReferenceElement(classType, mutability) val refElement = constructReferenceElement(classType, mutability)
return ClassType(refElement, Nullability.Default, converter.settings) return ClassType(refElement, Nullability.Default, converter.settings)
} }
@@ -101,7 +101,7 @@ private fun isNameInitialized(
if (!op.isAssignment()) return false if (!op.isAssignment()) return false
val arg1 = expr.getArg1() val arg1 = expr.getArg1()
if (arg1 is HasName && arg1.getName() identityEquals name) return true if (arg1 is HasName && arg1.getName() === name) return true
return false return false
} }
@@ -42,7 +42,7 @@ class NameCollector(private val scope: JsScope) : RecursiveJsVisitor() {
if (name == null || ident == null) return if (name == null || ident == null) return
val nameCollected = names.get(ident) val nameCollected = names.get(ident)
assert(nameCollected == null || nameCollected identityEquals name) { "ambiguous identifier for $hasName" } assert(nameCollected == null || nameCollected === name) { "ambiguous identifier for $hasName" }
assert(scope.hasOwnName(ident)) { "non-local name was added $hasName" } assert(scope.hasOwnName(ident)) { "non-local name was added $hasName" }
names.put(ident, name) names.put(ident, name)