diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index deb5243bb83..e7d8f09bfef 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -303,10 +303,12 @@ public final enum class DeprecationLevel : kotlin.Enum enum entry HIDDEN /*primary*/ private constructor DeprecationLevel() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel @@ -447,10 +449,12 @@ public final class DoubleRange : kotlin.Range, kotlin.Progression public abstract class Enum> : kotlin.Comparable { /*primary*/ public constructor Enum>(/*0*/ name: kotlin.String, /*1*/ ordinal: kotlin.Int) + public final val name: kotlin.String + public final fun (): kotlin.String + public final val ordinal: kotlin.Int + public final fun (): kotlin.Int protected final fun clone(): kotlin.Any public final override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int - public final fun name(): kotlin.String - public final fun ordinal(): kotlin.Int public companion object Companion { /*primary*/ private constructor Companion() diff --git a/compiler/testData/codegen/box/bridges/simpleEnum.kt b/compiler/testData/codegen/box/bridges/simpleEnum.kt index f92436fe96f..0446aba8c33 100644 --- a/compiler/testData/codegen/box/bridges/simpleEnum.kt +++ b/compiler/testData/codegen/box/bridges/simpleEnum.kt @@ -2,10 +2,10 @@ interface A { open fun foo(t: T) = "A" } -enum class Z(val name: String) : A { +enum class Z(val aname: String) : A { Z1("Z1"), Z2("Z2"); - override fun foo(t: String) = name + override fun foo(t: String) = aname } diff --git a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt index e6d1fa46caf..243498038e6 100644 --- a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt +++ b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt @@ -4,10 +4,10 @@ interface A { interface B : A -enum class Z(val name: String) : B { +enum class Z(val aname: String) : B { Z1("Z1"), Z2("Z2"); - override fun foo(t: String) = name + override fun foo(t: String) = aname } diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt index 532934f983e..4cf0070e2f8 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt @@ -8,13 +8,13 @@ public final enum class A : kotlin.Enum { enum entry TWO private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final operator fun invoke(/*0*/ i: kotlin.Int): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt index 336e43034c7..8faecc09d1a 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt @@ -9,12 +9,12 @@ public final enum class A : kotlin.Enum { enum entry TWO private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt index 532934f983e..4cf0070e2f8 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt @@ -8,13 +8,13 @@ public final enum class A : kotlin.Enum { enum entry TWO private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final operator fun invoke(/*0*/ i: kotlin.Int): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt index 336e43034c7..8faecc09d1a 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt @@ -9,12 +9,12 @@ public final enum class A : kotlin.Enum { enum entry TWO private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/codegen/box/enum/name.kt b/compiler/testData/codegen/box/enum/name.kt index 7e9f0f6d617..6e0227199a1 100644 --- a/compiler/testData/codegen/box/enum/name.kt +++ b/compiler/testData/codegen/box/enum/name.kt @@ -3,4 +3,4 @@ enum class State { K } -fun box() = "${State.O.name()}${State.K.name()}" +fun box() = "${State.O.name}${State.K.name}" diff --git a/compiler/testData/codegen/box/enum/ordinal.kt b/compiler/testData/codegen/box/enum/ordinal.kt index 068fba6d997..d66c3e0ae4e 100644 --- a/compiler/testData/codegen/box/enum/ordinal.kt +++ b/compiler/testData/codegen/box/enum/ordinal.kt @@ -5,4 +5,4 @@ enum class State { _3 } -fun box() = if(State._0.ordinal()==0 && State._1.ordinal() == 1 && State._2.ordinal() == 2 && State._3.ordinal() == 3) "OK" else "fail" +fun box() = if(State._0.ordinal == 0 && State._1.ordinal == 1 && State._2.ordinal == 2 && State._3.ordinal == 3) "OK" else "fail" diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt index b6a1bf51558..0723c45fcbc 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt @@ -3,7 +3,7 @@ enum class E { } fun box(): String { - val i = (E::name)(E.I) + val i = (E::name.getter)(E.I) if (i != "I") return "Fail $i" return "OK" -} +} \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt index f2bfced60f4..5ae74283aee 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt @@ -1,5 +1,5 @@ interface Named { - fun name(): String + val name: String } enum class E : Named { @@ -7,5 +7,5 @@ enum class E : Named { } fun box(): String { - return (Named::name)(E.OK) + return E.OK.name } diff --git a/compiler/testData/codegen/enum/name.kt b/compiler/testData/codegen/enum/name.kt index 7e9f0f6d617..6e0227199a1 100644 --- a/compiler/testData/codegen/enum/name.kt +++ b/compiler/testData/codegen/enum/name.kt @@ -3,4 +3,4 @@ enum class State { K } -fun box() = "${State.O.name()}${State.K.name()}" +fun box() = "${State.O.name}${State.K.name}" diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt index cd646b253d9..ba7d174ff53 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt @@ -4,10 +4,10 @@ public final enum class MyEnum : kotlin.Enum { enum entry OK private constructor MyEnum() + public final /*fake_override*/ val name: kotlin.String + public final /*fake_override*/ val ordinal: kotlin.Int protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int - public final /*fake_override*/ fun name(): kotlin.String - public final /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt index 04ecd53bb1b..80ec6f58b42 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt @@ -8,12 +8,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry ENTRY private constructor MyEnum(/*0*/ @test.AAA() kotlin.Int) + public final /*fake_override*/ val name: kotlin.String @kotlin.Deprecated(message = "") public final val ord: kotlin.Int + public final /*fake_override*/ val ordinal: kotlin.Int protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit - public final /*fake_override*/ fun name(): kotlin.String - public final /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum diff --git a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt index d32b28dcee6..987951c02b5 100644 --- a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt +++ b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt @@ -12,10 +12,10 @@ public final enum class K : kotlin.Enum { private constructor K(/*0*/ kotlin.String = ...) private final val default: kotlin.String + public final /*fake_override*/ val name: kotlin.String + public final /*fake_override*/ val ordinal: kotlin.Int protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int - public final /*fake_override*/ fun name(): kotlin.String - public final /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.K diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt index 7fc36ef25a4..823d61327b7 100644 --- a/compiler/testData/diagnostics/tests/Serializable.txt +++ b/compiler/testData/diagnostics/tests/Serializable.txt @@ -15,12 +15,12 @@ public final enum class C : kotlin.Enum { enum entry E2 private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt index 7b1c1d69cb7..6ce86164956 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt @@ -14,12 +14,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry A private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt index 1448d2a2dae..8c6c15f219d 100644 --- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt @@ -188,12 +188,12 @@ package test { enum entry A private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt index 3b8fc871182..0e3b43f161e 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt index d5bfa501582..7784c46cecb 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND @base() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt index c1dfcdd2fc4..f35e0dba374 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND @base() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt index 16e887ef272..61a6cfda845 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt @@ -9,12 +9,12 @@ package @empty() enum entry SECOND @empty() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt index 71f01bd9ff4..a551662993c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND @base() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt index 86d09e13656..626fa84f792 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt @@ -9,12 +9,12 @@ package @incorrect() enum entry SECOND @incorrect() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt index 0a96b69d3da..8f752d2d983 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt index a1209fe86af..0c021bf1f14 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt index 284bf78f8f1..da95a277a94 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND @base() private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt index ed25987735a..01c8bbf586b 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt @@ -9,12 +9,12 @@ package @base() enum entry SECOND private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt index ff86d4c27ce..08cadf76687 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt @@ -24,12 +24,12 @@ public abstract class B { public final enum class D : kotlin.Enum { private constructor D() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt index ce2c1d60bfc..54bc5263560 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt @@ -13,12 +13,12 @@ package a { enum entry E4 private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class A { diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt index 850983fc908..fa31476b324 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt @@ -122,12 +122,12 @@ package uninitialized_reassigned_variables { enum entry TALKING private constructor ProtocolState() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public abstract fun signal(): uninitialized_reassigned_variables.ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt index c1a6f67c5a3..ec6c11e5ef0 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt @@ -28,13 +28,13 @@ package kt1185 { enum entry BLUE private constructor Color(/*0*/ rgb: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val rgb: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -52,12 +52,12 @@ package kt1185 { enum entry EAST private constructor Direction() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt index 36f6444418e..383e4563e41 100644 --- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt +++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt @@ -6,6 +6,8 @@ package enum entry B private constructor First(/*0*/ x: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val x: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: First): kotlin.Int @@ -13,8 +15,6 @@ package public final /*synthesized*/ fun copy(/*0*/ x: kotlin.Int = ...): First public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt index 127db3aae3f..fe51e5b6251 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt @@ -65,12 +65,12 @@ public object B4 { public open enum class C : kotlin.Enum { private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt index ff47a47b11a..e4709725130 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt @@ -17,12 +17,12 @@ package kt1193 { private constructor MyEnum(/*0*/ i: kotlin.Int) public final val i: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt index ac312aa2611..79375276714 100644 --- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt +++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt @@ -18,12 +18,12 @@ public open enum class EN : kotlin.Enum { enum entry A private constructor EN() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -46,11 +46,11 @@ public interface T { public final class Test2 : EN { public constructor Test2(/*0*/ e: EN) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt index 71a99521be3..b107e7ec23d 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt @@ -20,12 +20,12 @@ public interface { public final enum class : kotlin.Enum<> { private constructor () + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -70,12 +70,12 @@ public final class Outer { public final enum class : kotlin.Enum> { private constructor () + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Outer.): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt index 5e56eff22e6..7cce4e39ca5 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt @@ -4,12 +4,12 @@ public final enum class E : kotlin.Enum { enum entry A private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final fun valueOf(/*0*/ s: kotlin.String): E public final fun values(): kotlin.Array diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt index 793e6a56384..4bc6c26f63b 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt @@ -6,12 +6,12 @@ public final enum class A : kotlin.Enum { enum entry A2 private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final fun valueOf(): kotlin.String public final fun valueOf(/*0*/ s: kotlin.String): A diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt index 725be19abe3..12ba8bd202e 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt @@ -4,12 +4,12 @@ package abstract { public abstract enum class MyAbstractEnum : kotlin.Enum { private constructor MyAbstractEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyAbstractEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt index 5955b5146fe..058c17dd481 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt @@ -31,6 +31,8 @@ package abstract { public final var l: kotlin.Int public final var l1: kotlin.Int public final var n: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -39,8 +41,6 @@ package abstract { public abstract fun h(): kotlin.Unit public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun j(): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt index 608a1916db0..d12f7b7a871 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt @@ -4,13 +4,13 @@ public final enum class E : kotlin.Enum, T { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun f(): kotlin.Unit public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt index 110d28686d6..65b3097df62 100644 --- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt +++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt @@ -9,12 +9,12 @@ public final enum class A : kotlin.Enum { private constructor A(/*0*/ c: kotlin.Int) public final val c: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt index 675430746eb..72e8e6e3d20 100644 --- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt @@ -7,13 +7,13 @@ public final enum class A : kotlin.Enum { private constructor A(/*0*/ c: kotlin.Int) public final val c: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final fun createA(): A public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt index 6f22628ad82..a8aa5c97690 100644 --- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt @@ -7,12 +7,12 @@ public final enum class A : kotlin.Enum { private constructor A(/*0*/ c: kotlin.Int) public final val c: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public abstract fun selfOrFriend(): A public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt index 3914a6af493..2d9d7d8e514 100644 --- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt @@ -13,12 +13,12 @@ public final enum class A : kotlin.Enum { private constructor A(/*0*/ c: kotlin.Int) public final val c: kotlin.Int public final var last: A? + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt index c13486ad549..07ec3b2bfe0 100644 --- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt @@ -12,12 +12,12 @@ public final enum class A : kotlin.Enum { private constructor A() private constructor A(/*0*/ c: kotlin.Int) public final val c: kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt index 809815b5617..d8b55bc0116 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt @@ -6,12 +6,12 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt index 4e8320d3e0d..03937e1362e 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt @@ -9,12 +9,12 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String private companion object Companion { diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt index 824c9d3a21d..3b354017bf0 100644 --- a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt +++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt @@ -6,12 +6,12 @@ public final enum class A : kotlin.Enum { enum entry A private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -23,12 +23,12 @@ public final enum class B : kotlin.Enum { enum entry B private constructor B() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt index 25a3e83dd9d..5d0de810905 100644 --- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt @@ -13,12 +13,12 @@ public final enum class E : kotlin.Enum { enum entry SECOND private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt index 39390151a56..12b57e2651e 100644 --- a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt +++ b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt @@ -4,12 +4,12 @@ public final enum class E : kotlin.Enum { enum entry A private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt index 0ec42fd4855..1849b02fe41 100644 --- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt +++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt @@ -8,12 +8,12 @@ public final enum class E : kotlin.Enum { enum entry E2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt index 80d77e34a70..7ab3a6043a0 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt @@ -8,12 +8,12 @@ public final enum class E : kotlin.Enum { enum entry SECOND private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt index 8ca17dfcdc9..9465d54c810 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt @@ -7,13 +7,13 @@ public final enum class EnumClass : kotlin.Enum { private constructor EnumClass() public abstract val bar: kotlin.String + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(): kotlin.Int public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt index b3a36e29ae3..6672d2b4d24 100644 --- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt +++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt @@ -6,13 +6,13 @@ public final enum class EnumImplementingTraitWithFun : kotlin.Enum, MyTrait { private constructor MyEnum2() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -35,12 +35,12 @@ public final enum class MyEnum2 : kotlin.Enum, MyTrait { public final enum class MyEnum3 : MyEnumBase { private constructor MyEnum3() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -50,12 +50,12 @@ public final enum class MyEnum3 : MyEnumBase { public final enum class MyEnumBase : kotlin.Enum { private constructor MyEnumBase() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt index c4af25a002f..dc5e099097c 100644 --- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt @@ -8,12 +8,12 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt index b5a495a3e25..bb301566fba 100644 --- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt +++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt @@ -8,13 +8,13 @@ public final enum class : kotlin.Enum<> { enum entry BLUE private constructor (/*0*/ rgb: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val rgb: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt index c162bdb0ef5..804e3366c73 100644 --- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt +++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt @@ -20,12 +20,12 @@ public final class A { public final enum class B : kotlin.Enum { private constructor B() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt index 4ad584f1e41..9be2416bdde 100644 --- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt +++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt @@ -10,12 +10,12 @@ package enum { enum entry CASE2 private constructor HappyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt index 686d1c0452e..36ac21f1f3a 100644 --- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt +++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt @@ -4,12 +4,12 @@ package enum entry D private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt index e44b3d26802..5f8c7424aa2 100644 --- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt +++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt @@ -2,12 +2,12 @@ package public final enum class : kotlin.Enum<> { private constructor () + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt index 7954053f52c..421841a26ed 100644 --- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt @@ -8,12 +8,12 @@ public final enum class E : kotlin.Enum { enum entry entry private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt index 825d63a2359..e357dd7e94d 100644 --- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt @@ -8,12 +8,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry SECOND private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt index 0b6a9598007..3cfe44652db 100644 --- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt @@ -2,12 +2,12 @@ package public final class A : E.ENTRY { public constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -15,12 +15,12 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt index db50a36cbae..434144e7061 100644 --- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt @@ -2,23 +2,23 @@ package public final class MyClass : MyEnum2 { public constructor MyClass() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } public final class MyClass2 : MyJavaEnum { public constructor MyClass2() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -26,12 +26,12 @@ public open enum class MyEnum : kotlin.Enum { enum entry A private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -41,12 +41,12 @@ public open enum class MyEnum : kotlin.Enum { public final enum class MyEnum2 : kotlin.Enum { private constructor MyEnum2() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -56,12 +56,12 @@ public final enum class MyEnum2 : kotlin.Enum { public final enum class MyJavaEnum : kotlin.Enum { public constructor MyJavaEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inline.txt b/compiler/testData/diagnostics/tests/enum/inline.txt index c86c8c3a9ae..e04d5740ae0 100644 --- a/compiler/testData/diagnostics/tests/enum/inline.txt +++ b/compiler/testData/diagnostics/tests/enum/inline.txt @@ -4,12 +4,12 @@ public final enum class My : kotlin.Enum { enum entry inline private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt index 4d7742ef6e9..5b7ace8a9f4 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt @@ -17,12 +17,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -48,12 +48,12 @@ public final class B { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt index 4bb0edc45e7..e09112b3ff8 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt @@ -10,12 +10,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt index 84f2a3612a5..c7fd717b000 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt @@ -16,12 +16,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt index 5f73c1e0141..1953f1aa096 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt @@ -4,24 +4,24 @@ public final enum class E : kotlin.Enum { enum entry ABC private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final enum class F : kotlin.Enum { enum entry DEF private constructor F() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.F): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt index 79af7d5c7d5..8d187ea281f 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt @@ -4,12 +4,12 @@ public final enum class E : kotlin.Enum { enum entry ABC private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt index 4d7ab289422..be3af55fd56 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt @@ -16,12 +16,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt index e985361ae0f..081e17d896b 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt @@ -10,12 +10,12 @@ public object A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt index d0fed21edad..98e9888590a 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt @@ -9,12 +9,12 @@ public interface A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt index 236d656829e..f86f8f861fe 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt @@ -16,12 +16,12 @@ public final class A { enum entry ENTRY2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -34,12 +34,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt index 1d48fc1529b..01c14c40352 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt @@ -10,12 +10,12 @@ public final class A { enum entry ABC private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -27,12 +27,12 @@ public final class A { enum entry DEF private constructor F() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.F): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt index 87c48fa315c..f21790a7acb 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt @@ -16,12 +16,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -40,12 +40,12 @@ public final class A { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt index 825d63a2359..e357dd7e94d 100644 --- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt @@ -8,12 +8,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry SECOND private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt index c32c5d0f466..62b7e5dafd7 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt @@ -6,12 +6,12 @@ public final enum class A : kotlin.Enum { enum entry ENTRY public constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt index e115ad020e0..0db9dcbb532 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt @@ -8,12 +8,12 @@ public final enum class A : kotlin.Enum { enum entry ANOTHER public constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt index 44fef07de8f..fe74c453f8b 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt @@ -6,12 +6,12 @@ public abstract enum class A : kotlin.Enum { enum entry ENTRY public constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public abstract fun s(): kotlin.String! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt index 7e17098c2ca..d1fee7722d5 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt @@ -8,12 +8,12 @@ public final enum class A : kotlin.Enum { enum entry ANOTHER public constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open fun s(): kotlin.String! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt index 312bbb05a79..3102cacb914 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt @@ -9,12 +9,12 @@ public final enum class A : kotlin.Enum { public constructor A() public final var ENTRY: kotlin.String! + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt index e279b9b3523..2ff4263d128 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt @@ -8,13 +8,13 @@ public final enum class A : kotlin.Enum { enum entry ANOTHER private constructor A(/*0*/ s: kotlin.String!) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final var s: kotlin.String! protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt index 5e116a8eea1..e5dcd0c6526 100644 --- a/compiler/testData/diagnostics/tests/enum/kt2834.txt +++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt @@ -8,12 +8,12 @@ private final enum class MethodKind : kotlin.Enum { enum entry STATIC private constructor MethodKind() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt index ebcfa31ce71..e4e750b2ff1 100644 --- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt @@ -4,12 +4,12 @@ public final enum class E : kotlin.Enum, kotlin.Cloneable { enum entry A private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected open override /*2*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt index 9588b5c0743..00d84062918 100644 --- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt @@ -34,12 +34,12 @@ public final enum class E : kotlin.Enum { enum entry REIFIED private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt index 1fc6c87fab4..1ba4825a84d 100644 --- a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt +++ b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt @@ -10,14 +10,14 @@ public final enum class E : kotlin.Enum { private constructor E() private constructor E(/*0*/ x: kotlin.Int) private constructor E(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val x: kotlin.Int public final val y: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt index 5432b8e76de..62e9b73985b 100644 --- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt @@ -8,14 +8,14 @@ public final enum class EnumWithOpenMembers : kotlin.Enum { private constructor EnumWithOpenMembers() public final val b: kotlin.Int = 3 public open val bar: kotlin.String = "" + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumWithOpenMembers): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun f(): kotlin.Int public open fun foo(): kotlin.Int public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt index a4589543ea3..aaf621d6bb2 100644 --- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt +++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt @@ -1,8 +1,8 @@ enum class E { ENTRY; - override fun name(): String = "lol" - override fun ordinal(): Int = 0 + override val name: String = "lol" + override val ordinal: Int = 0 override fun compareTo(other: E) = -1 diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt index 8088137fdf5..9f90a13b581 100644 --- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt +++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt @@ -4,12 +4,12 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public open override /*1*/ val name: kotlin.String = "lol" + public open override /*1*/ val ordinal: kotlin.Int = 0 protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ fun hashCode(): kotlin.Int - public open override /*1*/ fun name(): kotlin.String - public open override /*1*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt index 73ea5a0e8cf..5b2d3676b8a 100644 --- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt +++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt @@ -16,12 +16,12 @@ package foo { enum entry ANOTHER private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class Nested { diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt index a226cb40c1f..21cb1e6272d 100644 --- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt @@ -6,12 +6,12 @@ package bug { enum entry A private constructor Foo() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: bug.Foo): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt index bcf6978f7de..7d0708369ca 100644 --- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt +++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt @@ -8,13 +8,13 @@ public final enum class E : kotlin.Enum { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String public final fun oof(): E - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public final fun rab(): kotlin.Array public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final fun zab(): E diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt index fafd9dde94d..1b93bddd681 100644 --- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt +++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt @@ -92,12 +92,12 @@ package a { enum entry E2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt index 19f559e51d8..0b48fb7de1e 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt @@ -10,12 +10,12 @@ public final enum class E : kotlin.Enum { enum entry C private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt index c1c04aa4b77..5545e7d5e37 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt @@ -14,12 +14,12 @@ package a { enum entry SECOND private constructor SomeEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt index 937f50b2b85..1d68fcd3580 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt @@ -11,12 +11,12 @@ package a { enum entry SECOND private constructor TestEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt index 78b803b414f..d7f12fa1066 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt @@ -35,12 +35,12 @@ public final enum class Kind : kotlin.Enum { enum entry GLOBAL_RETURN private constructor Kind() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt index d64f97df630..a926f55374a 100644 --- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt +++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt @@ -6,13 +6,13 @@ public final enum class E : kotlin.Enum { enum entry E2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(): kotlin.Int public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public final fun outerFun(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt index 90b5bc4adbc..5dea76b9b8d 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt @@ -59,12 +59,12 @@ public final class D { public final enum class R : kotlin.Enum { private constructor R() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D.R): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -84,12 +84,12 @@ public final enum class H : kotlin.Enum { enum entry I private constructor H() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: H): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final inner class J { diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt index b2e5a35a91f..4e882f7fde3 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt @@ -26,12 +26,12 @@ public object Obj { enum entry A private constructor NestedEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Obj.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -88,12 +88,12 @@ public final class WithClassObject { enum entry A private constructor NestedEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithClassObject.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -143,12 +143,12 @@ public final class WithoutClassObject { enum entry A private constructor NestedEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithoutClassObject.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt index ec860290cbc..029543be686 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt @@ -28,12 +28,12 @@ public final enum class E : kotlin.Enum { enum entry E1 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt index 43b42ebdb08..1b4100ba0c6 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt @@ -9,12 +9,12 @@ public final enum class E : kotlin.Enum { enum entry E2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt index 807c0850c6b..abeacc4810a 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt @@ -15,12 +15,12 @@ public final class A { enum entry E2 private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt index 368a990dedb..cad38c04195 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt +++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt @@ -8,12 +8,12 @@ public final enum class Type : kotlin.Enum { enum entry NO_TYPE public constructor Type() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt index 40ecac3fab8..ed687374ae2 100644 --- a/compiler/testData/diagnostics/tests/j+k/serializable.txt +++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt @@ -13,12 +13,12 @@ public final enum class C : kotlin.Enum { enum entry E2 private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt index 8bf7872eff3..a9206b6fbfb 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt @@ -69,12 +69,12 @@ public final enum class MyEnum : kotlin.Enum { private constructor MyEnum() public const final val inEnum: kotlin.Int = 17 + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt index 4440eff41fa..0f5b406fcf6 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt @@ -14,12 +14,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry A private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt index dd76065b68f..58f7385c192 100644 --- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt +++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt @@ -73,12 +73,12 @@ public final enum class Enum : kotlin.Enum { enum entry E2 private constructor Enum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Enum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt index a02cbd46f4c..95d0f8acddd 100644 --- a/compiler/testData/diagnostics/tests/modifiers/protected.txt +++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt @@ -36,13 +36,13 @@ public final enum class Our : kotlin.Enum { enum entry FIRST private constructor Our(/*0*/ x: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final val x: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Our): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt index 31bee207c30..9ae29595bcd 100644 --- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt +++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt @@ -25,12 +25,12 @@ public final enum class Third : kotlin.Enum { enum entry FIFTH private constructor Third() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Third): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt index 6c539594241..3359389a797 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt @@ -11,12 +11,12 @@ public/*package*/ open class A { public/*package*/ final enum class Empty : kotlin.Enum { public/*package*/ constructor Empty() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Empty!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt index 37a260bf1ef..bc60b988819 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt @@ -17,12 +17,12 @@ public final class C { public final enum class : kotlin.Enum> { private constructor () + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C.): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt index 0b7c68fced4..482492b9243 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt @@ -18,12 +18,12 @@ public interface { public final enum class : kotlin.Enum<> { private constructor () + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt index 9e2acdb842b..5c14406404a 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt @@ -6,12 +6,12 @@ public final enum class E : kotlin.Enum { enum entry SECOND private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt index 373916277ea..9d16d6c85b1 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt @@ -9,14 +9,14 @@ public final enum class En : kotlin.Enum { enum entry SUBCLASS private constructor En() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final fun ENTRY(): kotlin.Int public final fun SUBCLASS(): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: En): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt index 79ba7c7befe..87583dca1ae 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt @@ -8,12 +8,12 @@ package kt2418 { enum entry FOO private constructor A() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -25,13 +25,13 @@ package kt2418 { enum entry FOO private constructor B() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final fun FOO(): kotlin.Unit protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -44,12 +44,12 @@ package kt2418 { private constructor C() public final val FOO: kotlin.Int = 1 + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -61,12 +61,12 @@ package kt2418 { enum entry FOO private constructor D() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class FOO { diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt index 09412711999..4e5acf4e44c 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt +++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt @@ -8,12 +8,12 @@ public final enum class ProtocolState : kotlin.Enum { enum entry TALKING private constructor ProtocolState() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public abstract fun signal(): ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt index d918a416d58..97261e7a5ae 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt +++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt @@ -8,12 +8,12 @@ public final enum class ProtocolState : kotlin.Enum { enum entry TALKING private constructor ProtocolState() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public abstract fun signal(): ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt index c646df118d4..108878d8f15 100644 --- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt +++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt @@ -4,12 +4,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry FIRST private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/regressions/kt4693.txt b/compiler/testData/diagnostics/tests/regressions/kt4693.txt index b4627efaf4a..00985072d99 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt4693.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt4693.txt @@ -4,13 +4,13 @@ public final enum class MyEnum : kotlin.Enum { enum entry K private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int @kotlin.inline() public final fun doSmth(/*0*/ f: (MyEnum) -> kotlin.String): kotlin.String public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt index 5eee0e1b1e0..fea7542e770 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt @@ -6,13 +6,13 @@ public fun Foo.invoke(/*0*/ name: k public final enum class EnumClass : kotlin.Enum { private constructor EnumClass(/*0*/ x: kotlin.String) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val x: kotlin.String protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt index 93b5a9b6803..71a4013a47e 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt @@ -8,13 +8,13 @@ public final enum class DOMElementTestClasses : kotlin.Enum, EnumStyleClass { enum entry cls private constructor TestClasses() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: TestClasses): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt index fe2a173ffd4..204da9af140 100644 --- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt +++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt @@ -6,22 +6,22 @@ public sealed enum class SealedEnum : kotlin.Enum { enum entry SECOND private constructor SealedEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class Derived : SealedEnum { public constructor Derived() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt index 6c4053813eb..e61be41b48b 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt @@ -14,12 +14,12 @@ public final enum class B : kotlin.Enum { enum entry X private constructor B() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt index 54004597e72..07fce0b0796 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt @@ -16,12 +16,12 @@ public final enum class A : kotlin.Enum { private constructor A(/*0*/ x: kotlin.Int) private constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int) private constructor A(/*0*/ x: kotlin.String) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -42,12 +42,12 @@ public final enum class B : kotlin.Enum { private constructor B(/*0*/ x: kotlin.Int) private constructor B(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int) private constructor B(/*0*/ x: kotlin.String) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -59,12 +59,12 @@ public final enum class C : kotlin.Enum { enum entry EMPTY private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members @@ -82,14 +82,14 @@ public final enum class D : kotlin.Enum { private constructor D() private constructor D(/*0*/ prop: kotlin.Int) private constructor D(/*0*/ x: kotlin.String) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final val prop: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun f(): kotlin.Int public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt index cdff1d6c41d..cdfe3457b09 100644 --- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt +++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt @@ -21,12 +21,12 @@ public final class A3 { public final enum class A4 : kotlin.Enum { private constructor A4() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A4): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt index 9f7ca6ae5c5..57b789db777 100644 --- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt +++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt @@ -8,12 +8,12 @@ public final enum class My : kotlin.Enum { enum entry B private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt index 8251fd48009..c2f0e9c6b6f 100644 --- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt +++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt @@ -12,12 +12,12 @@ public final enum class E : kotlin.Enum { enum entry B private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt index 095f40e31b7..bf2c37a3852 100644 --- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt +++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt @@ -8,12 +8,12 @@ public final enum class E : kotlin.Enum { enum entry B private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt index df5b71ea8d6..d418e446762 100644 --- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt +++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt @@ -8,12 +8,12 @@ public final enum class My : kotlin.Enum { enum entry SECOND private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt index bd1207d94b1..1661d468153 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt @@ -10,12 +10,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry C private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt index bd1207d94b1..1661d468153 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt @@ -10,12 +10,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry C private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt index 749635d6164..3be5416bbcd 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt @@ -12,12 +12,12 @@ public final enum class Direction : kotlin.Enum { enum entry EAST private constructor Direction() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt index 60502a74c78..c661c3221ae 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt @@ -8,12 +8,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry B private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt index 6f271e0ea6b..cef7eb2edc5 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt index fc4b0d7e517..269359327fb 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt index 6f271e0ea6b..cef7eb2edc5 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt index 6f271e0ea6b..cef7eb2edc5 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt index 6f271e0ea6b..cef7eb2edc5 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt index 749635d6164..3be5416bbcd 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt @@ -12,12 +12,12 @@ public final enum class Direction : kotlin.Enum { enum entry EAST private constructor Direction() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt index eef4c56e809..fdfecbbe82b 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt @@ -8,12 +8,12 @@ public final enum class X : kotlin.Enum { enum entry B private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt index eef4c56e809..fdfecbbe82b 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt @@ -8,12 +8,12 @@ public final enum class X : kotlin.Enum { enum entry B private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt index eef4c56e809..fdfecbbe82b 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt @@ -8,12 +8,12 @@ public final enum class X : kotlin.Enum { enum entry B private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt index 6f271e0ea6b..cef7eb2edc5 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt @@ -8,12 +8,12 @@ public final enum class J : kotlin.Enum { enum entry B public constructor J() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt index c63b492a83a..7424acd0ae3 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt @@ -12,12 +12,12 @@ public final enum class X : kotlin.Enum { enum entry D private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt index c63b492a83a..7424acd0ae3 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt @@ -12,12 +12,12 @@ public final enum class X : kotlin.Enum { enum entry D private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt index c63b492a83a..7424acd0ae3 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt @@ -12,12 +12,12 @@ public final enum class X : kotlin.Enum { enum entry D private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt index cdbcc979cf9..0bf982364cb 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt @@ -12,12 +12,12 @@ public final enum class X : kotlin.Enum { enum entry D private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt index eef4c56e809..fdfecbbe82b 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt @@ -8,12 +8,12 @@ public final enum class X : kotlin.Enum { enum entry B private constructor X() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt index 117bbe67331..4485d4a9505 100644 --- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt +++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt @@ -6,12 +6,12 @@ public final enum class E : kotlin.Enum { enum entry B private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt index 7fc36ef25a4..823d61327b7 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt @@ -15,12 +15,12 @@ public final enum class C : kotlin.Enum { enum entry E2 private constructor C() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt index defb96cb38a..178f8488fd9 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt @@ -66,12 +66,12 @@ public final class A { enum entry Y private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { @@ -126,12 +126,12 @@ public final enum class E : kotlin.Enum { enum entry Y private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class B { @@ -194,12 +194,12 @@ public final enum class E : kotlin.Enum { enum entry Y private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { @@ -317,12 +317,12 @@ public interface T { enum entry Y private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: T.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public companion object Companion { diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt index 8128d3991b3..fd72cd1b1b0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt @@ -35,12 +35,12 @@ package test { enum entry ENTRY private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index dd7de070ba5..b9c9fccab50 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -12,10 +12,10 @@ public interface CustomAnnotation { enum entry ONE private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt index 7f3deba3d53..c3d3301394c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt @@ -8,10 +8,10 @@ public open class EnumArgumentWithCustomToString { enum entry CAKE private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumArgumentWithCustomToString.E diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt index 97e96756c0d..371212ab6a4 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt @@ -5,10 +5,10 @@ public final enum class EnumConstructorParameter : kotlin.Enum { private constructor EnumMembers(/*0*/ p0: kotlin.Boolean) public final val isFirst: kotlin.Boolean + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int public open fun first(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt index 0d03916a6a7..62cdaa33ab1 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt @@ -6,10 +6,10 @@ public open enum class EnumWithSpecializedEntry : kotlin.Enum { enum entry ANOTHER private constructor JavaEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt index 54279047800..6215543c81f 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt @@ -8,10 +8,10 @@ public final enum class Enum : kotlin.Enum { enum entry C private constructor Enum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open inner class Inner { public constructor Inner() diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt index 9ba8583d90b..48d4e0b668f 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt @@ -4,10 +4,10 @@ public final enum class StaticMembersInEnum : kotlin.Enum { enum entry ENTRY /*primary*/ private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt index 3ba0792a447..023c3f5a545 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt @@ -4,10 +4,12 @@ public final enum class E : kotlin.Enum { enum entry CAKE /*primary*/ private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt index da952fd0cb8..83f622b4445 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt @@ -10,14 +10,16 @@ package test public final enum class E : kotlin.Enum { /*primary*/ private constructor E(/*0*/ @test.A() x: kotlin.String, /*1*/ @test.B() y: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int public final val x: kotlin.String public final fun (): kotlin.String public final val y: kotlin.Int public final fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt index 208f16053a4..ac0e7b95376 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt @@ -2,10 +2,12 @@ package test public final enum class EnumWithGenericConstructorParameter : kotlin.Enum { /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: kotlin.List?) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithGenericConstructorParameter): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt index 5da24315d84..b1ab4756b17 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt @@ -2,10 +2,12 @@ package test public final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum { /*primary*/ private constructor EnumWithPrimitiveConstructorParameter(/*0*/ b: kotlin.Boolean) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithPrimitiveConstructorParameter): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt index e6341fa5071..a3050d07f80 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt @@ -4,10 +4,12 @@ internal final enum class In : kotlin.Enum { enum entry A /*primary*/ private constructor In() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In @@ -18,10 +20,12 @@ private final enum class Pr : kotlin.Enum { enum entry A /*primary*/ private constructor Pr() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr @@ -32,10 +36,12 @@ public final enum class Pu : kotlin.Enum { enum entry A /*primary*/ private constructor Pu() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt index db296dedd9c..a3ebe3f68b5 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt @@ -12,10 +12,12 @@ public final enum class En : kotlin.Enum { public final fun (): kotlin.Boolean public final val i: kotlin.Int public final fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt index becaf37ef56..fa830099f83 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt @@ -8,11 +8,13 @@ public final enum class Enum : kotlin.Enum { /*primary*/ private constructor Enum() public final val c: kotlin.Int = 1 public final fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum): kotlin.Int public final fun f(): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public final inner class Inner { /*primary*/ public constructor Inner() diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt index 6e3e94acc8a..befc9905d7f 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt @@ -7,10 +7,12 @@ public final class A { enum entry ENTRY /*primary*/ private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt index a9eb475f85b..f1a5c15c0ac 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt @@ -11,10 +11,12 @@ public final class A { enum entry ENTRY /*primary*/ private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt index a853aab251e..128faaf42bf 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt @@ -4,10 +4,12 @@ public final enum class MyEnum : kotlin.Enum { enum entry ENTRY /*primary*/ private constructor MyEnum() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt index 3c7b8178523..be04bab5435 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt @@ -6,10 +6,12 @@ public final enum class Test : kotlin.Enum { enum entry B /*primary*/ private constructor Test(/*0*/ a: kotlin.Int) + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt index a35c35d9c6c..b21d8ed86a3 100644 --- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt +++ b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt @@ -18,10 +18,12 @@ public final enum class E : kotlin.Enum { enum entry EIGHT /*primary*/ private constructor E() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt index 19a926fbe22..bc2ace6bfc9 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt @@ -26,10 +26,10 @@ public final enum class Weapon : kotlin.Enum { enum entry SCISSORS private constructor Weapon() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt index 31451d97ca9..ea6ab78656b 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt @@ -8,10 +8,10 @@ public final enum class My : kotlin.Enum { enum entry OMEGA private constructor My() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.My diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt index 33bee924dd2..ab8f73dfee5 100644 --- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt +++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt @@ -39,10 +39,10 @@ public final enum class Weapon : kotlin.Enum { enum entry SCISSORS private constructor Weapon() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon diff --git a/compiler/testData/serialization/js/dynamicConstants.txt b/compiler/testData/serialization/js/dynamicConstants.txt index 08185026a5a..a3569e949f0 100644 --- a/compiler/testData/serialization/js/dynamicConstants.txt +++ b/compiler/testData/serialization/js/dynamicConstants.txt @@ -37,10 +37,10 @@ public final enum class Weapon : kotlin.Enum { enum entry SCISSORS private constructor Weapon() + public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int - public final override /*1*/ /*fake_override*/ fun name(): kotlin.String - public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon diff --git a/core/builtins/native/kotlin/Enum.kt b/core/builtins/native/kotlin/Enum.kt index a93039f9155..1feeed4437e 100644 --- a/core/builtins/native/kotlin/Enum.kt +++ b/core/builtins/native/kotlin/Enum.kt @@ -27,13 +27,13 @@ public abstract class Enum>(name: String, ordinal: Int): Comparable< /** * Returns the name of this enum constant, exactly as declared in its enum declaration. */ - public final fun name(): String + public final val name: String /** * Returns the ordinal of this enumeration constant (its position in its enum declaration, where the initial constant * is assigned an ordinal of zero). */ - public final fun ordinal(): Int + public final val ordinal: Int public override final fun compareTo(other: E): Int diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt index 03ddaa48e98..8c3669cbf3a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt @@ -33,6 +33,8 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe object BuiltinSpecialProperties { private val PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP = mapOf( + FqName("kotlin.Enum.name") to Name.identifier("name"), + FqName("kotlin.Enum.ordinal") to Name.identifier("ordinal"), FqName("kotlin.Collection.size") to Name.identifier("size"), FqName("kotlin.Map.size") to Name.identifier("size"), FqName("kotlin.CharSequence.length") to Name.identifier("length"), diff --git a/idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt b/idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt index 462ce75c616..d9e26ed2eb3 100644 --- a/idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt +++ b/idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt @@ -4,9 +4,10 @@ // ERROR: 'ordinal' in 'E' is final and cannot be overridden enum class E {} interface X { - final fun ordinal() : Int = 42 + final val ordinal : Int + get() = 42 } class A : E(), X { - override fun ordinal() : Int = 24; + override val ordinal : Int = 24; } diff --git a/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after b/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after index f3a40d4f29c..bac2cef44f5 100644 --- a/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after +++ b/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after @@ -5,7 +5,7 @@ equals(Any?): Boolean location=→Enum FIRST hashCode(): Int location=→Enum - name(): String location=→Enum - ordinal(): Int location=→Enum + name: String location=→Enum + ordinal: Int location=→Enum SECOND toString(): String location=→Enum diff --git a/js/js.translator/testData/enum/cases/simpleEnum.kt b/js/js.translator/testData/enum/cases/simpleEnum.kt index 37b63efc2ef..e1fc96ef79d 100644 --- a/js/js.translator/testData/enum/cases/simpleEnum.kt +++ b/js/js.translator/testData/enum/cases/simpleEnum.kt @@ -5,5 +5,5 @@ enum class E { } fun box(): String { - return E.OK.name() + return E.OK.name } \ No newline at end of file diff --git a/js/js.translator/testData/enum/cases/standardMethods.kt b/js/js.translator/testData/enum/cases/standardMethods.kt index c392aef126b..bb35034a572 100644 --- a/js/js.translator/testData/enum/cases/standardMethods.kt +++ b/js/js.translator/testData/enum/cases/standardMethods.kt @@ -17,9 +17,9 @@ enum class B { c } fun box(): String { - if (Simple.OK.name() != "OK") return "Simple.OK.name() != OK, it: ${Simple.OK.name()}" + if (Simple.OK.name != "OK") return "Simple.OK.name != OK, it: ${Simple.OK.name}" val ok = Simple.OK - if (ok.ordinal() != 0) return "ok = Simple.Ok; ok.ordinal() != 0, it: ${ok.ordinal()}" + if (ok.ordinal != 0) return "ok = Simple.Ok; ok.ordinal != 0, it: ${ok.ordinal}" val ok2 = Simple.valueOf("OK") if (!ok2.equals(ok)) return "ok2 not equal ok" @@ -36,13 +36,13 @@ fun box(): String { if (A.a == A.b) return "A.a == A.b" if (A.a.hashCode() == A.b.hashCode()) return "hash(A.a) == hash(A.b)" - if (A.a.name() != "a") return "A.a.name() != a, it: ${A.a.name()}" - if (A.b.name() != "b") return "A.b.name() != b, it: ${A.b.name()}" - if (A.c.name() != "c") return "A.c.name() != c, it: ${A.c.name()}" + if (A.a.name != "a") return "A.a.name != a, it: ${A.a.name}" + if (A.b.name != "b") return "A.b.name != b, it: ${A.b.name}" + if (A.c.name != "c") return "A.c.name != c, it: ${A.c.name}" - if (A.a.ordinal() != 0) return "A.a.ordinal() != 0, it: ${A.a.ordinal()}" - if (A.b.ordinal() != 1) return "A.b.ordinal() != 1, it: ${A.b.ordinal()}" - if (A.c.ordinal() != 2) return "A.c.ordinal() != 2, it: ${A.c.ordinal()}" + if (A.a.ordinal != 0) return "A.a.ordinal != 0, it: ${A.a.ordinal}" + if (A.b.ordinal != 1) return "A.b.ordinal != 1, it: ${A.b.ordinal}" + if (A.c.ordinal != 2) return "A.c.ordinal != 2, it: ${A.c.ordinal}" if (A.c.equals(B.c)) return "A.c.equals(B.c)" diff --git a/js/js.translator/testData/inline/cases/simpleEnum.kt b/js/js.translator/testData/inline/cases/simpleEnum.kt index 15c7b50eb49..98827f90091 100644 --- a/js/js.translator/testData/inline/cases/simpleEnum.kt +++ b/js/js.translator/testData/inline/cases/simpleEnum.kt @@ -10,7 +10,7 @@ enum class MyEnum { //TODO: KT-4693 inline fun doSmth(a: T) : String { - return a.toString() + K.name() + return a.toString() + K.name } } diff --git a/js/js.translator/testData/kotlin_lib.js b/js/js.translator/testData/kotlin_lib.js index 974a41b06a9..7f7869cb386 100644 --- a/js/js.translator/testData/kotlin_lib.js +++ b/js/js.translator/testData/kotlin_lib.js @@ -324,11 +324,15 @@ this.name$ = void 0; this.ordinal$ = void 0; }, { - name: function () { - return this.name$; + name: { + get: function () { + return this.name$; + } }, - ordinal: function () { - return this.ordinal$; + ordinal: { + get: function () { + return this.ordinal$; + } }, equals_za3rmp$: function (o) { return this === o; @@ -340,7 +344,7 @@ return this.ordinal$ < o.ordinal$ ? -1 : this.ordinal$ > o.ordinal$ ? 1 : 0; }, toString: function () { - return this.name(); + return this.name; } } ); diff --git a/libraries/stdlib/src/kotlin/enums/Enums.kt b/libraries/stdlib/src/kotlin/enums/Enums.kt new file mode 100644 index 00000000000..df1e7335825 --- /dev/null +++ b/libraries/stdlib/src/kotlin/enums/Enums.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:kotlin.jvm.JvmMultifileClass +@file:kotlin.jvm.JvmName("EnumsKt") + +package kotlin + +@Deprecated("Use property ''name'' instead", ReplaceWith("this.name")) +public inline fun Enum<*>.name() = name + +@Deprecated("Use property ''ordinal'' instead", ReplaceWith("this.ordinal")) +public inline fun Enum<*>.ordinal() = ordinal +