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

Fix bug in StringValue.equals

Browse Source 
Also simplify equals() implementations of other constant values
This commit is contained in:
Alexander Udalov
2017-12-29 12:13:40 +01:00
parent 95f9884799
commit 5e97517c8b
1 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
+4 -29
View File
@@ -55,15 +55,7 @@ class ArrayValue(
override fun <R, D> accept(visitor: AnnotationArgumentVisitor<R, D>, data: D) = visitor.visitArrayValue(this, data) override fun <R, D> accept(visitor: AnnotationArgumentVisitor<R, D>, data: D) = visitor.visitArrayValue(this, data)
val elementType: KotlinType override fun equals(other: Any?): Boolean = this === other || value == (other as? ArrayValue)?.value
get() = builtIns.getArrayElementType(type)
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other == null || other::class.java != this::class.java) return false
return value == (other as ArrayValue).value
}
override fun hashCode() = value.hashCode() override fun hashCode() = value.hashCode()
} }
@@ -144,12 +136,7 @@ class EnumValue(
override fun toString() = "$type.${value.name}" override fun toString() = "$type.${value.name}"
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean = this === other || value == (other as? EnumValue)?.value
if (this === other) return true
if (other == null || other::class.java != this::class.java) return false
return value == (other as EnumValue).value
}
override fun hashCode() = value.hashCode() override fun hashCode() = value.hashCode()
} }
@@ -196,14 +183,7 @@ class IntValue(
override fun <R, D> accept(visitor: AnnotationArgumentVisitor<R, D>, data: D) = visitor.visitIntValue(this, data) override fun <R, D> accept(visitor: AnnotationArgumentVisitor<R, D>, data: D) = visitor.visitIntValue(this, data)
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean = this === other || value == (other as? IntValue)?.value
if (this === other) return true
if (other == null || other::class.java != this::class.java) return false
val intValue = other as IntValue
return value == intValue.value
}
override fun hashCode() = value override fun hashCode() = value
} }
@@ -261,12 +241,7 @@ class StringValue(
override fun toString() = "\"$value\"" override fun toString() = "\"$value\""
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean = this === other || value == (other as? StringValue)?.value
if (this === other) return true
if (other == null || other::class.java != this::class.java) return false
return value != (other as StringValue).value
}
override fun hashCode() = value.hashCode() override fun hashCode() = value.hashCode()
} }