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

Do not box primitives for 'primitive == object'

Browse Source 
NB user-defined 'equals' can violate contract for 'Object#equals', e.g.,
it can be asymmetric.
Thus we can't avoid boxing for 'object == primitive'.
This commit is contained in:
Dmitry Petrov
2017-07-14 15:18:19 +03:00
parent fa42f202fa
commit 8e9c0294fe
33 changed files with 828 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt
+50 -7
View File
@@ -21,7 +21,7 @@ import java.io.File
import java.io.PrintWriter
object GeneratePrimitiveVsObjectEqualityTestData {
private val TEST_DATA_DIR = File("compiler/testData/codegen/box/primitiveTypes/equalityWithNullable")
private val TEST_DATA_DIR = File("compiler/testData/codegen/box/primitiveTypes/equalityWithObject")
private val GENERATED_DIR = File(TEST_DATA_DIR, "generated")
private val PREAMBLE_MESSAGE = "Auto-generated by ${this::class.java.simpleName}. Do not edit!"
@@ -75,16 +75,16 @@ object GeneratePrimitiveVsObjectEqualityTestData {
"!($lhs != $unequalRhs)"
)
private fun PrintWriter.generateLocalVals(type: String, x: String, y: String) {
println(" val ax: $type? = $x")
println(" val an: $type? = null")
private fun PrintWriter.generateLocalVals(type: String, x: String, y: String, boxedType: String = "$type?") {
println(" val ax: $boxedType = $x")
println(" val an: $boxedType = null")
println(" val bx: $type = $x")
println(" val by: $type = $y")
}
private fun PrintWriter.generateGlobalVals(type: String, x: String, y: String) {
println("val nx: $type? = $x")
println("val nn: $type? = null")
private fun PrintWriter.generateGlobalVals(type: String, x: String, y: String, boxedType: String = "$type?") {
println("val nx: $boxedType = $x")
println("val nn: $boxedType = null")
println("val x: $type = $x")
println("val y: $type = $y")
}
@@ -131,6 +131,42 @@ object GeneratePrimitiveVsObjectEqualityTestData {
println("}")
}
private fun generatePrimitiveVsObjectTest(type: String, x: String, y: String) {
PrintWriter(File(GENERATED_DIR, "primitiveEqObject$type.kt")).use {
it.generatePrimitiveVsObjectTestBody(type, x, y)
}
}
private fun PrintWriter.generatePrimitiveVsObjectTestBody(type: String, x: String, y: String) {
println("// $PREAMBLE_MESSAGE")
println()
generateGlobalVals(type, x, y, boxedType = "Any?")
println()
println("fun box(): String {")
generateLocalVals(type, x, y, boxedType = "Any?")
println()
println(" return when {")
generateFailureClauses(
*failuresForEqualAndUnequalRight(x, y, "nx"),
*failuresForEqualAndUnequalRight("x", "y", "nx"),
*failuresForUnequalRight(x, "nn"),
*failuresForUnequalRight("x", "nn"),
*failuresForEqualAndUnequalRight(x, y, "ax"),
*failuresForEqualAndUnequalRight("x", "y", "ax"),
*failuresForEqualAndUnequalRight("bx", "by", "ax"),
*failuresForUnequalRight(x, "an"),
*failuresForUnequalRight("x", "an"),
*failuresForUnequalRight("bx", "an")
)
println(" else -> \"OK\"")
println(" }")
println("}")
}
private fun failuresForEqualAndUnequalRight(equalLhs: String, unequalLhs: String, rhs: String) =
arrayOf(
"$equalLhs != $rhs",
@@ -166,5 +202,12 @@ object GeneratePrimitiveVsObjectEqualityTestData {
generatePrimitiveVsBoxedTest("Short", "0.toShort()", "1.toShort()")
generatePrimitiveVsBoxedTest("Int", "0", "1")
generatePrimitiveVsBoxedTest("Long", "0L", "1L")
generatePrimitiveVsObjectTest("Boolean", "true", "false")
generatePrimitiveVsObjectTest("Char", "'0'", "'1'")
generatePrimitiveVsObjectTest("Byte", "0.toByte()", "1.toByte()")
generatePrimitiveVsObjectTest("Short", "0.toShort()", "1.toShort()")
generatePrimitiveVsObjectTest("Int", "0", "1")
generatePrimitiveVsObjectTest("Long", "0L", "1L")
}
}