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

Compare arrays via equals (not Arrays.equals) in data classes

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-23 17:40:48 +03:00
parent cf57d56ab3
commit e5334ed9b8
6 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -12
View File
@@ -503,18 +503,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
Type otherPropertyType = genPropertyOnStack(iv, context, propertyDescriptor, 2);
StackValue.coerce(otherPropertyType, asmType, iv);
if (asmType.getSort() == Type.ARRAY) {
Type elementType = correctElementType(asmType);
if (elementType.getSort() == Type.OBJECT || elementType.getSort() == Type.ARRAY) {
iv.invokestatic("java/util/Arrays", "equals", "([Ljava/lang/Object;[Ljava/lang/Object;)Z", false);
}
else {
iv.invokestatic("java/util/Arrays", "equals",
"(" + asmType.getDescriptor() + asmType.getDescriptor() + ")Z", false);
}
iv.ifeq(ne);
}
else if (asmType.getSort() == Type.FLOAT) {
if (asmType.getSort() == Type.FLOAT) {
iv.invokestatic("java/lang/Float", "compare", "(FF)I", false);
iv.ifne(ne);
}
compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
data class A(val v: Array<Int>)
fun box() : String {
if(A(arrayOf(0,1,2)) != A(arrayOf(0,1,2))) return "fail"
val myArray = arrayOf(0, 1, 2)
if(A(myArray) == A(arrayOf(0, 1, 2))) return "fail"
if(A(myArray) != A(myArray)) return "fail 2"
return "OK"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
data class A(val v: IntArray)
fun box() : String {
if(A(intArrayOf(0,1,2)) != A(intArrayOf(0,1,2))) return "fail"
val myArray = intArrayOf(0, 1, 2)
if(A(myArray) == A(intArrayOf(0, 1, 2))) return "fail"
if(A(myArray) != A(myArray)) return "fail 2"
return "OK"
}