'yield' reserved as a keyword

compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/_KDocLexer.java

@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 11/27/15 4:27 PM */
+/* The following code was generated by JFlex 1.4.3 on 11/30/15 6:43 PM */
 
 package org.jetbrains.kotlin.kdoc.lexer;
 
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 11/27/15 4:27 PM from the specification file
+ * on 11/30/15 6:43 PM from the specification file
  * <tt>/Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex</tt>
  */
 class _KDocLexer implements FlexLexer {

compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex

@@ -246,6 +246,7 @@ LONG_TEMPLATE_ENTRY_START=\$\{
 "throw"      { return KtTokens.THROW_KEYWORD ;}
 "false"      { return KtTokens.FALSE_KEYWORD ;}
 "super"      { return KtTokens.SUPER_KEYWORD ;}
+"yield"      { return KtTokens.YIELD_KEYWORD ;}
 "when"       { return KtTokens.WHEN_KEYWORD ;}
 "true"       { return KtTokens.TRUE_KEYWORD ;}
 "this"       { return KtTokens.THIS_KEYWORD ;}

compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java

@@ -77,6 +77,9 @@ public interface KtTokens {
     KtKeywordToken WHEN_KEYWORD             = KtKeywordToken.keyword("when");
     KtKeywordToken INTERFACE_KEYWORD        = KtKeywordToken.keyword("interface");
 
+    // Reserved for future use:
+    KtKeywordToken YIELD_KEYWORD            = KtKeywordToken.keyword("yield");
+
     KtToken AS_SAFE = KtKeywordToken.keyword("AS_SAFE");//new KtToken("as?");
 
     KtToken IDENTIFIER = new KtToken("IDENTIFIER");
@@ -188,7 +191,8 @@ public interface KtTokens {
                                         TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
                                         IN_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD,
                                         ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, TRY_KEYWORD, WHEN_KEYWORD,
-                                        NOT_IN, NOT_IS, AS_SAFE
+                                        NOT_IN, NOT_IS, AS_SAFE,
+                                        YIELD_KEYWORD
     );
 
     TokenSet SOFT_KEYWORDS = TokenSet.create(FILE_KEYWORD, IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,

compiler/testData/psi/Reserved.kt

@@ -0,0 +1,5 @@
+fun yield() {}
+
+fun test() {
+    yield
+}

compiler/testData/psi/Reserved.txt

@@ -0,0 +1,33 @@
+JetFile: Reserved.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Expecting function name or receiver type
+      PsiElement(yield)('yield')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('test')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      PsiErrorElement:Expecting an element
+        PsiElement(yield)('yield')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java

@@ -637,6 +637,12 @@ public class ParsingTestGenerated extends AbstractParsingTest {
             doParsingTest(fileName);
         }
 
+        @TestMetadata("Reserved.kt")
+        public void testReserved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Reserved.kt");
+            doParsingTest(fileName);
+        }
+
         @TestMetadata("RootPackage.kt")
         public void testRootPackage() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/RootPackage.kt");

core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java

@@ -51,6 +51,7 @@ public class KeywordStringsGenerated {
         "while",
         "do",
         "when",
-        "interface"
+        "interface",
+        "yield"
     ));
 }

generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt

@@ -320,7 +320,8 @@ class TestDataBuilder() {
                             error("The file '$fileName' unexpectedly exists when create test data from scratch.")
                         }
                     } else if (!isCreatingFromScratch) {
-                        error("Unexpected new testdata file: '$fileName'. It may cause for example because of bug in stdlib.")
+                        error("Unexpected new testdata file: '$fileName'. It may cause for example because of bug in stdlib.\n" +
+                              "If a new keyword has been added, delete SHOULD_BE_ESCAPED.txt and SHOULD_NOT_BE_ESCAPED.txt")
                     }
 
                     GeneratorsFileUtil.writeFileIfContentChanged(testDataFile, out, false)

j2k/testData/fileOrElement/identifier/keywords.java

