Revert "'yield' reserved as a keyword"

This reverts commit 434082cadb.

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

@@ -19,5 +19,4 @@ true
 try
 typeof
 var
-while
-yield
+while

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

@@ -28,4 +28,5 @@ static
 switch
 undefined
 void
-with
+with
+yield

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 `else`()
+    fun debugger()
 }
 
 class TraitImpl : Trait {
-    override fun `else`() { `else`() }
+    override fun debugger() { debugger() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("else", { `else`() })
+        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 delete()
+    fun default()
 }
 
 class TraitImpl : Trait {
-    override fun delete() { delete() }
+    override fun default() { default() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("delete", { delete() })
+        testNotRenamed("default", { default() })
     }
 }
 

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

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

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 {
-    fun enum()
+    fun `if`()
 }
 
 class TraitImpl : Trait {
-    override fun enum() { enum() }
+    override fun `if`() { `if`() }
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("enum", { enum() })
+        testNotRenamed("if", { `if`() })
     }
 }
 

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

@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+    fun `in`()
+}
+
+class TraitImpl : Trait {
+    override fun `in`() { `in`() }
+}
+
+class TestDelegate : Trait by TraitImpl() {
+    fun test() {
+        testNotRenamed("in", { `in`() })
+    }
+}
+
+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(export: String)
+    fun foo(delete: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(export: String) {
-    assertEquals("123", export)
-    testRenamed("export", { export })
+    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(eval: String)
+    fun foo(enum: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(eval: String) {
-    assertEquals("123", eval)
-    testRenamed("eval", { eval })
+    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(`if`: String)
+    fun foo(`interface`: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(`if`: String) {
-    assertEquals("123", `if`)
-    testRenamed("if", { `if` })
+    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(`for`: String)
+    fun foo(`null`: String)
 }
 
 class TraitImpl : Trait {
-    override fun foo(`for`: String) {
-    assertEquals("123", `for`)
-    testRenamed("for", { `for` })
+    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("in", { `in`@ 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("finally", { finally@ 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("interface", { `interface`@ 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("extends", { extends@ while (false) {} })
+        testRenamed("return", { `return`@ while (false) {} })
     }
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,23 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-interface Trait {
-    var default: Int
-}
-
-class TraitImpl : Trait {
-    override var default: Int = 0
-}
-
-class TestDelegate : Trait by TraitImpl() {
-    fun test() {
-        testNotRenamed("default", { default })
-    }
-}
-
-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 {
-    val `break`: Int
+    var `false`: Int
 }
 
 class TraitImpl : Trait {
-    override val `break`: Int = 0
+    override var `false`: Int = 0
 }
 
 class TestDelegate : Trait by TraitImpl() {
     fun test() {
-        testNotRenamed("break", { `break` })
+        testNotRenamed("false", { `false` })
     }
 }
 

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

@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+    var `for`: Int
+}
+
+class TraitImpl : Trait {
+    override var `for`: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+    fun test() {
+        testNotRenamed("for", { `for` })
+    }
+}
+
+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 {
-    undefined
+    `continue`
 }
 
 fun box(): String {
-    testNotRenamed("undefined", { Foo.undefined })
+    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 {
-    switch
+    `do`
 }
 
 fun box(): String {
-    testNotRenamed("switch", { Foo.switch })
+    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 {
-    `while`
+    `public`
 }
 
 fun box(): String {
-    testNotRenamed("while", { Foo.`while` })
+    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 {
-    `yield`
+    static
 }
 
 fun box(): String {
-    testNotRenamed("yield", { Foo.`yield` })
+    testNotRenamed("static", { Foo.static })
 
     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

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

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

@@ -4,9 +4,9 @@ package foo
 
 enum class Foo {
     BAR;
-    fun foo(`try`: String) {
-    assertEquals("123", `try`)
-    testRenamed("try", { `try` })
+    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(private: String) {
-    assertEquals("123", private)
-    testRenamed("private", { private })
+    fun foo(new: String) {
+    assertEquals("123", new)
+    testRenamed("new", { new })
 }
 
     fun test() {

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@ enum class Foo {
     val t: Int = 0
 
     fun test() {
-        testRenamed("public", { public@ 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("static", { static@ 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("var", { `var`@ while (false) {} })
+        testRenamed("private", { private@ while (false) {} })
     }
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,8 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
+class TestClass {
     fun foo(`true`: String) {
     assertEquals("123", `true`)
     testRenamed("true", { `true` })
@@ -15,7 +14,7 @@ enum class Foo {
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    TestClass().test()
 
     return "OK"
 }

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

@@ -2,8 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
+class TestClass {
     fun `this`() { `this`() }
 
     fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    TestClass().test()
 
     return "OK"
 }

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

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

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

@@ -2,8 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
+class TestClass {
     val t: Int = 0
 
     fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    TestClass().test()
 
     return "OK"
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -4,9 +4,9 @@ package foo
 
 class TestClass {
     companion object {
-        fun foo(`do`: String) {
-    assertEquals("123", `do`)
-    testRenamed("do", { `do` })
+        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(`continue`: String) {
-    assertEquals("123", `continue`)
-    testRenamed("continue", { `continue` })
+        fun foo(`false`: String) {
+    assertEquals("123", `false`)
+    testRenamed("false", { `false` })
 }
 
         fun test() {

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

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

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

@@ -7,7 +7,7 @@ class TestClass {
         val t: Int = 0
 
         fun test() {
-            testRenamed("else", { `else`@ 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("false", { `false`@ while (false) {} })
+            testRenamed("if", { `if`@ while (false) {} })
         }
     }
 }

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

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

js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.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 default: Int = 0
+
+        fun test() {
+            testNotRenamed("default", { default })
+        }
+    }
+}
+
+fun box(): String {
+    TestClass.test()
+
+    return "OK"
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,8 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-enum class Foo {
-    BAR;
+class TestClass {
     var `return`: Int = 0
 
     fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
 }
 
 fun box(): String {
-    Foo.BAR.test()
+    TestClass().test()
 
     return "OK"
 }

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

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

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

@@ -2,7 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-class TestClass {
+object TestObject {
     fun foo(`this`: String) {
     assertEquals("123", `this`)
     testRenamed("this", { `this` })
@@ -14,7 +14,7 @@ class TestClass {
 }
 
 fun box(): String {
-    TestClass().test()
+    TestObject.test()
 
     return "OK"
 }

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

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

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

@@ -1,20 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-object TestObject {
-    fun foo(undefined: String) {
-    assertEquals("123", undefined)
-    testRenamed("undefined", { undefined })
-}
-
-    fun test() {
-        foo("123")
-    }
-}
-
-fun box(): String {
-    TestObject.test()
-
-    return "OK"
-}

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

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

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

@@ -2,7 +2,7 @@ package foo
 
 // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
 
-class TestClass {
+object TestObject {
     fun `return`() { `return`() }
 
     fun test() {
@@ -11,7 +11,7 @@ class TestClass {
 }
 
 fun box(): String {
-    TestClass().test()
+    TestObject.test()
 
     return "OK"
 }

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

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

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

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

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

@@ -1,17 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-object TestObject {
-    val t: Int = 0
-
-    fun test() {
-        testRenamed("this", { `this`@ while (false) {} })
-    }
-}
-
-fun box(): String {
-    TestObject.test()
-
-    return "OK"
-}

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

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

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

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

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

@@ -6,7 +6,7 @@ object TestObject {
     val t: Int = 0
 
     fun test() {
-        testRenamed("throw", { `throw`@ while (false) {} })
+        testRenamed("undefined", { undefined@ while (false) {} })
     }
 }