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/tests/traitWithRequired/abstractClass.kt
+1 -1
View File
@@ -1,6 +1,6 @@
open class Required
trait Trait : <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface Trait : <!TRAIT_WITH_SUPERCLASS!>Required<!>
abstract <!UNMET_TRAIT_REQUIREMENT!>class Abstract<!> : Trait
compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.kt
+1 -1
View File
@@ -1,6 +1,6 @@
open class Required
trait A : <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface A : <!TRAIT_WITH_SUPERCLASS!>Required<!>
val a = <!UNMET_TRAIT_REQUIREMENT!>object<!> : A {}
val b: A = object : A, Required() {}
compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.kt
+2 -2
View File
@@ -1,8 +1,8 @@
open class Generic<T>
trait A : <!TRAIT_WITH_SUPERCLASS!>Generic<Int><!>
interface A : <!TRAIT_WITH_SUPERCLASS!>Generic<Int><!>
trait B : <!TRAIT_WITH_SUPERCLASS!>Generic<String><!>
interface B : <!TRAIT_WITH_SUPERCLASS!>Generic<String><!>
<!UNMET_TRAIT_REQUIREMENT, UNMET_TRAIT_REQUIREMENT!>class Y<!> : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A, B<!>
class Z : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A, B, Generic<Int>()<!>
compiler/testData/diagnostics/tests/traitWithRequired/kt3006.kt
+1 -1
View File
@@ -1,7 +1,7 @@
open class Base {
}
trait Derived: <!TRAIT_WITH_SUPERCLASS!>Base<!> {
interface Derived: <!TRAIT_WITH_SUPERCLASS!>Base<!> {
fun foo() {
f1(this@Derived)
}
compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.kt
+1 -1
View File
@@ -1,4 +1,4 @@
open class A
open class B
trait C : <!TRAIT_WITH_SUPERCLASS!>A<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST!>B<!>
interface C : <!TRAIT_WITH_SUPERCLASS!>A<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST!>B<!>
compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.kt
+4 -4
View File
@@ -1,12 +1,12 @@
open class Required
trait A : <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface A : <!TRAIT_WITH_SUPERCLASS!>Required<!>
trait B : A, <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface B : A, <!TRAIT_WITH_SUPERCLASS!>Required<!>
trait C : <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface C : <!TRAIT_WITH_SUPERCLASS!>Required<!>
trait D : B, <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface D : B, <!TRAIT_WITH_SUPERCLASS!>Required<!>
<!UNMET_TRAIT_REQUIREMENT, UNMET_TRAIT_REQUIREMENT, UNMET_TRAIT_REQUIREMENT!>class W<!> : D
class X : D, Required()
compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.kt
+1 -1
View File
@@ -1,6 +1,6 @@
open class RequiredBase
trait Trait : <!TRAIT_WITH_SUPERCLASS!>RequiredBase<!>
interface Trait : <!TRAIT_WITH_SUPERCLASS!>RequiredBase<!>
open class RequiredDerived : RequiredBase()
compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.kt
+2 -2
View File
@@ -1,8 +1,8 @@
open class Required(val value: String)
trait First : <!TRAIT_WITH_SUPERCLASS!>Required<!>
interface First : <!TRAIT_WITH_SUPERCLASS!>Required<!>
trait Second : First
interface Second : First
<!UNMET_TRAIT_REQUIREMENT!>class Y<!> : Second
class Z : Second, Required(":o)")
compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.kt
+1 -1
View File
@@ -1,4 +1,4 @@
trait AnyTrait : <!TRAIT_WITH_SUPERCLASS!>Any<!>
interface AnyTrait : <!TRAIT_WITH_SUPERCLASS!>Any<!>
class Foo : AnyTrait
compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.kt
+2 -2
View File
@@ -1,9 +1,9 @@
open class bar()
trait Foo<!CONSTRUCTOR_IN_TRAIT!>()<!> : <!TRAIT_WITH_SUPERCLASS!>bar<!><!SUPERTYPE_INITIALIZED_IN_TRAIT!>()<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST, SUPERTYPE_APPEARS_TWICE!>bar<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST, SUPERTYPE_APPEARS_TWICE!>bar<!> {
interface Foo<!CONSTRUCTOR_IN_TRAIT!>()<!> : <!TRAIT_WITH_SUPERCLASS!>bar<!><!SUPERTYPE_INITIALIZED_IN_TRAIT!>()<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST, SUPERTYPE_APPEARS_TWICE!>bar<!>, <!MANY_CLASSES_IN_SUPERTYPE_LIST, SUPERTYPE_APPEARS_TWICE!>bar<!> {
}
trait Foo2 : <!TRAIT_WITH_SUPERCLASS!>bar<!>, Foo {
interface Foo2 : <!TRAIT_WITH_SUPERCLASS!>bar<!>, Foo {
}
open class Foo1() : bar(), <!SUPERTYPE_NOT_INITIALIZED, MANY_CLASSES_IN_SUPERTYPE_LIST, SUPERTYPE_APPEARS_TWICE!>bar<!>, Foo, <!SUPERTYPE_APPEARS_TWICE!>Foo<!><!NO_CONSTRUCTOR!>()<!> {}
compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.kt
+3 -3
View File
@@ -1,7 +1,7 @@
open class Generic<T>
trait A : <!TRAIT_WITH_SUPERCLASS!>Generic<String><!>
interface A : <!TRAIT_WITH_SUPERCLASS!>Generic<String><!>
trait B : <!TRAIT_WITH_SUPERCLASS!>Generic<Int><!>
interface B : <!TRAIT_WITH_SUPERCLASS!>Generic<Int><!>
trait C : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A, B<!>
interface C : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A, B<!>