Reserve 'typeof' as a keyword

js/js.translator/testData/native/cases/secondaryConstructor.kt

@@ -12,7 +12,7 @@ class A {
 fun test(a: A, expectedValue: Any?, expectedTypeOfValue: String) {
     assertTrue(a is A)
     assertEquals(expectedValue, a.value)
-    assertEquals(expectedTypeOfValue, typeof(a.value))
+    assertEquals(expectedTypeOfValue, jsTypeOf(a.value))
 }
 
 fun box(): String {

js/js.translator/testData/native/cases/typeof.kt

@@ -3,14 +3,14 @@ package foo
 class A
 
 fun box(): String {
-    assertEquals("number", typeof(1))
-    assertEquals("number", typeof(1.2))
-    assertEquals("boolean", typeof(true))
-    assertEquals("string", typeof("sss"))
-    assertEquals("object", typeof(null))
-    assertEquals("undefined", typeof(undefined))
-    assertEquals("object", typeof(object {}))
-    assertEquals("object", typeof(A()))
+    assertEquals("number", jsTypeOf(1))
+    assertEquals("number", jsTypeOf(1.2))
+    assertEquals("boolean", jsTypeOf(true))
+    assertEquals("string", jsTypeOf("sss"))
+    assertEquals("object", jsTypeOf(null))
+    assertEquals("undefined", jsTypeOf(undefined))
+    assertEquals("object", jsTypeOf(object {}))
+    assertEquals("object", jsTypeOf(A()))
 
     return "OK"
 }

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

@@ -17,6 +17,7 @@ this
 throw
 true
 try
+typeof
 var
 while
 yield

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

@@ -26,7 +26,6 @@ protected
 public
 static
 switch
-typeof
 undefined
 void
 with

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,23 @@
+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/delegatedFunParamEval.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,23 +0,0 @@
-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/delegatedVarContinue.kt

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

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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,23 @@
+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/delegatedVarDo.kt

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

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

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

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

@@ -1,23 +0,0 @@
-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/enumEntrySwitch.kt

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

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

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

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

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

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

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

js/js.translator/testData/reservedWords/cases/enumFunInstanceof.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 instanceof() { instanceof() }
-
-    fun test() {
-        testNotRenamed("instanceof", { instanceof() })
-    }
-}
-
-fun box(): String {
-    Foo.BAR.test()
-
-    return "OK"
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

js/js.translator/testData/reservedWords/cases/enumFunTry.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 `try`() { `try`() }
-
-    fun test() {
-        testNotRenamed("try", { `try`() })
-    }
-}
-
-fun box(): String {
-    Foo.BAR.test()
-
-    return "OK"
-}

js/js.translator/testData/reservedWords/cases/enumFunVar.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 `var`() { `var`() }
-
-    fun test() {
-        testNotRenamed("var", { `var`() })
-    }
-}
-
-fun box(): String {
-    Foo.BAR.test()
-
-    return "OK"
-}

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

@@ -1,18 +0,0 @@
-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/enumLabelPublic.kt

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

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

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

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

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

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

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

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

@@ -1,18 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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/enumValFunction.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+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

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

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

@@ -0,0 +1,19 @@
+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/insideClassObjectFunParamContinue.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+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/insideClassVarNull.kt

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

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

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

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

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