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/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.txt
+3 -3
View File
@@ -1,16 +1,16 @@
package
public/*package*/ trait A : C {
public/*package*/ interface A : C {
internal abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
public abstract fun foo(): kotlin.Unit
}
internal trait B {
internal interface B {
internal abstract fun bar(): kotlin.Unit
}
public/*package*/ trait C : B {
public/*package*/ interface C : B {
internal abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public abstract fun baz(): kotlin.Unit
}