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/kotlinJavaNestedCycle.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package
internal trait ExceptionTracker {
internal interface ExceptionTracker {
}
public/*package*/ open class LockBasedStorageManager : StorageManager {
public/*package*/ constructor LockBasedStorageManager()
java.lang.Override() public/*package*/ open override /*1*/ fun foo(): kotlin.Unit
public/*package*/ trait ExceptionHandlingStrategy {
public/*package*/ interface ExceptionHandlingStrategy {
public abstract fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -18,6 +18,6 @@ public/*package*/ open class LockBasedStorageManager : StorageManager {
public/*package*/ final /*synthesized*/ fun ExceptionHandlingStrategy(/*0*/ function: () -> kotlin.Unit): LockBasedStorageManager.ExceptionHandlingStrategy
}
internal trait StorageManager {
internal interface StorageManager {
internal abstract fun foo(): kotlin.Unit
}