From 959ab2b20ccefe273a6513dd9389e0835e3e04f6 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 22 Oct 2013 15:03:44 +0400 Subject: [PATCH] Enum class objects values and valueOf functions have kind SYNTHESIZED --- .../lazyResolve/namespaceComparator/enum.txt | 4 ++-- compiler/testData/loadJava/compiledJava/JavaEnum.txt | 4 ++-- .../compiledJava/annotations/CustomAnnotation.txt | 4 ++-- .../testData/loadJava/compiledJava/static/Enum.txt | 4 ++-- .../compiledJava/static/StaticMembersInEnum.txt | 4 ++-- .../annotations/parameters/EnumConstructor.txt | 4 ++-- .../class/EnumWithGenericConstructorParameter.txt | 4 ++-- .../class/EnumWithPrimitiveConstructorParameter.txt | 4 ++-- .../loadKotlinCustom/enum/enumVisibilityBinary.txt | 12 ++++++------ .../loadKotlinCustom/enum/enumVisibilitySource.txt | 12 ++++++------ .../loadKotlinCustom/enum/innerEnumBinary.txt | 4 ++-- .../enum/innerEnumExistingClassObjectBinary.txt | 4 ++-- .../enum/innerEnumExistingClassObjectSource.txt | 4 ++-- .../loadKotlinCustom/enum/innerEnumSource.txt | 4 ++-- .../loadKotlinCustom/enum/simpleEnumBinary.txt | 4 ++-- .../loadKotlinCustom/enum/simpleEnumSource.txt | 4 ++-- .../jet/lang/resolve/DescriptorFactory.java | 4 ++-- idea/testData/libraries/decompiled/Color.kt | 4 ---- 18 files changed, 42 insertions(+), 46 deletions(-) diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/namespaceComparator/enum.txt index e2f0bbe1b9e..33d20ffb696 100644 --- a/compiler/testData/lazyResolve/namespaceComparator/enum.txt +++ b/compiler/testData/lazyResolve/namespaceComparator/enum.txt @@ -9,8 +9,8 @@ internal final enum class Test : jet.Enum { /*primary*/ private constructor () public final val A: test.Test public final val B: test.Test - public final fun valueOf(/*0*/ value: jet.String): test.Test - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Test + public final /*synthesized*/ fun values(): jet.Array private enum entry A : test.Test { /*primary*/ private constructor A() diff --git a/compiler/testData/loadJava/compiledJava/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/JavaEnum.txt index fe330827207..028b99dc84c 100644 --- a/compiler/testData/loadJava/compiledJava/JavaEnum.txt +++ b/compiler/testData/loadJava/compiledJava/JavaEnum.txt @@ -9,7 +9,7 @@ public final enum class JavaEnum : jet.Enum { private constructor () public final val ANOTHER: test.JavaEnum public final val ENTRY: test.JavaEnum - public final fun valueOf(/*0*/ value: jet.String): test.JavaEnum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.JavaEnum + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index b218cf0206b..d77f1c33000 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -15,8 +15,8 @@ public trait CustomAnnotation : java.lang.Object { public class object { private constructor () public final val ONE: test.CustomAnnotation.MyEnum - public final fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt index 08b7e4be39d..2895a565277 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt @@ -10,8 +10,8 @@ public final enum class Enum : jet.Enum { public final val A: test.Enum public final val B: test.Enum public final val C: test.Enum - public final fun valueOf(/*0*/ value: jet.String): test.Enum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Enum + public final /*synthesized*/ fun values(): jet.Array } public open inner class Inner : java.lang.Object { diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt index 7f649452635..e8738b2689a 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt @@ -8,8 +8,8 @@ public final enum class StaticMembersInEnum : jet.Enum public class object { private constructor () public final val ENTRY: test.StaticMembersInEnum - public final fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt index 8fdcb981de8..704eb81c7a3 100644 --- a/compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt +++ b/compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt @@ -19,7 +19,7 @@ internal final enum class E : jet.Enum { internal class object { /*primary*/ private constructor () - public final fun valueOf(/*0*/ value: jet.String): test.E - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.E + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt index a620ef204d3..667079e2628 100644 --- a/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt +++ b/compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt @@ -7,7 +7,7 @@ internal final enum class EnumWithGenericConstructorParameter : jet.Enum { /*primary*/ private constructor () - public final fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt index c015e26a3bd..054a368bbca 100644 --- a/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt +++ b/compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt @@ -7,7 +7,7 @@ internal final enum class EnumWithPrimitiveConstructorParameter : jet.Enum { /*primary*/ private constructor () - public final fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt b/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt index b800c655aed..a18552e47a4 100644 --- a/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt +++ b/compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt @@ -8,8 +8,8 @@ internal final enum class In : jet.Enum { internal class object { private constructor () public final val A: test.In - public final fun valueOf(/*0*/ value: jet.String): test.In - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.In + public final /*synthesized*/ fun values(): jet.Array } } @@ -21,8 +21,8 @@ private final enum class Pr : jet.Enum { private class object { private constructor () public final val A: test.Pr - public final fun valueOf(/*0*/ value: jet.String): test.Pr - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pr + public final /*synthesized*/ fun values(): jet.Array } } @@ -34,7 +34,7 @@ public final enum class Pu : jet.Enum { public class object { private constructor () public final val A: test.Pu - public final fun valueOf(/*0*/ value: jet.String): test.Pu - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pu + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt b/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt index 6580aabf903..c4806647b10 100644 --- a/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt +++ b/compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt @@ -8,8 +8,8 @@ internal final enum class In : jet.Enum { internal class object { /*primary*/ private constructor () public final val A: test.In - public final fun valueOf(/*0*/ value: jet.String): test.In - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.In + public final /*synthesized*/ fun values(): jet.Array private enum entry A : test.In { /*primary*/ private constructor A() @@ -27,8 +27,8 @@ private final enum class Pr : jet.Enum { private class object { /*primary*/ private constructor () public final val A: test.Pr - public final fun valueOf(/*0*/ value: jet.String): test.Pr - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pr + public final /*synthesized*/ fun values(): jet.Array private enum entry A : test.Pr { /*primary*/ private constructor A() @@ -46,8 +46,8 @@ public final enum class Pu : jet.Enum { public class object { /*primary*/ private constructor () public final val A: test.Pu - public final fun valueOf(/*0*/ value: jet.String): test.Pu - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pu + public final /*synthesized*/ fun values(): jet.Array private enum entry A : test.Pu { /*primary*/ private constructor A() diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt index 56ef2bd0f8c..2eaba6984ee 100644 --- a/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt +++ b/compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt @@ -11,8 +11,8 @@ internal final class A { internal class object { private constructor () public final val ENTRY: test.A.E - public final fun valueOf(/*0*/ value: jet.String): test.A.E - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E + public final /*synthesized*/ fun values(): jet.Array } } } diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt index 2948fc2446c..66f49dc7e37 100644 --- a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt +++ b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt @@ -15,8 +15,8 @@ internal final class A { internal class object { private constructor () public final val ENTRY: test.A.E - public final fun valueOf(/*0*/ value: jet.String): test.A.E - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E + public final /*synthesized*/ fun values(): jet.Array } } } diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt index 80e73ee0daa..9f0f18b3d21 100644 --- a/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt +++ b/compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt @@ -15,8 +15,8 @@ internal final class A { internal class object { /*primary*/ private constructor () public final val ENTRY: test.A.E - public final fun valueOf(/*0*/ value: jet.String): test.A.E - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E + public final /*synthesized*/ fun values(): jet.Array private enum entry ENTRY : test.A.E { /*primary*/ private constructor ENTRY() diff --git a/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt b/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt index dc6c37b8725..201832d7903 100644 --- a/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt +++ b/compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt @@ -11,8 +11,8 @@ internal final class A { internal class object { /*primary*/ private constructor () public final val ENTRY: test.A.E - public final fun valueOf(/*0*/ value: jet.String): test.A.E - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E + public final /*synthesized*/ fun values(): jet.Array private enum entry ENTRY : test.A.E { /*primary*/ private constructor ENTRY() diff --git a/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt b/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt index a48ca3caaed..80d9fa7e5df 100644 --- a/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt +++ b/compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt @@ -8,7 +8,7 @@ internal final enum class MyEnum : jet.Enum { internal class object { private constructor () public final val ENTRY: test.MyEnum - public final fun valueOf(/*0*/ value: jet.String): test.MyEnum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.MyEnum + public final /*synthesized*/ fun values(): jet.Array } } diff --git a/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt b/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt index 2295330d841..e0b765e63ce 100644 --- a/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt +++ b/compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt @@ -8,8 +8,8 @@ internal final enum class MyEnum : jet.Enum { internal class object { /*primary*/ private constructor () public final val ENTRY: test.MyEnum - public final fun valueOf(/*0*/ value: jet.String): test.MyEnum - public final fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.MyEnum + public final /*synthesized*/ fun values(): jet.Array private enum entry ENTRY : test.MyEnum { /*primary*/ private constructor ENTRY() diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java index 41b5f725378..ae3bba4f0d0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java @@ -85,7 +85,7 @@ public class DescriptorFactory { ) { SimpleFunctionDescriptorImpl values = new SimpleFunctionDescriptorImpl(classObject, Collections.emptyList(), VALUES_METHOD_NAME, - CallableMemberDescriptor.Kind.DECLARATION); + CallableMemberDescriptor.Kind.SYNTHESIZED); return values.initialize(null, classObject.getThisAsReceiverParameter(), Collections.emptyList(), Collections.emptyList(), returnType, Modality.FINAL, @@ -99,7 +99,7 @@ public class DescriptorFactory { ) { SimpleFunctionDescriptorImpl values = new SimpleFunctionDescriptorImpl(classObject, Collections.emptyList(), VALUE_OF_METHOD_NAME, - CallableMemberDescriptor.Kind.DECLARATION); + CallableMemberDescriptor.Kind.SYNTHESIZED); ValueParameterDescriptor parameterDescriptor = new ValueParameterDescriptorImpl( values, 0, diff --git a/idea/testData/libraries/decompiled/Color.kt b/idea/testData/libraries/decompiled/Color.kt index 180f27249f1..80972b81114 100644 --- a/idea/testData/libraries/decompiled/Color.kt +++ b/idea/testData/libraries/decompiled/Color.kt @@ -10,10 +10,6 @@ package testData.libraries [public final val GREEN: testData.libraries.Color] /* compiled code */ [public final val RED: testData.libraries.Color] /* compiled code */ - - [public final fun valueOf(value: jet.String): testData.libraries.Color { /* compiled code */ }] - - [public final fun values(): jet.Array { /* compiled code */ }] }]] [internal final val rgb: jet.Int] /* compiled code */