JS backend: fix access to class object members from containing class with implicit receiver.

#KT-4130 Fixed
2014-03-17 21:59:00 +04:00
parent 1ba0b01456
commit 71bfa51ab2
7 changed files with 105 additions and 2 deletions
@@ -0,0 +1,57 @@
+// KT-4130 object fields are not evaluated correctly
+
+package foo
+
+class Foo() {
+    class object {
+        val bar = "Foo.bar ";
+        var boo = "FAIL";
+        fun baz() = "Foo.baz() "
+
+        fun testImplicitThis(): String {
+            boo = "Implicit"
+            return baz() + bar + boo
+        }
+        fun testExplicitThis(): String {
+            this.boo = "Explicit"
+            return this.baz() + this.bar + this.boo
+        }
+    }
+
+    val a = bar
+    val b = Foo.bar
+    val c = baz()
+    val d = Foo.baz()
+    val e: String
+    val f: String
+
+    {
+        e = bar
+        f = Foo.bar
+        boo = "O"
+        Foo.boo += "K"
+    }
+}
+
+fun assertEquals<T>(expected: T, actual: T, id: String) {
+    if (expected != actual) throw Exception("Failed on $id, expected = '$expected', actual = '$actual'")
+}
+
+fun box(): String {
+    assertEquals("Foo.baz() Foo.bar Implicit", Foo.testImplicitThis(), "testImplicitThis")
+    assertEquals("Foo.baz() Foo.bar Explicit", Foo.testExplicitThis(), "testExplicitThis")
+
+    val foo = Foo()
+    assertEquals("Foo.bar ", foo.a, "foo.a")
+    assertEquals("Foo.bar ", foo.b, "foo.b")
+    assertEquals("Foo.baz() ", foo.c, "foo.c")
+    assertEquals("Foo.baz() ", foo.d, "foo.d")
+    assertEquals("Foo.bar ", foo.e, "foo.e")
+    assertEquals("Foo.bar ", foo.f, "foo.f")
+
+    assertEquals("OK", Foo.boo, "Foo.boo")
+    assertEquals("Foo.bar ", Foo.bar, "Foo.bar")
+    assertEquals("Foo.baz() ", Foo.baz(), "Foo.baz()")
+
+    return "OK"
+}