azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler testdata: s/trait/interface

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/delegationBy.kt
+1 -1
View File
@@ -1,4 +1,4 @@
trait Tr {
interface Tr {
fun foo()
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt
+1 -1
View File
@@ -3,7 +3,7 @@
fun <T> foo(t1: T, t2: T): T = t1
trait Tr
interface Tr
class C: Tr
fun <T: Tr> foo1(t1: T, t2: T): T = t1
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt
+6 -6
View File
@@ -1,18 +1,18 @@
trait P
trait R
interface P
interface R
trait A {
interface A {
fun foo(p: P): R
fun dynamic(p: dynamic): dynamic
}
trait B : A {
interface B : A {
override fun foo(p: dynamic): dynamic
override fun dynamic(p: P): R
}
trait A1 {
interface A1 {
fun foo(p: dynamic): dynamic
}
trait C : A, A1
interface C : A, A1
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt
+1 -1
View File
@@ -1,4 +1,4 @@
trait Tr : <!DYNAMIC_SUPERTYPE!>dynamic<!>
interface Tr : <!DYNAMIC_SUPERTYPE!>dynamic<!>
fun <T: <!DYNAMIC_UPPER_BOUND!>dynamic<!>> foo() {}
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt
+1 -1
View File
@@ -17,7 +17,7 @@ native
fun String.bar(): Int = noImpl
native
trait T {
interface T {
val baz: Int
fun foo()
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.kt
+1 -1
View File
@@ -5,7 +5,7 @@ fun String.bar(n: Int): Int? = noImpl
native
trait T {
interface T {
nativeGetter
fun foo(d: Double): String?
nativeGetter
compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/localClassifier.kt
+2 -2
View File
@@ -3,10 +3,10 @@
fun foo() {
<!NON_TOPLEVEL_CLASS_DECLARATION!>class A<!> {
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class E<!> {
<!NESTED_CLASS_NOT_ALLOWED, NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!>
<!NESTED_CLASS_NOT_ALLOWED, NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!>
}
}
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
}
}
compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.kt
+13 -13
View File
@@ -4,8 +4,8 @@ class A {
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class D<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
}
@@ -14,8 +14,8 @@ class A {
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class I<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
companion object {}
@@ -30,22 +30,22 @@ class A {
companion object {}
}
trait T {
interface T {
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>class C<!>
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class D<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
}
companion object {}
}
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
companion object {}
@@ -68,8 +68,8 @@ enum class E {
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class D<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
}
@@ -78,8 +78,8 @@ enum class E {
inner <!NON_TOPLEVEL_CLASS_DECLARATION!>class I<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>trait A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface T<!> {
<!NON_TOPLEVEL_CLASS_DECLARATION!>interface A<!>
<!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!>
companion object {}