diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 5b98d26e66f..e6bb17a1b5d 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -189,7 +189,7 @@ fun box(): String { suite("enum", """ enum class Foo { - BAR + BAR; $DEFINITION_MARKER fun test() { diff --git a/js/js.translator/testData/defaultArguments/cases/enumWithDefArg.kt b/js/js.translator/testData/defaultArguments/cases/enumWithDefArg.kt index 5d8294fbe50..007704be137 100644 --- a/js/js.translator/testData/defaultArguments/cases/enumWithDefArg.kt +++ b/js/js.translator/testData/defaultArguments/cases/enumWithDefArg.kt @@ -1,8 +1,8 @@ package foo enum class A(val a: Int = 1) { - FIRST: A() - SECOND: A(2) + FIRST(), + SECOND(2) } fun box(): String { diff --git a/js/js.translator/testData/defaultArguments/cases/enumWithOneDefArg.kt b/js/js.translator/testData/defaultArguments/cases/enumWithOneDefArg.kt index 310776dade5..5a8b1570002 100644 --- a/js/js.translator/testData/defaultArguments/cases/enumWithOneDefArg.kt +++ b/js/js.translator/testData/defaultArguments/cases/enumWithOneDefArg.kt @@ -1,8 +1,8 @@ package foo enum class Foo(val a: Int = 1, val b: String) { - B: Foo(2, "b") - C: Foo(b = "b") + B(2, "b"), + C(b = "b") } fun box(): String { diff --git a/js/js.translator/testData/defaultArguments/cases/enumWithTwoDefArgs.kt b/js/js.translator/testData/defaultArguments/cases/enumWithTwoDefArgs.kt index 480b215f08b..f5b05da0529 100644 --- a/js/js.translator/testData/defaultArguments/cases/enumWithTwoDefArgs.kt +++ b/js/js.translator/testData/defaultArguments/cases/enumWithTwoDefArgs.kt @@ -1,10 +1,10 @@ package foo enum class Foo(val a: Int = 1, val b: String = "a") { - A: Foo() - B: Foo(2, "b") - C: Foo(b = "b") - D: Foo(a = 2) + A(), + B(2, "b"), + C(b = "b"), + D(a = 2) } fun box(): String { diff --git a/js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt b/js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt index 9eb68d694ca..9eba342653a 100644 --- a/js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt +++ b/js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt @@ -1,9 +1,9 @@ package foo enum class Type { - NUMBER - STRING - BOOLEAN + NUMBER, + STRING, + BOOLEAN, OBJECT } diff --git a/js/js.translator/testData/enum/cases/accessing.kt b/js/js.translator/testData/enum/cases/accessing.kt index 75c77f1bdb5..57e61a38aa1 100644 --- a/js/js.translator/testData/enum/cases/accessing.kt +++ b/js/js.translator/testData/enum/cases/accessing.kt @@ -1,12 +1,12 @@ package foo enum class A { - FOO + FOO, - BAR : A() { + BAR() { fun explicitFromEntry() = A.FOO fun implicitFromEntry() = FOO - } + }; fun explicit() = A.FOO fun implicit() = FOO diff --git a/js/js.translator/testData/enum/cases/enumInheritedFromTrait.kt b/js/js.translator/testData/enum/cases/enumInheritedFromTrait.kt index 8f2554f2f29..a13d7506618 100644 --- a/js/js.translator/testData/enum/cases/enumInheritedFromTrait.kt +++ b/js/js.translator/testData/enum/cases/enumInheritedFromTrait.kt @@ -5,7 +5,7 @@ fun box() = MyEnum.E1.f() + MyEnum.E2.f() enum class MyEnum : T { E1 { override fun f() = "O" - } + }, E2 { override fun f() = "K" } diff --git a/js/js.translator/testData/enum/cases/enumIsComparable.kt b/js/js.translator/testData/enum/cases/enumIsComparable.kt index 8d22c961ee4..b0a66adc3f7 100644 --- a/js/js.translator/testData/enum/cases/enumIsComparable.kt +++ b/js/js.translator/testData/enum/cases/enumIsComparable.kt @@ -1,7 +1,7 @@ package foo enum class A { - one + one, two } diff --git a/js/js.translator/testData/enum/cases/enumWithInheritance.kt b/js/js.translator/testData/enum/cases/enumWithInheritance.kt index 35e3f2b9de7..74a75030167 100644 --- a/js/js.translator/testData/enum/cases/enumWithInheritance.kt +++ b/js/js.translator/testData/enum/cases/enumWithInheritance.kt @@ -1,15 +1,15 @@ package foo enum class B(open val bar: Int) { - a : B(0) { + a(0) { override val bar = 3 init { y = 0 } - } - b : B(4) { - } - c : B(5) + }, + b(4) { + }, + c(5); val x = 1 var y = 12; } @@ -22,8 +22,8 @@ trait X { } enum class Y(override val foo: Int) : X { - m:Y(3) - n:Y(6) + m(3), + n(6) } fun box(): String { diff --git a/js/js.translator/testData/enum/cases/nativeEnum.kt b/js/js.translator/testData/enum/cases/nativeEnum.kt index 36b50f9d595..f9a08044c07 100644 --- a/js/js.translator/testData/enum/cases/nativeEnum.kt +++ b/js/js.translator/testData/enum/cases/nativeEnum.kt @@ -2,8 +2,8 @@ package foo native enum class JsEnum { - Foo - Bar + Foo, + Bar, Baz } diff --git a/js/js.translator/testData/enum/cases/standardMethods.kt b/js/js.translator/testData/enum/cases/standardMethods.kt index c8517a574ee..5282e3a960c 100644 --- a/js/js.translator/testData/enum/cases/standardMethods.kt +++ b/js/js.translator/testData/enum/cases/standardMethods.kt @@ -7,9 +7,9 @@ enum class Simple { } enum class A { - a : A() { - } - b : A() + a() { + }, + b(), c } diff --git a/js/js.translator/testData/enum/cases/superCallInEnumLiteral.kt b/js/js.translator/testData/enum/cases/superCallInEnumLiteral.kt index 34cc7e532b3..91304904627 100644 --- a/js/js.translator/testData/enum/cases/superCallInEnumLiteral.kt +++ b/js/js.translator/testData/enum/cases/superCallInEnumLiteral.kt @@ -7,12 +7,12 @@ enum class E { override fun f(): String { return super.f() + "O" } - } + }, E2 { override fun f(): String { return super.f() + "K" } - } + }; open fun f() = "" } \ No newline at end of file diff --git a/js/js.translator/testData/expression/function/cases/lambdaOrLocalFunInsideEnumMethod.kt b/js/js.translator/testData/expression/function/cases/lambdaOrLocalFunInsideEnumMethod.kt index 80f9167915c..160f1b17ca8 100644 --- a/js/js.translator/testData/expression/function/cases/lambdaOrLocalFunInsideEnumMethod.kt +++ b/js/js.translator/testData/expression/function/cases/lambdaOrLocalFunInsideEnumMethod.kt @@ -1,7 +1,7 @@ package foo enum class Foo { - BAR + BAR; fun test(): () -> String { fun local() = 29 diff --git a/js/js.translator/testData/regression/cases/tmpInsidePrimaryConstructor.kt b/js/js.translator/testData/regression/cases/tmpInsidePrimaryConstructor.kt index dd4b1092167..80a7cd0643e 100644 --- a/js/js.translator/testData/regression/cases/tmpInsidePrimaryConstructor.kt +++ b/js/js.translator/testData/regression/cases/tmpInsidePrimaryConstructor.kt @@ -15,7 +15,7 @@ enum class E(val a: Int = 0) { val y = x ?: 4 override fun value() = y - }, + }; val e = x ?: 3 diff --git a/js/js.translator/testData/reservedWords/cases/enumFunContinue.kt b/js/js.translator/testData/reservedWords/cases/enumFunContinue.kt index a36d2088dd9..8edd208c0ca 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunContinue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunContinue.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun `continue`() { `continue`() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunDo.kt b/js/js.translator/testData/reservedWords/cases/enumFunDo.kt index 97e7d69e0cb..6a7523b18c1 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunDo.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunDo.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun `do`() { `do`() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunImport.kt b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt index 7e7ccb262f4..880326e7bf3 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunImport.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun import() { import() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt index 875c95f1f83..67f11ad28e3 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun instanceof() { instanceof() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamElse.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamElse.kt index c12c237a8e9..f74d4f167a4 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamElse.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamElse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun foo(`else`: String) { assertEquals("123", `else`) testRenamed("else", { `else` }) diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamFalse.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamFalse.kt index 90307feff29..df0d6d26d21 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamFalse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun foo(`false`: String) { assertEquals("123", `false`) testRenamed("false", { `false` }) diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt index c281954e849..7c1351c1f65 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun foo(let: String) { assertEquals("123", let) testRenamed("let", { let }) diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt index 3cb04eb0674..8a011e62d69 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; fun foo(new: String) { assertEquals("123", new) testRenamed("new", { new }) diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelFor.kt b/js/js.translator/testData/reservedWords/cases/enumLabelFor.kt index f31c0bfd5ee..956fa699bc5 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelFor.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelFor.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelIf.kt b/js/js.translator/testData/reservedWords/cases/enumLabelIf.kt index f1268fe3d7b..87e78b55b0c 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelIf.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelIf.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt index e8cc4bce7d7..f1099348369 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt index feaf0fdffc1..9c89ac68fc0 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumValExtends.kt b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt index 8b9e1c19f04..c140034ec4c 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValExtends.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val extends: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumValFinally.kt b/js/js.translator/testData/reservedWords/cases/enumValFinally.kt index 027c8c24f6f..f46b8045d09 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValFinally.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValFinally.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val finally: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumValVar.kt b/js/js.translator/testData/reservedWords/cases/enumValVar.kt index 2b53f888dfa..da8e2639e77 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValVar.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValVar.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val `var`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumValWhile.kt b/js/js.translator/testData/reservedWords/cases/enumValWhile.kt index b32cabcc239..00811288bf5 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValWhile.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; val `while`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumVarBreak.kt b/js/js.translator/testData/reservedWords/cases/enumVarBreak.kt index ecc07962613..af1b2241702 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarBreak.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; var `break`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumVarClass.kt b/js/js.translator/testData/reservedWords/cases/enumVarClass.kt index 438eff27153..abcf1304e7a 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarClass.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarClass.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; var `class`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt index c45b69048c5..b9c710d5529 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; var function: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt index e71f82bb75b..b33e6926c14 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - BAR + BAR; var implements: Int = 0 fun test() { diff --git a/js/js.translator/testData/rtti/cases/isJsPrimitiveType.kt b/js/js.translator/testData/rtti/cases/isJsPrimitiveType.kt index 70e9f60fafc..24b2d63f0e0 100644 --- a/js/js.translator/testData/rtti/cases/isJsPrimitiveType.kt +++ b/js/js.translator/testData/rtti/cases/isJsPrimitiveType.kt @@ -1,9 +1,9 @@ package foo enum class Type { - NUMBER - STRING - BOOLEAN + NUMBER, + STRING, + BOOLEAN, OBJECT }