From b2653ad1e9c5839c45f80273215d1a8d7841a159 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 7 Aug 2015 16:28:20 +0300 Subject: [PATCH] Deprecated enum syntax removed: most compiler tests --- .../testData/codegen/box/bridges/simpleEnum.kt | 4 ++-- .../box/bridges/substitutionInSuperClass/enum.kt | 4 ++-- .../box/defaultArguments/constructor/enum.kt | 4 ++-- .../constructor/enumWithOneDefArg.kt | 4 ++-- .../constructor/enumWithTwoDefArgs.kt | 8 ++++---- .../constructor/enumWithTwoDoubleDefArgs.kt | 8 ++++---- .../codegen/box/enum/abstractMethodInEnum.kt | 2 +- .../codegen/box/enum/abstractNestedClass.kt | 2 +- .../codegen/box/enum/asReturnExpression.kt | 6 +++--- .../codegen/box/enum/companionObjectInEnum.kt | 6 +++--- .../testData/codegen/box/enum/entrywithinner.kt | 4 ++-- .../codegen/box/enum/enumInheritedFromTrait.kt | 2 +- .../codegen/box/enum/enumWithLambdaParameter.kt | 4 ++-- compiler/testData/codegen/box/enum/inPackage.kt | 6 +++--- compiler/testData/codegen/box/enum/kt1119.kt | 2 +- compiler/testData/codegen/box/enum/kt2350.kt | 2 +- compiler/testData/codegen/box/enum/name.kt | 2 +- .../testData/codegen/box/enum/objectInEnum.kt | 4 ++-- compiler/testData/codegen/box/enum/openMethod.kt | 4 ++-- compiler/testData/codegen/box/enum/ordinal.kt | 6 +++--- compiler/testData/codegen/box/enum/simple.kt | 6 +++--- .../codegen/box/enum/superCallInEnumLiteral.kt | 4 ++-- compiler/testData/codegen/box/enum/toString.kt | 2 +- compiler/testData/codegen/box/enum/valueof.kt | 2 +- .../box/innerNested/nestedEnumConstant.kt | 2 +- compiler/testData/codegen/box/objects/kt1186.kt | 12 ++++++------ compiler/testData/codegen/box/objects/kt694.kt | 4 ++-- .../codegen/box/secondaryConstructors/enums.kt | 16 ++++++++-------- .../codegen/box/when/noElseExhaustive.kt | 2 +- .../box/when/noElseExhaustiveStatement.kt | 2 +- .../box/when/noElseExhaustiveUnitExpected.kt | 2 +- .../nonLocalReturns/nestedNonLocals.1.kt | 4 ++-- .../tryFinally/callSite/callSite.1.kt | 4 ++-- .../tryFinally/callSite/callSiteComplex.1.kt | 4 ++-- .../tryFinally/declSite/complex.1.kt | 4 ++-- .../enumCompanion/enumCompanionObject.kt | 1 + .../classObjectProperties.kt | 1 + .../annotations/annotatedEnumEntry.kt | 2 +- .../boxWithStdlib/enum/sortEnumEntries.kt | 8 ++++---- .../fullJdk/synchronized/nonLocalReturn.kt | 12 ++++++------ .../codegen/boxWithStdlib/regressions/kt4262.kt | 2 +- .../codegen/boxWithStdlib/regressions/kt6434.kt | 2 +- .../whenEnumOptimization/bigEnum.kt | 3 ++- .../whenEnumOptimization/duplicatingItems.kt | 6 +++--- .../enumInsideClassObject.kt | 6 +++--- .../whenEnumOptimization/expression.kt | 6 +++--- .../functionLiteralInTopLevel.kt | 6 +++--- .../whenEnumOptimization/manyWhensWithinClass.kt | 6 +++--- .../whenEnumOptimization/nonConstantEnum.kt | 6 +++--- .../whenEnumOptimization/nullability.kt | 6 +++--- .../whenEnumOptimization/nullableEnum.kt | 2 +- .../whenEnumOptimization/subjectAny.kt | 6 +++--- .../whenEnumOptimization/withoutElse.kt | 6 +++--- .../bytecodeText/whenEnumOptimization/bigEnum.kt | 3 ++- .../whenEnumOptimization/duplicatingItems.kt | 6 +++--- .../whenEnumOptimization/expression.kt | 6 +++--- .../functionLiteralInTopLevel.kt | 6 +++--- .../whenEnumOptimization/manyWhensWithinClass.kt | 6 +++--- .../whenEnumOptimization/nonConstantEnum.kt | 6 +++--- .../whenEnumOptimization/nullability.kt | 6 +++--- .../whenEnumOptimization/subjectAny.kt | 6 +++--- .../whenEnumOptimization/withoutElse.kt | 6 +++--- .../codegen/defaultArguments/reflection/enum.kt | 2 +- compiler/testData/codegen/enum/name.kt | 2 +- compiler/testData/codegen/enum/openMethod.kt | 4 ++-- compiler/testData/codegen/enum/simple.kt | 6 +++--- .../testData/codegen/innerClassInfo/enumEntry.kt | 4 ++-- .../compileJavaAgainstKotlin/class/kt4050.kt | 2 +- .../ClassObjectInEnum.A.kt | 2 +- .../compileKotlinAgainstKotlin/Enum.A.kt | 2 +- .../StarImportEnum.A.kt | 4 ++-- .../testData/repl/classes/enumEntrySubclass.repl | 4 ++-- compiler/testData/repl/classes/simpleEnum.repl | 2 +- .../resolvedCalls/invoke/invokeOnEnumEntry2.kt | 4 ++-- .../resolvedCalls/invoke/invokeOnEnumEntry2.txt | 4 ++-- .../annotationArguments/enum.kt | 4 ++-- .../builtinsSerializer/compileTimeConstants.kt | 4 ++-- .../serialization/js/dynamicConstants.kt | 4 ++-- 78 files changed, 175 insertions(+), 171 deletions(-) diff --git a/compiler/testData/codegen/box/bridges/simpleEnum.kt b/compiler/testData/codegen/box/bridges/simpleEnum.kt index 11b715d6c18..fa164e0b42d 100644 --- a/compiler/testData/codegen/box/bridges/simpleEnum.kt +++ b/compiler/testData/codegen/box/bridges/simpleEnum.kt @@ -3,8 +3,8 @@ interface A { } enum class Z(val name: String) : A { - Z1 : Z("Z1") - Z2 : Z("Z2") + Z1("Z1"), + Z2("Z2"); override fun foo(t: String) = name } diff --git a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt index ac9d01f3797..50b575ff44e 100644 --- a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt +++ b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt @@ -5,8 +5,8 @@ interface A { interface B : A enum class Z(val name: String) : B { - Z1 : Z("Z1") - Z2 : Z("Z2") + Z1("Z1"), + Z2("Z2"); override fun foo(t: String) = name } diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt index 70edd407129..edc9e061d4c 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt @@ -1,6 +1,6 @@ enum class A(val a: Int = 1) { - FIRST: A() - SECOND: A(2) + FIRST(), + SECOND(2) } fun box(): String { diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt index fd78781de3d..339ab868c0d 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt @@ -1,6 +1,6 @@ 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/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt index 0ad8dfa5d25..7a7d6db0814 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt @@ -1,8 +1,8 @@ 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/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt index 1acf146248f..e461fd6a32e 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt @@ -1,8 +1,8 @@ enum class Foo(val a: Double = 1.0, val b: Double = 1.0) { - A: Foo() - B: Foo(2.0, 2.0) - C: Foo(b = 2.0) - D: Foo(a = 2.0) + A(), + B(2.0, 2.0), + C(b = 2.0), + D(a = 2.0) } fun box(): String { diff --git a/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt b/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt index 62647cb10c1..0d3ed6de674 100644 --- a/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt +++ b/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt @@ -1,5 +1,5 @@ enum class A() { - ENTRY: A(){ override fun t() = "OK"} + ENTRY(){ override fun t() = "OK"}; abstract fun t(): String } diff --git a/compiler/testData/codegen/box/enum/abstractNestedClass.kt b/compiler/testData/codegen/box/enum/abstractNestedClass.kt index d6e015f56b3..3994bd54e17 100644 --- a/compiler/testData/codegen/box/enum/abstractNestedClass.kt +++ b/compiler/testData/codegen/box/enum/abstractNestedClass.kt @@ -1,5 +1,5 @@ enum class E { - ENTRY + ENTRY; abstract class Nested } diff --git a/compiler/testData/codegen/box/enum/asReturnExpression.kt b/compiler/testData/codegen/box/enum/asReturnExpression.kt index 94bab54007c..c001e02763a 100644 --- a/compiler/testData/codegen/box/enum/asReturnExpression.kt +++ b/compiler/testData/codegen/box/enum/asReturnExpression.kt @@ -1,9 +1,9 @@ // http://youtrack.jetbrains.com/issue/KT-2167 enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/box/enum/companionObjectInEnum.kt b/compiler/testData/codegen/box/enum/companionObjectInEnum.kt index 1ee9845635d..726f41b4f05 100644 --- a/compiler/testData/codegen/box/enum/companionObjectInEnum.kt +++ b/compiler/testData/codegen/box/enum/companionObjectInEnum.kt @@ -1,7 +1,7 @@ enum class Game { - ROCK - PAPER - SCISSORS + ROCK, + PAPER, + SCISSORS; companion object { fun foo() = ROCK diff --git a/compiler/testData/codegen/box/enum/entrywithinner.kt b/compiler/testData/codegen/box/enum/entrywithinner.kt index 456492ce012..b919b69f5b4 100644 --- a/compiler/testData/codegen/box/enum/entrywithinner.kt +++ b/compiler/testData/codegen/box/enum/entrywithinner.kt @@ -7,14 +7,14 @@ enum class IssueState { inner class D { val k = ToString() } - } + }, FIXED { override fun ToString() = "K" inner class D { val k = ToString() } - } + }; open fun ToString() : String = "O" } diff --git a/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt b/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt index 7659029d2b6..8171865caed 100644 --- a/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt +++ b/compiler/testData/codegen/box/enum/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/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt b/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt index 3c7d4c2465a..d41886a5370 100644 --- a/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt +++ b/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt @@ -1,9 +1,9 @@ // KT-4423 Enum with function not compiled enum class Sign(val str: String, val func: (x: Int, y: Int) -> Int){ - plus: Sign("+", { x, y -> x + y }) + plus("+", { x, y -> x + y }), - mult: Sign("*", { x, y -> x * y }) { + mult("*", { x, y -> x * y }) { override fun toString() = "${func(4,5)}" } } diff --git a/compiler/testData/codegen/box/enum/inPackage.kt b/compiler/testData/codegen/box/enum/inPackage.kt index 4e4e1f4bee9..388eb0a0dd3 100644 --- a/compiler/testData/codegen/box/enum/inPackage.kt +++ b/compiler/testData/codegen/box/enum/inPackage.kt @@ -1,9 +1,9 @@ package test enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/box/enum/kt1119.kt b/compiler/testData/codegen/box/enum/kt1119.kt index d8dc6b70627..6445197faee 100644 --- a/compiler/testData/codegen/box/enum/kt1119.kt +++ b/compiler/testData/codegen/box/enum/kt1119.kt @@ -3,7 +3,7 @@ enum class Direction() { val someSpecialValue = "OK" override fun f() = someSpecialValue - } + }; abstract fun f():String diff --git a/compiler/testData/codegen/box/enum/kt2350.kt b/compiler/testData/codegen/box/enum/kt2350.kt index b32bbb58e9b..d4a363062b3 100644 --- a/compiler/testData/codegen/box/enum/kt2350.kt +++ b/compiler/testData/codegen/box/enum/kt2350.kt @@ -1,5 +1,5 @@ enum class A(val b: String) { - E1: A("OK"){ override fun t() = b } + E1("OK"){ override fun t() = b }; abstract fun t(): String } diff --git a/compiler/testData/codegen/box/enum/name.kt b/compiler/testData/codegen/box/enum/name.kt index 3759f1b46ca..7e9f0f6d617 100644 --- a/compiler/testData/codegen/box/enum/name.kt +++ b/compiler/testData/codegen/box/enum/name.kt @@ -1,5 +1,5 @@ enum class State { - O + O, K } diff --git a/compiler/testData/codegen/box/enum/objectInEnum.kt b/compiler/testData/codegen/box/enum/objectInEnum.kt index 798b352261e..9f19d3c1704 100644 --- a/compiler/testData/codegen/box/enum/objectInEnum.kt +++ b/compiler/testData/codegen/box/enum/objectInEnum.kt @@ -1,11 +1,11 @@ enum class E { - ENTRY + ENTRY, SUBCLASS { object O { fun foo() = 2 } override fun bar() = O.foo() - } + }; object O { fun foo() = 1 diff --git a/compiler/testData/codegen/box/enum/openMethod.kt b/compiler/testData/codegen/box/enum/openMethod.kt index 003a3708f53..010d6e40ad4 100644 --- a/compiler/testData/codegen/box/enum/openMethod.kt +++ b/compiler/testData/codegen/box/enum/openMethod.kt @@ -1,10 +1,10 @@ fun box() = IssueState.DEFAULT.ToString() + IssueState.FIXED.ToString() enum class IssueState { - DEFAULT + DEFAULT, FIXED { override fun ToString() = "K" - } + }; open fun ToString() : String = "O" } diff --git a/compiler/testData/codegen/box/enum/ordinal.kt b/compiler/testData/codegen/box/enum/ordinal.kt index 600cd4ca3e6..068fba6d997 100644 --- a/compiler/testData/codegen/box/enum/ordinal.kt +++ b/compiler/testData/codegen/box/enum/ordinal.kt @@ -1,7 +1,7 @@ enum class State { - _0 - _1 - _2 + _0, + _1, + _2, _3 } diff --git a/compiler/testData/codegen/box/enum/simple.kt b/compiler/testData/codegen/box/enum/simple.kt index da6520f09c3..ed48d29a5d9 100644 --- a/compiler/testData/codegen/box/enum/simple.kt +++ b/compiler/testData/codegen/box/enum/simple.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt b/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt index ecea921b58f..11507d9d147 100644 --- a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt +++ b/compiler/testData/codegen/box/enum/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/compiler/testData/codegen/box/enum/toString.kt b/compiler/testData/codegen/box/enum/toString.kt index 9eed199d5f4..b4890365b12 100644 --- a/compiler/testData/codegen/box/enum/toString.kt +++ b/compiler/testData/codegen/box/enum/toString.kt @@ -1,5 +1,5 @@ enum class State { - O + O, K } diff --git a/compiler/testData/codegen/box/enum/valueof.kt b/compiler/testData/codegen/box/enum/valueof.kt index 3e393606d06..04f7a9e4c2b 100644 --- a/compiler/testData/codegen/box/enum/valueof.kt +++ b/compiler/testData/codegen/box/enum/valueof.kt @@ -1,5 +1,5 @@ enum class Color { - RED + RED, BLUE } diff --git a/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt b/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt index db6beee2939..d8ae583f3d5 100644 --- a/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt +++ b/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt @@ -1,6 +1,6 @@ class Outer { enum class Nested { - O + O, K } } diff --git a/compiler/testData/codegen/box/objects/kt1186.kt b/compiler/testData/codegen/box/objects/kt1186.kt index 20b94eebff1..6100f7092fa 100644 --- a/compiler/testData/codegen/box/objects/kt1186.kt +++ b/compiler/testData/codegen/box/objects/kt1186.kt @@ -1,13 +1,13 @@ enum class Color(val rgb : Int) { - RED : Color(0xFF0000) - GREEN : Color(0x00FF00) - BLUE : Color(0x0000FF) + RED(0xFF0000), + GREEN(0x00FF00), + BLUE(0x0000FF) } enum class Direction { - NORTH - SOUTH - WEST + NORTH, + SOUTH, + WEST, EAST } diff --git a/compiler/testData/codegen/box/objects/kt694.kt b/compiler/testData/codegen/box/objects/kt694.kt index 9599fdc3ed5..945e1298489 100644 --- a/compiler/testData/codegen/box/objects/kt694.kt +++ b/compiler/testData/codegen/box/objects/kt694.kt @@ -1,6 +1,6 @@ enum class Test { - A - B + A, + B, C } diff --git a/compiler/testData/codegen/box/secondaryConstructors/enums.kt b/compiler/testData/codegen/box/secondaryConstructors/enums.kt index d7ae1b9817d..2d62a075bb9 100644 --- a/compiler/testData/codegen/box/secondaryConstructors/enums.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/enums.kt @@ -1,9 +1,9 @@ enum class A1(val prop1: String) { - X: A1("asd") - Y: A1() { + X("asd"), + Y() { override fun f() = super.f() + "#Y" - } - Z: A1(5) + }, + Z(5); val prop2: String = "const2" var prop3: String = "" @@ -19,11 +19,11 @@ enum class A1(val prop1: String) { } enum class A2 { - X: A2("asd") - Y: A2() { + X("asd"), + Y() { override fun f() = super.f() + "#Y" - } - Z: A2(5) + }, + Z(5); val prop1: String val prop2: String = "const2" diff --git a/compiler/testData/codegen/box/when/noElseExhaustive.kt b/compiler/testData/codegen/box/when/noElseExhaustive.kt index cd2bb5e0e3a..e02125f19c8 100644 --- a/compiler/testData/codegen/box/when/noElseExhaustive.kt +++ b/compiler/testData/codegen/box/when/noElseExhaustive.kt @@ -1,5 +1,5 @@ enum class En { - A + A, B } diff --git a/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt b/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt index 8ec86667d8a..da79d180335 100644 --- a/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt +++ b/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt @@ -1,5 +1,5 @@ enum class En { - A + A, B } diff --git a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt index 45c41eb4313..2c69069abac 100644 --- a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt +++ b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt @@ -1,5 +1,5 @@ enum class En { - A + A, B } diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt index fdc3e2eb474..e0a56c02315 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt @@ -2,8 +2,8 @@ import test.* import Kind.* enum class Kind { - LOCAL - EXTERNAL + LOCAL, + EXTERNAL, GLOBAL } diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt index f250c83aeea..bbec4e8720a 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt @@ -2,8 +2,8 @@ import test.* import Kind.* enum class Kind { - LOCAL - EXTERNAL + LOCAL, + EXTERNAL, GLOBAL } diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt index f9fa9820692..7dbe5a93fa1 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt @@ -2,8 +2,8 @@ import test.* import Kind.* enum class Kind { - LOCAL - EXTERNAL + LOCAL, + EXTERNAL, GLOBAL } diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt index 30f3870579c..75c8eee0122 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt @@ -2,8 +2,8 @@ import test.* import Kind.* enum class Kind { - LOCAL - EXTERNAL + LOCAL, + EXTERNAL, GLOBAL } diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt index a3205d3e732..9aa57c83f9a 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt @@ -1,6 +1,7 @@ import kotlin.platform.platformStatic enum class A { + ; companion object { val foo: String = "OK" diff --git a/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt b/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt index 395e96670e0..2fdf1ded64c 100644 --- a/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt +++ b/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt @@ -11,6 +11,7 @@ interface Trait { } enum class Enoom { + ; companion object { val NAME = "Enoom" } diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt index ead0b2e2156..5c1584eb905 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt @@ -8,7 +8,7 @@ enum class E { @First E1 { fun foo() = "something" - } + }, @Second("OK") E2 diff --git a/compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt b/compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt index 2efe29f7cb5..0074daf6cb3 100644 --- a/compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt +++ b/compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt @@ -1,10 +1,10 @@ import Game.* enum class Game { - ROCK - PAPER - SCISSORS - LIZARD + ROCK, + PAPER, + SCISSORS, + LIZARD, SPOCK } diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt index e99c25ae77a..18f07a3bf7e 100644 --- a/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt +++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt @@ -15,12 +15,12 @@ val executorService = Executors.newFixedThreadPool(count) class MyException(message: String): Exception(message) enum class ExecutionType { - LOCAL - NON_LOCAL_SIMPLE - NON_LOCAL_EXCEPTION - NON_LOCAL_FINALLY - NON_LOCAL_EXCEPTION_AND_FINALLY - NON_LOCAL_EXCEPTION_AND_FINALLY_WITH_RETURN + LOCAL, + NON_LOCAL_SIMPLE, + NON_LOCAL_EXCEPTION, + NON_LOCAL_FINALLY, + NON_LOCAL_EXCEPTION_AND_FINALLY, + NON_LOCAL_EXCEPTION_AND_FINALLY_WITH_RETURN, NON_LOCAL_NESTED } diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt index 9bb16cb37fc..b52f9a0ac15 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt @@ -1,7 +1,7 @@ fun > Byte.toEnum(clazz : Class) : E = (clazz.getMethod("values").invoke(null) as Array)[this.toInt()] -enum class Letters { A B C } +enum class Letters { A, B, C } fun box(): String { val clazz = javaClass() diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt index a2b2e589fb3..85f9a4b9ab9 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt @@ -1,5 +1,5 @@ enum class E { - VALUE + VALUE, VALUE2 } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt index dd36953d00b..73218e7e773 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt @@ -1,7 +1,8 @@ import kotlin.test.assertEquals enum class BigEnum { - ITEM1 ITEM2 ITEM3 ITEM4 ITEM5 ITEM6 ITEM7 ITEM8 ITEM9 ITEM10 ITEM11 ITEM12 ITEM13 ITEM14 ITEM15 ITEM16 ITEM17 ITEM18 ITEM19 ITEM20 + ITEM1, ITEM2, ITEM3, ITEM4, ITEM5, ITEM6, ITEM7, ITEM8, ITEM9, ITEM10, + ITEM11, ITEM12, ITEM13, ITEM14, ITEM15, ITEM16, ITEM17, ITEM18, ITEM19, ITEM20 } fun bar1(x : BigEnum) : String { diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt index 29ecaeaceee..dc0e6aaa037 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt index 574190a829f..23b635436d8 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt @@ -3,9 +3,9 @@ import kotlin.test.assertEquals class A { companion object { enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt index 02b0a1dd73f..f26632c28d6 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt index d525f7bcb56..2955a0383a6 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt index 90aa1b49db1..e1e8bfadc70 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt index d0003a0f7de..a1440b4712b 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt index 9fa02467f08..2fc708eee4b 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt index 4bd2252796b..457f6281e1e 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt @@ -1,5 +1,5 @@ enum class E { - A + A, B } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt index d78568a187f..fca893fae5e 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt index 35855390962..cb1c20aac37 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt index f930ed27622..230eae422bb 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt @@ -1,7 +1,8 @@ import kotlin.test.assertEquals enum class BigEnum { - ITEM1 ITEM2 ITEM3 ITEM4 ITEM5 ITEM6 ITEM7 ITEM8 ITEM9 ITEM10 ITEM11 ITEM12 ITEM13 ITEM14 ITEM15 ITEM16 ITEM17 ITEM18 ITEM19 ITEM20 + ITEM1, ITEM2, ITEM3, ITEM4, ITEM5, ITEM6, ITEM7, ITEM8, ITEM9, ITEM10, + ITEM11, ITEM12, ITEM13, ITEM14, ITEM15, ITEM16, ITEM17, ITEM18, ITEM19, ITEM20 } fun bar1(x : BigEnum) : String { diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt index c9d73a41f3a..87e9d97c05a 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt index d80530f0683..a1c4bc676c5 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt index 1e539c4f0f2..a59001bb961 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt index 02b61c03e8c..34dad145a32 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt @@ -1,9 +1,9 @@ package abc.foo enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt index 8d0b8f683a6..7c73b91f2a5 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt index ab9a6185018..4a4a6cc6340 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt index 5adf4b68c55..a75ee7215ea 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt index 9a3fa71921b..09e8377c0b4 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt @@ -1,9 +1,9 @@ import kotlin.test.assertEquals enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/defaultArguments/reflection/enum.kt b/compiler/testData/codegen/defaultArguments/reflection/enum.kt index 9ad2cffe593..a6bd888d70f 100644 --- a/compiler/testData/codegen/defaultArguments/reflection/enum.kt +++ b/compiler/testData/codegen/defaultArguments/reflection/enum.kt @@ -1,5 +1,5 @@ enum class Foo(val a: Int = 1) { - A: Foo() + A() } // CLASS: Foo diff --git a/compiler/testData/codegen/enum/name.kt b/compiler/testData/codegen/enum/name.kt index 3759f1b46ca..7e9f0f6d617 100644 --- a/compiler/testData/codegen/enum/name.kt +++ b/compiler/testData/codegen/enum/name.kt @@ -1,5 +1,5 @@ enum class State { - O + O, K } diff --git a/compiler/testData/codegen/enum/openMethod.kt b/compiler/testData/codegen/enum/openMethod.kt index 003a3708f53..010d6e40ad4 100644 --- a/compiler/testData/codegen/enum/openMethod.kt +++ b/compiler/testData/codegen/enum/openMethod.kt @@ -1,10 +1,10 @@ fun box() = IssueState.DEFAULT.ToString() + IssueState.FIXED.ToString() enum class IssueState { - DEFAULT + DEFAULT, FIXED { override fun ToString() = "K" - } + }; open fun ToString() : String = "O" } diff --git a/compiler/testData/codegen/enum/simple.kt b/compiler/testData/codegen/enum/simple.kt index da6520f09c3..ed48d29a5d9 100644 --- a/compiler/testData/codegen/enum/simple.kt +++ b/compiler/testData/codegen/enum/simple.kt @@ -1,7 +1,7 @@ enum class Season { - WINTER - SPRING - SUMMER + WINTER, + SPRING, + SUMMER, AUTUMN } diff --git a/compiler/testData/codegen/innerClassInfo/enumEntry.kt b/compiler/testData/codegen/innerClassInfo/enumEntry.kt index 58c84655fa0..41b3398c0f7 100644 --- a/compiler/testData/codegen/innerClassInfo/enumEntry.kt +++ b/compiler/testData/codegen/innerClassInfo/enumEntry.kt @@ -1,9 +1,9 @@ enum class E { - E1 + E1, E2 { override fun foo() {} - } + }; open fun foo() {} } diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt index 530aaaed424..55838275751 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt @@ -1,7 +1,7 @@ package test enum class MyEnum(deprecated("") val ord: Int) { - ENTRY: MyEnum(239) + ENTRY(239); fun f(Deprecated p: Int) { diff --git a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt index baa345e6441..44c6cc2d014 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt @@ -1,7 +1,7 @@ package library public enum class EnumClass { - ENTRY + ENTRY; public companion object { public fun entry(): EnumClass = ENTRY diff --git a/compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt b/compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt index ae66e55943c..f4e1bd50906 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt @@ -1,6 +1,6 @@ package aaa enum class E { - TRIVIAL_ENTRY + TRIVIAL_ENTRY, SUBCLASS { } } diff --git a/compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt b/compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt index 2b14156f637..cd9547e8549 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt @@ -1,8 +1,8 @@ package aaa enum class E { - TRIVIAL_ENTRY - SUBCLASS { } + TRIVIAL_ENTRY, + SUBCLASS { }; class Nested { fun fortyTwo() = 42 diff --git a/compiler/testData/repl/classes/enumEntrySubclass.repl b/compiler/testData/repl/classes/enumEntrySubclass.repl index ecd00bd46f9..fef3f2030bb 100644 --- a/compiler/testData/repl/classes/enumEntrySubclass.repl +++ b/compiler/testData/repl/classes/enumEntrySubclass.repl @@ -1,10 +1,10 @@ >>> enum class E { ... FIRST { ... override fun foo() = "HELLO" -... } +... }, ... SECOND { ... override fun foo() = "WORLD" -... } +... }; ... open fun foo() = "E" ... } >>> E.FIRST.foo() + " " + E.SECOND.foo() diff --git a/compiler/testData/repl/classes/simpleEnum.repl b/compiler/testData/repl/classes/simpleEnum.repl index 1e285125080..0f7347dba10 100644 --- a/compiler/testData/repl/classes/simpleEnum.repl +++ b/compiler/testData/repl/classes/simpleEnum.repl @@ -1,5 +1,5 @@ >>> enum class E { -... FIRST +... FIRST, ... SECOND ... } >>> E.values().toList() diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt index 03be7b30e84..58aed8ebd55 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt @@ -1,6 +1,6 @@ enum class A { - ONE - TWO + ONE, + TWO; fun invoke(i: Int) = i } diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt index 97de82ac980..dd1506d4838 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.txt @@ -1,6 +1,6 @@ enum class A { - ONE - TWO + ONE, + TWO; fun invoke(i: Int) = i } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt index eb8163fcdac..e51ea330fd9 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt @@ -1,8 +1,8 @@ package test enum class Weapon { - ROCK - PAPER + ROCK, + PAPER, SCISSORS } diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt index 3f5b40558fc..b49a411c60c 100644 --- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt +++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt @@ -1,8 +1,8 @@ package test enum class Weapon { - ROCK - PAPER + ROCK, + PAPER, SCISSORS } diff --git a/compiler/testData/serialization/js/dynamicConstants.kt b/compiler/testData/serialization/js/dynamicConstants.kt index 5631a6abcfd..fb45f090c89 100644 --- a/compiler/testData/serialization/js/dynamicConstants.kt +++ b/compiler/testData/serialization/js/dynamicConstants.kt @@ -2,8 +2,8 @@ package test enum class Weapon { - ROCK - PAPER + ROCK, + PAPER, SCISSORS }