Merge remote branch 'origin/master'

2011-11-24 22:33:13 +02:00
parent c0cc97063d 0b689f32a7
commit b990792917
35 changed files with 333 additions and 61 deletions
@@ -19,7 +19,7 @@ fun t3() {

 fun t4() {
    val e: E? = E()
-    System.out?.println(e?.foo() == e) //verify error
+    System.out?.println(e?.bar() == e) //verify error
    System.out?.println(e?.foo())  //verify error
 }

@@ -35,4 +35,5 @@ class C(val x: Int)
 class D(val s: String)
 class E() {
    fun foo() = 1
+    fun bar() = this
 }