remove support for 'trait' keyword

This commit is contained in:
Dmitry Jemerov
2015-09-18 16:17:02 +02:00
parent 86833c1a74
commit 4ca434da54
217 changed files with 705 additions and 821 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ public open class KotlinClass(public var field: Int) {
}
}
public trait KotlinTrait {
public interface KotlinTrait {
public fun nullableFun(): String?
public fun notNullableFun(): String
+1 -1
View File
@@ -1,2 +1,2 @@
//statement
int as, type, val, var, fun, is, in, object, when, trait, This;
int as, type, val, var, fun, is, in, object, when, This;
-1
View File
@@ -7,5 +7,4 @@ val `is`: Int
val `in`: Int
val `object`: Int
val `when`: Int
val `trait`: Int
val `This`: Int
@@ -1,6 +1,6 @@
//file
package test;
import as.type.val.var.fun.is.in.object.when.trait.This;
import as.type.val.var.fun.is.in.object.when.This;
class Test {}
@@ -1,6 +1,6 @@
// ERROR: Unresolved reference: `as`
package test
import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`This`
internal class Test
@@ -1,2 +1,2 @@
//statement
when(open, trait);
when(open);
@@ -1 +1 @@
`when`(open, `trait`)
`when`(open)