@@ -1,2 +1,2 @@
 //statement
-int as, type, val, var, fun, is, in, object, when;
+int as, type, val, var, fun, is, in, object, when, yield;

j2k/testData/fileOrElement/identifier/keywords.kt

@@ -6,4 +6,5 @@ val `fun`: Int
 val `is`: Int
 val `in`: Int
 val `object`: Int
-val `when`: Int
+val `when`: Int
+val `yield`: Int

j2k/testData/fileOrElement/importStatement/importWithKeywords.java

@@ -1,6 +1,6 @@
 //file
 package test;
 
-import as.type.val.var.fun.is.in.object.when;
+import as.type.val.var.fun.is.in.object.when.yield;
 
 class Test {}

j2k/testData/fileOrElement/importStatement/importWithKeywords.kt

@@ -1,6 +1,6 @@
 // ERROR: Unresolved reference: `as`
 package test
 
-import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`
+import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`yield`
 
 internal class Test

js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt

@@ -18,4 +18,5 @@ throw
 true
 try
 var
-while
+while
+yield

js/js.translator/testData/reservedWords/cases/SHOULD_NOT_BE_ESCAPED.txt

@@ -29,5 +29,4 @@ switch
 typeof
 undefined
 void
-with
-yield
+with

js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt

@@ -1,15 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-data class DataClass(val undefined: String) {
-    init {
-        testNotRenamed("undefined", { undefined })
-    }
-}
-
-fun box(): String {
-    DataClass("123")
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/dataClassValVar.kt

@@ -2,17 +2,14 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
-    var `var`: Int = 0
-
-    fun test() {
+data class DataClass(val `var`: String) {
+    init {
         testNotRenamed("var", { `var` })
     }
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    DataClass("123")
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt

@@ -2,17 +2,14 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
-    var `while`: Int = 0
-
-    fun test() {
+data class DataClass(val `while`: String) {
+    init {
         testNotRenamed("while", { `while` })
     }
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    DataClass("123")
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/dataClassValWith.kt

@@ -2,7 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-data class DataClass(var with: String) {
+data class DataClass(val with: String) {
     init {
         testNotRenamed("with", { with })
     }

js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt

@@ -2,7 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-data class DataClass(val `break`: String) {
+data class DataClass(var `break`: String) {
     init {
         testNotRenamed("break", { `break` })
     }

js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt

@@ -1,15 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-data class DataClass(var `continue`: String) {
-    init {
-        testNotRenamed("continue", { `continue` })
-    }
-}
-
-fun box(): String {
-    DataClass("123")
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt

@@ -2,9 +2,9 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-data class DataClass(val `class`: String) {
+data class DataClass(var Infinity: String) {
     init {
-        testNotRenamed("class", { `class` })
+        testNotRenamed("Infinity", { Infinity })
     }
 }
 

js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt

@@ -2,9 +2,9 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-data class DataClass(var `do`: String) {
+data class DataClass(var Kotlin: String) {
     init {
-        testNotRenamed("do", { `do` })
+        testNotRenamed("Kotlin", { Kotlin })
     }
 }
 

js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt

@@ -2,9 +2,9 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-data class DataClass(var yield: String) {
+data class DataClass(var `yield`: String) {
     init {
-        testNotRenamed("yield", { yield })
+        testNotRenamed("yield", { `yield` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun `null`()
+    fun debugger()
 }
 
 class TraitImpl : Trait {
-    override fun `null`() { `null`() }
+    override fun debugger() { debugger() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("null", { `null`() })
+        testNotRenamed("debugger", { debugger() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun const()
+    fun default()
 }
 
 class TraitImpl : Trait {
-    override fun const() { const() }
+    override fun default() { default() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("const", { const() })
+        testNotRenamed("default", { default() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    val NaN: Int
+    fun `if`()
 }
 
 class TraitImpl : Trait {
-    override val NaN: Int = 0
+    override fun `if`() { `if`() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("NaN", { NaN })
+        testNotRenamed("if", { `if`() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    var `in`: Int
+    fun `in`()
 }
 
 class TraitImpl : Trait {
-    override var `in`: Int = 0
+    override fun `in`() { `in`() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("in", { `in` })
+        testNotRenamed("in", { `in`() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt

@@ -1,23 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-interface Trait {
-    fun `package`()
-}
-
-class TraitImpl : Trait {
-    override fun `package`() { `package`() }
-}
-
-class TestDelegate : Trait by TraitImpl() {
-    fun test() {
-        testNotRenamed("package", { `package`() })
-    }
-}
-
-fun box(): String {
-    TestDelegate().test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt

@@ -3,13 +3,13 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun foo(`super`: String)
+    fun foo(delete: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(`super`: String) {
-    assertEquals("123", `super`)
-    testRenamed("super", { `super` })
+    override fun foo(delete: String) {
+    assertEquals("123", delete)
+    testRenamed("delete", { delete })
 }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt

@@ -3,13 +3,13 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun foo(default: String)
+    fun foo(enum: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(default: String) {
-    assertEquals("123", default)
-    testRenamed("default", { default })
+    override fun foo(enum: String) {
+    assertEquals("123", enum)
+    testRenamed("enum", { enum })
 }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt

@@ -3,13 +3,13 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun foo(debugger: String)
+    fun foo(`interface`: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(debugger: String) {
-    assertEquals("123", debugger)
-    testRenamed("debugger", { debugger })
+    override fun foo(`interface`: String) {
+    assertEquals("123", `interface`)
+    testRenamed("interface", { `interface` })
 }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt

@@ -3,13 +3,13 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun foo(`return`: String)
+    fun foo(`null`: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(`return`: String) {
-    assertEquals("123", `return`)
-    testRenamed("return", { `return` })
+    override fun foo(`null`: String) {
+    assertEquals("123", `null`)
+    testRenamed("null", { `null` })
 }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt

@@ -12,7 +12,7 @@ class TraitImpl : Trait {
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testRenamed("enum", { enum@ while (false) {} })
+        testRenamed("eval", { eval@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt

@@ -12,7 +12,7 @@ class TraitImpl : Trait {
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testRenamed("this", { `this`@ while (false) {} })
+        testRenamed("export", { export@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt

@@ -12,7 +12,7 @@ class TraitImpl : Trait {
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testRenamed("delete", { delete@ while (false) {} })
+        testRenamed("package", { `package`@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt

@@ -12,7 +12,7 @@ class TraitImpl : Trait {
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testRenamed("throw", { `throw`@ while (false) {} })
+        testRenamed("return", { `return`@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt

@@ -1,23 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-interface Trait {
-    val arguments: Int
-}
-
-class TraitImpl : Trait {
-    override val arguments: Int = 0
-}
-
-class TestDelegate : Trait by TraitImpl() {
-    fun test() {
-        testNotRenamed("arguments", { arguments })
-    }
-}
-
-fun box(): String {
-    TestDelegate().test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    var await: Int
+    val await: Int
 }
 
 class TraitImpl : Trait {
-    override var await: Int = 0
+    override val await: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {

js/js.translator/testData/reservedWords/cases/delegatedValCase.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    var case: Int
+    val case: Int
 }
 
 class TraitImpl : Trait {
-    override var case: Int = 0
+    override val case: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {

js/js.translator/testData/reservedWords/cases/delegatedValDo.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    val `if`: Int
+    val `do`: Int
 }
 
 class TraitImpl : Trait {
-    override val `if`: Int = 0
+    override val `do`: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("if", { `if` })
+        testNotRenamed("do", { `do` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedValElse.kt

@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+    val `else`: Int
+}
+
+class TraitImpl : Trait {
+    override val `else`: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+    fun test() {
+        testNotRenamed("else", { `else` })
+    }
+}
+
+fun box(): String {
+    TestDelegate().test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt

@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+    var catch: Int
+}
+
+class TraitImpl : Trait {
+    override var catch: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+    fun test() {
+        testNotRenamed("catch", { catch })
+    }
+}
+
+fun box(): String {
+    TestDelegate().test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt

@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+    var const: Int
+}
+
+class TraitImpl : Trait {
+    override var const: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+    fun test() {
+        testNotRenamed("const", { const })
+    }
+}
+
+fun box(): String {
+    TestDelegate().test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt

@@ -3,16 +3,16 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    fun catch()
+    var `false`: Int
 }
 
 class TraitImpl : Trait {
-    override fun catch() { catch() }
+    override var `false`: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("catch", { catch() })
+        testNotRenamed("false", { `false` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 interface Trait {
-    val `for`: Int
+    var `for`: Int
 }
 
 class TraitImpl : Trait {
-    override val `for`: Int = 0
+    override var `for`: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {

js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt

@@ -1,23 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-interface Trait {
-    var `interface`: Int
-}
-
-class TraitImpl : Trait {
-    override var `interface`: Int = 0
-}
-
-class TestDelegate : Trait by TraitImpl() {
-    fun test() {
-        testNotRenamed("interface", { `interface` })
-    }
-}
-
-fun box(): String {
-    TestDelegate().test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 enum class Foo {
-    `protected`
+    `continue`
 }
 
 fun box(): String {
-    testNotRenamed("protected", { Foo.`protected` })
+    testNotRenamed("continue", { Foo.`continue` })
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/enumEntryDo.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 enum class Foo {
-    `if`
+    `do`
 }
 
 fun box(): String {
-    testNotRenamed("if", { Foo.`if` })
+    testNotRenamed("do", { Foo.`do` })
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 enum class Foo {
-    `private`
+    `public`
 }
 
 fun box(): String {
-    testNotRenamed("private", { Foo.`private` })
+    testNotRenamed("public", { Foo.`public` })
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt

@@ -3,11 +3,11 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 enum class Foo {
-    `for`
+    static
 }
 
 fun box(): String {
-    testNotRenamed("for", { Foo.`for` })
+    testNotRenamed("static", { Foo.static })
 
     return "OK"
 }

js/js.translator/testData/reservedWords/cases/enumFunFunction.kt

@@ -1,18 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-enum class Foo {
-    BAR;
-    fun function() { function() }
-
-    fun test() {
-        testNotRenamed("function", { function() })
-    }
-}
-
-fun box(): String {
-    Foo.BAR.test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/enumFunImplements.kt

@@ -1,18 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-enum class Foo {
-    BAR;
-    fun implements() { implements() }
-
-    fun test() {
-        testNotRenamed("implements", { implements() })
-    }
-}
-
-fun box(): String {
-    Foo.BAR.test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/enumFunImport.kt

@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+    BAR;
+    fun import() { import() }
+
+    fun test() {
+        testNotRenamed("import", { import() })
+    }
+}
+
+fun box(): String {
+    Foo.BAR.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt

@@ -4,10 +4,10 @@ package foo
 
 enum class Foo {
     BAR;
-    fun `class`() { `class`() }
+    fun instanceof() { instanceof() }
 
     fun test() {
-        testNotRenamed("class", { `class`() })
+        testNotRenamed("instanceof", { instanceof() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt

@@ -4,9 +4,9 @@ package foo
 
 enum class Foo {
     BAR;
-    fun foo(`do`: String) {
-    assertEquals("123", `do`)
-    testRenamed("do", { `do` })
+    fun foo(let: String) {
+    assertEquals("123", let)
+    testRenamed("let", { let })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt

@@ -4,9 +4,9 @@ package foo
 
 enum class Foo {
     BAR;
-    fun foo(import: String) {
-    assertEquals("123", import)
-    testRenamed("import", { import })
+    fun foo(new: String) {
+    assertEquals("123", new)
+    testRenamed("new", { new })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt

@@ -4,9 +4,9 @@ package foo
 
 enum class Foo {
     BAR;
-    fun foo(`continue`: String) {
-    assertEquals("123", `continue`)
-    testRenamed("continue", { `continue` })
+    fun foo(`while`: String) {
+    assertEquals("123", `while`)
+    testRenamed("while", { `while` })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt

@@ -4,9 +4,9 @@ package foo
 
 enum class Foo {
     BAR;
-    fun foo(instanceof: String) {
-    assertEquals("123", instanceof)
-    testRenamed("instanceof", { instanceof })
+    fun foo(`yield`: String) {
+    assertEquals("123", `yield`)
+    testRenamed("yield", { `yield` })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/enumFunTry.kt

@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+    BAR;
+    fun `try`() { `try`() }
+
+    fun test() {
+        testNotRenamed("try", { `try`() })
+    }
+}
+
+fun box(): String {
+    Foo.BAR.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/enumFunVar.kt

@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+    BAR;
+    fun `var`() { `var`() }
+
+    fun test() {
+        testNotRenamed("var", { `var`() })
+    }
+}
+
+fun box(): String {
+    Foo.BAR.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt

@@ -7,7 +7,7 @@ enum class Foo {
     val t: Int = 0
 
     fun test() {
-        testRenamed("let", { let@ while (false) {} })
+        testRenamed("break", { `break`@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumLabelClass.kt

@@ -7,7 +7,7 @@ enum class Foo {
     val t: Int = 0
 
     fun test() {
-        testRenamed("new", { new@ while (false) {} })
+        testRenamed("class", { `class`@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt

@@ -7,7 +7,7 @@ enum class Foo {
     val t: Int = 0
 
     fun test() {
-        testRenamed("false", { `false`@ while (false) {} })
+        testRenamed("private", { private@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt

@@ -7,7 +7,7 @@ enum class Foo {
     val t: Int = 0
 
     fun test() {
-        testRenamed("else", { `else`@ while (false) {} })
+        testRenamed("protected", { protected@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumValExtends.kt

@@ -4,7 +4,7 @@ package foo
 
 enum class Foo {
     BAR;
-    var extends: Int = 0
+    val extends: Int = 0
 
     fun test() {
         testNotRenamed("extends", { extends })

js/js.translator/testData/reservedWords/cases/enumValFinally.kt

@@ -4,7 +4,7 @@ package foo
 
 enum class Foo {
     BAR;
-    var finally: Int = 0
+    val finally: Int = 0
 
     fun test() {
         testNotRenamed("finally", { finally })

js/js.translator/testData/reservedWords/cases/enumValSuper.kt

@@ -4,10 +4,10 @@ package foo
 
 enum class Foo {
     BAR;
-    val eval: Int = 0
+    val `super`: Int = 0
 
     fun test() {
-        testNotRenamed("eval", { eval })
+        testNotRenamed("super", { `super` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumValThis.kt

@@ -4,10 +4,10 @@ package foo
 
 enum class Foo {
     BAR;
-    val `try`: Int = 0
+    val `this`: Int = 0
 
     fun test() {
-        testNotRenamed("try", { `try` })
+        testNotRenamed("this", { `this` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumVarFunction.kt

@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+    BAR;
+    var function: Int = 0
+
+    fun test() {
+        testNotRenamed("function", { function })
+    }
+}
+
+fun box(): String {
+    Foo.BAR.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/enumVarImplements.kt

@@ -4,10 +4,10 @@ package foo
 
 enum class Foo {
     BAR;
-    fun `break`() { `break`() }
+    var implements: Int = 0
 
     fun test() {
-        testNotRenamed("break", { `break`() })
+        testNotRenamed("implements", { implements })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumVarThrow.kt

@@ -4,10 +4,10 @@ package foo
 
 enum class Foo {
     BAR;
-    val export: Int = 0
+    var `throw`: Int = 0
 
     fun test() {
-        testNotRenamed("export", { export })
+        testNotRenamed("throw", { `throw` })
     }
 }
 

js/js.translator/testData/reservedWords/cases/enumVarTrue.kt

@@ -4,7 +4,7 @@ package foo
 
 enum class Foo {
     BAR;
-    val `true`: Int = 0
+    var `true`: Int = 0
 
     fun test() {
         testNotRenamed("true", { `true` })

js/js.translator/testData/reservedWords/cases/insideClassFunAwait.kt

@@ -3,10 +3,10 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 class TestClass {
-    var `super`: Int = 0
+    fun await() { await() }
 
     fun test() {
-        testNotRenamed("super", { `super` })
+        testNotRenamed("await", { await() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/insideClassFunParamCatch.kt

@@ -3,9 +3,9 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 class TestClass {
-    fun foo(await: String) {
-    assertEquals("123", await)
-    testRenamed("await", { await })
+    fun foo(catch: String) {
+    assertEquals("123", catch)
+    testRenamed("catch", { catch })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/insideClassFunParamThrow.kt

@@ -3,9 +3,9 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 class TestClass {
-    fun foo(`try`: String) {
-    assertEquals("123", `try`)
-    testRenamed("try", { `try` })
+    fun foo(`throw`: String) {
+    assertEquals("123", `throw`)
+    testRenamed("throw", { `throw` })
 }
 
     fun test() {

js/js.translator/testData/reservedWords/cases/insideClassFunSuper.kt

@@ -3,10 +3,10 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 class TestClass {
-    fun `throw`() { `throw`() }
+    fun `super`() { `super`() }
 
     fun test() {
-        testNotRenamed("throw", { `throw`() })
+        testNotRenamed("super", { `super`() })
     }
 }
 

js/js.translator/testData/reservedWords/cases/insideClassLabelDebugger.kt

@@ -6,7 +6,7 @@ class TestClass {
     val t: Int = 0
 
     fun test() {
-        testRenamed("while", { `while`@ while (false) {} })
+        testRenamed("debugger", { debugger@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/insideClassLabelTry.kt

@@ -6,7 +6,7 @@ class TestClass {
     val t: Int = 0
 
     fun test() {
-        testRenamed("catch", { catch@ while (false) {} })
+        testRenamed("try", { `try`@ while (false) {} })
     }
 }
 

js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt

@@ -4,10 +4,10 @@ package foo
 
 class TestClass {
     companion object {
-        fun `false`() { `false`() }
+        fun `continue`() { `continue`() }
 
         fun test() {
-            testNotRenamed("false", { `false`() })
+            testNotRenamed("continue", { `continue`() })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt

@@ -4,10 +4,10 @@ package foo
 
 class TestClass {
     companion object {
-        fun eval() { eval() }
+        fun `do`() { `do`() }
 
         fun test() {
-            testNotRenamed("eval", { eval() })
+            testNotRenamed("do", { `do`() })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectFunExtends.kt

@@ -4,10 +4,10 @@ package foo
 
 class TestClass {
     companion object {
-        fun `else`() { `else`() }
+        fun extends() { extends() }
 
         fun test() {
-            testNotRenamed("else", { `else`() })
+            testNotRenamed("extends", { extends() })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt

@@ -4,9 +4,9 @@ package foo
 
 class TestClass {
     companion object {
-        fun foo(`for`: String) {
-    assertEquals("123", `for`)
-    testRenamed("for", { `for` })
+        fun foo(`else`: String) {
+    assertEquals("123", `else`)
+    testRenamed("else", { `else` })
 }
 
         fun test() {

js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt

@@ -4,9 +4,9 @@ package foo
 
 class TestClass {
     companion object {
-        fun foo(`if`: String) {
-    assertEquals("123", `if`)
-    testRenamed("if", { `if` })
+        fun foo(`false`: String) {
+    assertEquals("123", `false`)
+    testRenamed("false", { `false` })
 }
 
         fun test() {

js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFunction.kt

@@ -4,9 +4,9 @@ package foo
 
 class TestClass {
     companion object {
-        fun foo(extends: String) {
-    assertEquals("123", extends)
-    testRenamed("extends", { extends })
+        fun foo(function: String) {
+    assertEquals("123", function)
+    testRenamed("function", { function })
 }
 
         fun test() {

js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt

@@ -7,7 +7,7 @@ class TestClass {
         val t: Int = 0
 
         fun test() {
-            testRenamed("function", { function@ while (false) {} })
+            testRenamed("for", { `for`@ while (false) {} })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt

@@ -7,7 +7,7 @@ class TestClass {
         val t: Int = 0
 
         fun test() {
-            testRenamed("in", { `in`@ while (false) {} })
+            testRenamed("if", { `if`@ while (false) {} })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImport.kt

@@ -7,7 +7,7 @@ class TestClass {
         val t: Int = 0
 
         fun test() {
-            testRenamed("interface", { `interface`@ while (false) {} })
+            testRenamed("import", { import@ while (false) {} })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt

@@ -1,19 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-class TestClass {
-    companion object {
-        val debugger: Int = 0
-
-        fun test() {
-            testNotRenamed("debugger", { debugger })
-        }
-    }
-}
-
-fun box(): String {
-    TestClass.test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/insideClassObjectValDelete.kt

@@ -4,7 +4,7 @@ package foo
 
 class TestClass {
     companion object {
-        var delete: Int = 0
+        val delete: Int = 0
 
         fun test() {
             testNotRenamed("delete", { delete })

js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt

@@ -0,0 +1,19 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+class TestClass {
+    companion object {
+        val `while`: Int = 0
+
+        fun test() {
+            testNotRenamed("while", { `while` })
+        }
+    }
+}
+
+fun box(): String {
+    TestClass.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt

@@ -0,0 +1,19 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+class TestClass {
+    companion object {
+        val `yield`: Int = 0
+
+        fun test() {
+            testNotRenamed("yield", { `yield` })
+        }
+    }
+}
+
+fun box(): String {
+    TestClass.test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt

@@ -4,7 +4,7 @@ package foo
 
 class TestClass {
     companion object {
-        val `break`: Int = 0
+        var `break`: Int = 0
 
         fun test() {
             testNotRenamed("break", { `break` })

js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt

@@ -4,7 +4,7 @@ package foo
 
 class TestClass {
     companion object {
-        val `class`: Int = 0
+        var `class`: Int = 0
 
         fun test() {
             testNotRenamed("class", { `class` })

js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt

@@ -1,19 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-class TestClass {
-    companion object {
-        var `continue`: Int = 0
-
-        fun test() {
-            testNotRenamed("continue", { `continue` })
-        }
-    }
-}
-
-fun box(): String {
-    TestClass.test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt

@@ -4,10 +4,10 @@ package foo
 
 class TestClass {
     companion object {
-        var `do`: Int = 0
+        var eval: Int = 0
 
         fun test() {
-            testNotRenamed("do", { `do` })
+            testNotRenamed("eval", { eval })
         }
     }
 }

js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt

@@ -3,7 +3,7 @@ package foo
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
 class TestClass {
-    var Infinity: Int = 0
+    val Infinity: Int = 0
 
     fun test() {
         testNotRenamed("Infinity", { Infinity })

js/js.translator/testData/reservedWords/cases/insideClassValInterface.kt

@@ -0,0 +1,17 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+class TestClass {
+    val `interface`: Int = 0
+
+    fun test() {
+        testNotRenamed("interface", { `interface` })
+    }
+}
+
+fun box(): String {
+    TestClass().test()
+
+    return "OK"
+}

js/js.translator/testData/reservedWords/cases/insideClassValYield.kt

@@ -1,17 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-class TestClass {
-    val yield: Int = 0
-
-    fun test() {
-        testNotRenamed("yield", { yield })
-    }
-}
-
-fun box(): String {
-    TestClass().test()
-
-    return "OK"
-}