Merge branch 'master' of ssh://git.labs.intellij.net/jet

2011-11-04 18:58:59 +04:00
parent 05f1db20ce 498797b013
commit e225bf5e93
36 changed files with 710 additions and 207 deletions
@@ -47,4 +47,36 @@ fun main(args : Array<String>) {
    <!CALLEE_NOT_A_FUNCTION!>1<!>()
    <!CALLEE_NOT_A_FUNCTION!>1<!>{}
    <!CALLEE_NOT_A_FUNCTION!>1<!>(){}
+}
+
+fun f() : fun Int.() : Unit = {}
+
+fun main1(args : Array<String>) {
+    1.{Int.() => 1}();
+    {1}()
+    {(x : Int) => x}(1)
+    1.{Int.(x : Int) => x}(1)
+    @l{1}()
+    1.({Int.() => 1})()
+    1.(f())()
+    1.if(true){f()}else{f()}()
+    1.if(true){Int.() => 1}else{f()}()
+    1.if(true){Int.() => 1}else{Int.() => 1}()
+
+    1.<!CALLEE_NOT_A_FUNCTION!>"sdf"<!>()
+
+    1.<!ILLEGAL_SELECTOR!>"sdf"<!>
+    1.<!ILLEGAL_SELECTOR!>{}<!>
+    1.<!ILLEGAL_SELECTOR!>if (true) {}<!>
+}
+
+fun test() {
+    {(x : Int) => 1}<!NO_VALUE_FOR_PARAMETER!>()<!>
+    <!MISSING_RECEIVER!>{Int.() => 1}<!>()
+    <!TYPE_MISMATCH!>"sd"<!>.{Int.() => 1}()
+    val i : Int? = null
+    i<!UNSAFE_CALL!>.<!>{Int.() => 1}()
+    {}<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>()
+    1<!UNNECESSARY_SAFE_CALL!>?.<!>{Int.() => 1}()
+    1.<!NO_RECEIVER_ADMITTED!>{}<!>()
 }
@@ -0,0 +1,4 @@
+fun test() {
+    fun <T> foo(){}
+    foo<<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>in Int<!>>()
+}
@@ -0,0 +1,7 @@
+// KT-439 Support labeled function lliterals in call arguments
+
+inline fun run1<T>(body : fun() : T) : T = body()
+
+fun main1(args : Array<String>) {
+    run1 @l{ 1 } // should not be an error
+}
@@ -0,0 +1,13 @@
+class N() : java.util.ArrayList<String>() {
+    override fun add(el: String)  : Boolean {
+        super.add(el)
+        return super.add(el + el)
+    }
+}
+
+fun box(): String {
+    val n = N()
+    n.add("239")
+    if (n.get(0) == "239" && n.get(1) == "239239") return "OK";
+    return "fail";
+}
@@ -0,0 +1,22 @@
+open class M() {
+    open var b: Int = 0
+}
+
+class N() : M() {
+    val a : Int
+        get() {
+            super.b = super.b + 1
+            return super.b + 1
+        }
+    override var b: Int = a + 1
+
+    val superb : Int
+        get() = super.b
+}
+
+fun box(): String {
+    val n = N()
+    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
+    return "fail";
+}
@@ -0,0 +1,29 @@
+trait M {
+    var backingB : Int
+    var b : Int
+        get() = backingB
+        set(value: Int) {
+            backingB = value
+        }
+}
+
+class N() : M {
+    override var backingB : Int = 0
+
+    val a : Int
+        get() {
+            super.b = super.b + 1
+            return super.b + 1
+        }
+    override var b: Int = a + 1
+
+    val superb : Int
+        get() = super.b
+}
+
+fun box(): String {
+    val n = N()
+    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
+    return "fail";
+}