J2K: generate 'interface' keyword instead of 'trait'

This commit is contained in:
Dmitry Jemerov
2015-05-11 19:36:22 +02:00
parent 69a58d1f0e
commit 25959fefdc
36 changed files with 39 additions and 39 deletions
@@ -1,4 +1,4 @@
trait I {
interface I {
public fun getString(): String?
}
@@ -1,4 +1,4 @@
trait I {
interface I {
public fun getString(): String?
}
@@ -1,4 +1,4 @@
trait I {
interface I {
public fun getString(): String?
}
@@ -1,4 +1,4 @@
trait I {
interface I {
public fun getString(): String
}
@@ -1,5 +1,5 @@
// ERROR: Return type of 'get' is not a subtype of the return type of overridden member public abstract fun get(): kotlin.String defined in Getter
trait Getter {
interface Getter {
public fun get(): String
}
@@ -12,7 +12,7 @@ open class Base {
}
}
trait I {
interface I {
public fun zoo(o: Any?): String?
}