diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index f5d2deed38c..050ae292c91 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -497,7 +497,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { boolean first = true; for (PropertyDescriptor propertyDescriptor : properties) { if (first) { - iv.aconst(descriptor.getName() + "{" + propertyDescriptor.getName().getName()+"="); + iv.aconst(descriptor.getName() + "(" + propertyDescriptor.getName().getName()+"="); first = false; } else { @@ -523,7 +523,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { invokeAppendMethod(iv, type); } - iv.aconst("}"); + iv.aconst(")"); invokeAppendMethod(iv, JAVA_STRING_TYPE); iv.invokevirtual("java/lang/StringBuilder", "toString", "()Ljava/lang/String;"); diff --git a/compiler/testData/codegen/dataClasses/tostring/arrayParams.kt b/compiler/testData/codegen/dataClasses/tostring/arrayParams.kt index 4ddedc80981..8f68bfee5a9 100644 --- a/compiler/testData/codegen/dataClasses/tostring/arrayParams.kt +++ b/compiler/testData/codegen/dataClasses/tostring/arrayParams.kt @@ -2,13 +2,13 @@ data class A(val x: Array?, val y: IntArray?) fun box(): String { var ts = A(Array(2, {it}), IntArray(3)).toString() - if(ts != "A{x=[0, 1], y=[0, 0, 0]}") return ts + if(ts != "A(x=[0, 1], y=[0, 0, 0])") return ts ts = A(null, IntArray(3)).toString() - if(ts != "A{x=null, y=[0, 0, 0]}") return ts + if(ts != "A(x=null, y=[0, 0, 0])") return ts ts = A(null, null).toString() - if(ts != "A{x=null, y=null}") return ts + if(ts != "A(x=null, y=null)") return ts return "OK" } diff --git a/compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt b/compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt index f25581fb18a..0268af29435 100644 --- a/compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt +++ b/compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt @@ -2,10 +2,10 @@ data class A(var string: String) fun box(): String { val a = A("Fail") - if(a.toString() != "A{string=Fail}") return "fail" + if(a.toString() != "A(string=Fail)") return "fail" a.string = "OK" - if("$a" != "A{string=OK}") return a.toString() + if("$a" != "A(string=OK)") return a.toString() return "OK" } diff --git a/compiler/testData/codegen/dataClasses/tostring/genericParam.kt b/compiler/testData/codegen/dataClasses/tostring/genericParam.kt index d751f3c6794..794bad5dbe1 100644 --- a/compiler/testData/codegen/dataClasses/tostring/genericParam.kt +++ b/compiler/testData/codegen/dataClasses/tostring/genericParam.kt @@ -2,10 +2,10 @@ data class A(val x: T) fun box(): String { val a = A(42) - if ("$a" != "A{x=42}") return "$a" + if ("$a" != "A(x=42)") return "$a" val b = A(239.toLong()) - if ("$b" != "A{x=239}") return "$b" + if ("$b" != "A(x=239)") return "$b" return "OK" } diff --git a/compiler/testData/codegen/dataClasses/tostring/mixedParams.kt b/compiler/testData/codegen/dataClasses/tostring/mixedParams.kt index 1d0cfdb46dd..2fb2ab314d1 100644 --- a/compiler/testData/codegen/dataClasses/tostring/mixedParams.kt +++ b/compiler/testData/codegen/dataClasses/tostring/mixedParams.kt @@ -2,6 +2,6 @@ data class A(var x: Int, y: Int, val z: Int?) fun box(): String { val a = A(1, 2, null) - if("$a" != "A{x=1, z=null}") return "$a" + if("$a" != "A(x=1, z=null)") return "$a" return "OK" } diff --git a/compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt b/compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt index ab0b1856eec..3a4f021fea1 100644 --- a/compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt +++ b/compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt @@ -7,5 +7,5 @@ class B : A("Fail") { fun foo(a: A) = a fun box(): String { - return if ("${foo(B())}" == "A{x=OK}") "OK" else "fail" + return if ("${foo(B())}" == "A(x=OK)") "OK" else "fail" } diff --git a/compiler/testData/codegen/dataClasses/tostring/unitComponent.kt b/compiler/testData/codegen/dataClasses/tostring/unitComponent.kt index 2b6314ef567..602cb8d897b 100644 --- a/compiler/testData/codegen/dataClasses/tostring/unitComponent.kt +++ b/compiler/testData/codegen/dataClasses/tostring/unitComponent.kt @@ -2,5 +2,5 @@ data class A(val x: Unit) fun box(): String { val a = A(Unit.VALUE) - return if ("$a" == "A{x=Unit.VALUE}") "OK" else "$a" + return if ("$a" == "A(x=Unit.VALUE)") "OK" else "$a" }