Merge remote branch 'origin/master'

2011-11-10 20:55:18 +03:00
parent 839d986f44 a4b62868fa
commit 586f4c34b2
11 changed files with 442 additions and 1 deletions
@@ -0,0 +1,42 @@
+// http://youtrack.jetbrains.net/issue/KT-424
+
+class A {
+    <!CONFLICTING_OVERLOADS!>fun a(a: Int): Int<!> = 0
+
+    <!CONFLICTING_OVERLOADS!>fun a(a: Int)<!> {
+    }
+
+    <!CONFLICTING_OVERLOADS!>fun b()<!> {
+    }
+
+    <!CONFLICTING_OVERLOADS!>fun b()<!> {
+    }
+}
+
+namespace deepSpace {
+    <!CONFLICTING_OVERLOADS!>fun c(s: String)<!> {
+    }
+
+    <!CONFLICTING_OVERLOADS!>fun c(s: String)<!> {
+    }
+
+    class B {
+        <!CONFLICTING_OVERLOADS!>fun d(s: String)<!> {
+        }
+
+        <!CONFLICTING_OVERLOADS!>fun d(s: String)<!> {
+        }
+    }
+}
+
+
+// check no error in overload in different namespaces
+
+namespace ns1 {
+    fun e() = 1
+}
+
+namespace ns2 {
+    fun e() = 1
+}
+
@@ -15,7 +15,7 @@ fun test(a : A?) {
    a<!UNNECESSARY_SAFE_CALL!>?.<!>buzz() // warning
 }

-fun A.test() {
+fun A.test2() {
    foo()
    bar()
    buzz()