remove support for 'trait' keyword

This commit is contained in:
Dmitry Jemerov
2015-09-18 16:17:02 +02:00
parent 86833c1a74
commit 4ca434da54
217 changed files with 705 additions and 821 deletions
@@ -5,7 +5,7 @@ public fun foo(): Int = 4
public fun boo(): Int = 23
fun boo(i: Int): String = "boo" + i
trait T {
interface T {
public fun foo(): Int
public fun boo(): Int
}
@@ -127,7 +127,7 @@ public fun A.boo(): Int = 2
val public_ext_f = { A.(): Int -> this.foo() + this.foo }
val public_ext_b = { A.(): Int -> this.boo() + this.boo }
trait TestPublicInTrait {
interface TestPublicInTrait {
public fun foo(): Int = 2
public val foo: Int
public val boo: Int
@@ -137,7 +137,7 @@ trait TestPublicInTrait {
val public_in_trait_f = { obj: TestPublicInTrait -> obj.foo() + obj.foo }
val public_in_trait_b = { obj: TestPublicInTrait -> obj.boo() + obj.boo }
trait TestInternalInTrait {
interface TestInternalInTrait {
fun foo(): Int = 2
val foo: Int
val boo: Int
@@ -2,7 +2,7 @@
package foo
trait I {
interface I {
fun test(): String
}
@@ -1,10 +1,10 @@
package foo
trait A {
interface A {
fun foo(i: Int) = "A"
}
trait B {
interface B {
fun foo(s: String) = "B"
}