jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 15:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt
View File

@@ -1,18 +1,18 @@
package test
public trait Sub : test.Super1, test.Super2 {
public interface Sub : test.Super1, test.Super2 {
public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
public abstract fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract fun kotlin.String.foo(): kotlin.Unit
}
public trait Super2 {
public interface Super2 {
public abstract fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.String): kotlin.Unit
}

2
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
View File

@@ -12,7 +12,7 @@ public open class Subclass : test.Impl {
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
}
internal trait Trait {
internal interface Trait {
internal open fun bar(): kotlin.String
internal open fun foo(): kotlin.String
}