Tests for renamed fields

compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt

@@ -0,0 +1,16 @@
+class Test(val prop: String) {
+
+  class object {
+    public val prop : String = "CO";
+  }
+
+}
+
+
+fun box() : String {
+  val obj = Test("OK");
+
+  if (Test.prop != "CO") return "fail1";
+
+  return obj.prop;
+}

compiler/testData/codegen/box/fieldRename/delegates.kt

@@ -0,0 +1,26 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class A {}
+class B {}
+
+public val A.s: String by TestDelegate( {"OK2"})
+public val B.s: String by TestDelegate( {"OK"})
+
+fun box() : String {
+  if (A().s != "OK2") return "fail1"
+
+  return B().s
+}

compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt

@@ -0,0 +1,14 @@
+public class MPair<out A> (
+        public val first: A
+) {
+    fun equals(o: Any?): Boolean {
+        val t = o as MPair<*>
+        return first == t.first
+    }
+}
+
+fun box(): String {
+   val a = MPair("O")
+   a.equals(a)
+   return "OK"
+}

compiler/testData/codegen/box/fieldRename/inNamespace.kt

@@ -0,0 +1,18 @@
+class A { }
+class B { }
+
+public val A.prop: Int = 0;
+public val B.prop: String = "1111";
+public val prop: Double = 0.1;
+
+public fun doTest() : String {
+    if (A().prop != 0) return "fail1"
+    if (B().prop != "1111") return "fail2"
+    if (prop != 0.1) return "fail3"
+
+    return "OK"
+}
+
+fun box() : String {
+  return doTest()
+}

compiler/testData/codegen/box/fieldRename/simple.kt

@@ -0,0 +1,22 @@
+class A { }
+class B { }
+
+class Test {
+
+  public val A.prop: Int = 0;
+  public val B.prop: String = "1111";
+  public val prop: Double = 0.1;
+
+  public fun doTest() : String {
+      if (A().prop != 0) return "fail1"
+      if (B().prop != "1111") return "fail2"
+      if (prop != 0.1) return "fail3"
+
+      return "OK"
+  }
+}
+
+
+fun box() : String {
+  return Test().doTest()
+}

compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java

@@ -1,4 +1,4 @@
-class staticProperty {
+class staticClassProperty {
 
     public static void main(String[] args) {
         int i = Test.valProp;

compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.java

@@ -1,8 +1,6 @@
-class staticProperty {
+class staticTraitProperty {
 
     public static void main(String[] args) {
         int i = Test.valProp;
-        int j = Test.varProp;
-        Test.varProp = 100;
     }
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt

@@ -2,8 +2,6 @@ trait Test {
 
   class object {
     public val valProp: Int = 10
-
-    public var varProp: Int = 10
   }
 
 }

compiler/testData/writeFlags/property/classObject/class/extensionPublicVal.kt

@@ -5,9 +5,9 @@ class Test {
 }
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // FLAGS: ACC_FINAL, ACC_STATIC, ACC_PRIVATE
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // ABSENT: TRUE

compiler/testData/writeFlags/property/classObject/class/extensionPublicVar.kt

@@ -5,9 +5,9 @@ class Test {
 }
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // FLAGS: ACC_STATIC, ACC_PRIVATE
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // ABSENT: TRUE

compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt

@@ -0,0 +1,16 @@
+class Test(val prop: String) {
+
+  class object {
+    public val prop : String = "CO";
+  }
+
+}
+
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL

compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt

@@ -0,0 +1,31 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class Test {
+
+  public val prop: Int by TestDelegate({10})
+
+  class object {
+    public var prop: Int by TestDelegate({10})
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate
+// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL

compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt

@@ -0,0 +1,31 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class Test {
+
+  public var prop: String = ""
+
+  class object {
+    public var prop: Int by TestDelegate({10})
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_PRIVATE
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate
+// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL

compiler/testData/writeFlags/property/classObject/rename/extensionAndExtension.kt

@@ -0,0 +1,18 @@
+class A { }
+class B { }
+
+class Test {
+
+  class object {
+    public val A.prop: Int = 0;
+    public val B.prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext
+// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC

compiler/testData/writeFlags/property/classObject/rename/extensionAndProperty.kt

@@ -0,0 +1,16 @@
+class Test {
+
+  public val prop: Int = 0;
+
+  class object {
+    public var Test.prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext
+// FLAGS: ACC_STATIC, ACC_PRIVATE

compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt

@@ -0,0 +1,16 @@
+class Test {
+
+  public var prop: Int = 0;
+
+  class object {
+    public val prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$1
+// FLAGS: ACC_PRIVATE
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL

compiler/testData/writeFlags/property/classObject/trait/extensionPublicVal.kt

@@ -5,9 +5,9 @@ trait Test {
 }
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // ABSENT: TRUE
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // FLAGS: ACC_FINAL, ACC_PRIVATE

compiler/testData/writeFlags/property/classObject/trait/extensionPublicVar.kt

@@ -5,9 +5,9 @@ trait Test {
 }
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // ABSENT: TRUE
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // FLAGS: ACC_PRIVATE