Light Classes: Primary constructor fixes

This commit is contained in:
Alexey Sedunov
2015-06-08 18:50:11 +03:00
parent 608ce59f15
commit 1ea2c24562
16 changed files with 70 additions and 72 deletions
@@ -2,21 +2,21 @@
package constructorVsFun
class <!CONFLICTING_OVERLOADS!>a()<!> { }
class a<!CONFLICTING_OVERLOADS!>()<!> { }
<!CONFLICTING_OVERLOADS!>fun a()<!> = 1
class Tram {
<!CONFLICTING_OVERLOADS!>fun f()<!> { }
class <!CONFLICTING_OVERLOADS!>f()<!> { }
class f<!CONFLICTING_OVERLOADS!>()<!> { }
}
class Yvayva {
companion object {
<!CONFLICTING_OVERLOADS!>fun fghj()<!> { }
class <!CONFLICTING_OVERLOADS!>fghj()<!> { }
class fghj<!CONFLICTING_OVERLOADS!>()<!> { }
}
}
@@ -26,5 +26,4 @@ class Rtyu {
companion object {
class ololo() { }
}
}
}
@@ -31,5 +31,4 @@ fun z(<!UNUSED_PARAMETER!>view<!>: () -> Unit) {}
<!CONFLICTING_OVERLOADS!>fun x()<!> = z { z { z { z { z { z { z { z { } } } } } } } }
<!CONFLICTING_OVERLOADS!>fun x()<!> = z { z { z { z { z { z { z { z { } } } } } } } }
class <!CONFLICTING_OVERLOADS!>x()<!> {}
class x<!CONFLICTING_OVERLOADS!>()<!> {}
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class <!CONFLICTING_OVERLOADS!>A(x: String = "", y: String = "")<!> {
class A<!CONFLICTING_OVERLOADS!>(x: String = "", y: String = "")<!> {
<!CONFLICTING_OVERLOADS!>constructor(x: String, y: String)<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>(x, y)
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
@@ -13,7 +13,7 @@ class B {
<!CONFLICTING_OVERLOADS!>fun B(x: Int)<!> {}
class Outer {
class <!CONFLICTING_OVERLOADS!>A(x: String = "", y: String = "")<!> {
class A<!CONFLICTING_OVERLOADS!>(x: String = "", y: String = "")<!> {
<!CONFLICTING_OVERLOADS!>constructor(x: String, y: String)<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>(x, y)
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
@@ -24,4 +24,4 @@ class Outer {
}
<!CONFLICTING_OVERLOADS!>fun B(x: Int)<!> {}
}
}