azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions 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
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+4 -4
View File
@@ -1,16 +1,16 @@
package test
public trait SamSubinterfaceOfTwo {
public interface SamSubinterfaceOfTwo {
public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
public interface Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String!
}
public trait Super1 {
public interface Super1 {
public abstract fun f(): kotlin.CharSequence!
}
public trait Super2</*0*/ T> {
public interface Super2</*0*/ T> {
public abstract fun f(): T!
}