compiler testdata: s/trait/interface

This commit is contained in:
Dmitry Jemerov
2015-05-12 12:38:49 +02:00
parent a5ed5d4269
commit 4bdf598bfe
803 changed files with 1456 additions and 1456 deletions
@@ -1,6 +1,6 @@
open class HtmlTag
trait NavigationBuilder {
interface NavigationBuilder {
public var text: ((String) -> String)?
~in_NB~var inNavigationBuilder: Int
}
@@ -10,7 +10,7 @@ fun HtmlTag.navigation(body: NavigationBuilder.() -> Unit) {
fun HtmlTag.a(contents: A.() -> Unit) {
}
trait A : HtmlTag {
interface A : HtmlTag {
~text_in_A~var text: String
~in_A~var inA: Int
}
+2 -2
View File
@@ -1,4 +1,4 @@
~T~trait T {
~T~interface T {
fun foo() {}
}
~C~open class C() {
@@ -25,7 +25,7 @@
}
}
~G~trait G<T> {
~G~interface G<T> {
fun foo() {}
}
@@ -8,10 +8,10 @@ val a1: `fromOtherPackage`TestClass? = null
//FILE:fromRoot.kt
//----------------------------------------------------------------------------------
trait ~fromRoot~TestClass
interface ~fromRoot~TestClass
//FILE:fromOtherPackage.kt
//----------------------------------------------------------------------------------
package testing
trait ~fromOtherPackage~TestClass
interface ~fromOtherPackage~TestClass
@@ -10,7 +10,7 @@ val a1: `fromSamePackage`TestClass? = null
//----------------------------------------------------------------------------------
package otherPackage
trait ~fromOtherPackage~TestClass
interface ~fromOtherPackage~TestClass
//FILE:fromSamePackage.kt
@@ -5,8 +5,8 @@ package test
import testing.InTesting2
import testing.InTesting1
trait ~InTest1~InTest1 : `InTesting1`InTesting1
trait ~InTest2~InTest2 : `InTesting2`InTesting2
interface ~InTest1~InTest1 : `InTesting1`InTesting1
interface ~InTest2~InTest2 : `InTesting2`InTesting2
//FILE:testing.kt
//----------------------------------------------------------------------------------
@@ -14,5 +14,5 @@ package testing
import test.InTest2
trait ~InTesting1~InTesting1 : `InTest2`InTest2
trait ~InTesting2~InTesting2
interface ~InTesting1~InTesting1 : `InTest2`InTest2
interface ~InTesting2~InTesting2
@@ -8,7 +8,7 @@ import testing.allUnder.*
// The goal is to activate lazy resolve in order Second, Other
class FirstOrder: `other`Other, FirstInternal
trait FirstInternal: `exact`Second
interface FirstInternal: `exact`Second
@@ -22,7 +22,7 @@ import testing.allUnder.*
// The goal is to activate lazy resolve in order Other, Second
class FirstOrder: FirstInternal, `other`Other
trait FirstInternal: `exact`Second
interface FirstInternal: `exact`Second
@@ -30,16 +30,16 @@ trait FirstInternal: `exact`Second
//----------------------------------------------------------------------------------
package testing.allUnder
trait ~allUnder~Second
interface ~allUnder~Second
//FILE:secondForExactImport.kt
//----------------------------------------------------------------------------------
package testing.exact
trait ~exact~Second
interface ~exact~Second
//FILE:someOther.kt
//----------------------------------------------------------------------------------
package testing.other
trait ~other~Other
interface ~other~Other
@@ -1,4 +1,4 @@
trait Base {
interface Base {
fun foo()
}
@@ -1,4 +1,4 @@
trait Base {
interface Base {
fun foo()
}