azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enum class objects values and valueOf functions have kind SYNTHESIZED

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-10-22 15:03:44 +04:00
parent dfef9aa6e9
commit 959ab2b20c
18 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/lazyResolve/namespaceComparator/enum.txt
+2 -2
View File
@@ -9,8 +9,8 @@ internal final enum class Test : jet.Enum<test.Test> {
/*primary*/ private constructor <class-object-for-Test>() /*primary*/ private constructor <class-object-for-Test>()
public final val A: test.Test public final val A: test.Test
public final val B: test.Test public final val B: test.Test
public final fun valueOf(/*0*/ value: jet.String): test.Test public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Test
public final fun values(): jet.Array<test.Test> public final /*synthesized*/ fun values(): jet.Array<test.Test>
private enum entry A : test.Test { private enum entry A : test.Test {
/*primary*/ private constructor A() /*primary*/ private constructor A()
compiler/testData/loadJava/compiledJava/JavaEnum.txt
+2 -2
View File
@@ -9,7 +9,7 @@ public final enum class JavaEnum : jet.Enum<test.JavaEnum> {
private constructor <class-object-for-JavaEnum>() private constructor <class-object-for-JavaEnum>()
public final val ANOTHER: test.JavaEnum public final val ANOTHER: test.JavaEnum
public final val ENTRY: test.JavaEnum public final val ENTRY: test.JavaEnum
public final fun valueOf(/*0*/ value: jet.String): test.JavaEnum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.JavaEnum
public final fun values(): jet.Array<test.JavaEnum> public final /*synthesized*/ fun values(): jet.Array<test.JavaEnum>
} }
} }
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+2 -2
View File
@@ -15,8 +15,8 @@ public trait CustomAnnotation : java.lang.Object {
public class object <class-object-for-MyEnum> { public class object <class-object-for-MyEnum> {
private constructor <class-object-for-MyEnum>() private constructor <class-object-for-MyEnum>()
public final val ONE: test.CustomAnnotation.MyEnum public final val ONE: test.CustomAnnotation.MyEnum
public final fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum
public final fun values(): jet.Array<test.CustomAnnotation.MyEnum> public final /*synthesized*/ fun values(): jet.Array<test.CustomAnnotation.MyEnum>
} }
} }
compiler/testData/loadJava/compiledJava/static/Enum.txt
+2 -2
View File
@@ -10,8 +10,8 @@ public final enum class Enum : jet.Enum<test.Enum> {
public final val A: test.Enum public final val A: test.Enum
public final val B: test.Enum public final val B: test.Enum
public final val C: test.Enum public final val C: test.Enum
public final fun valueOf(/*0*/ value: jet.String): test.Enum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Enum
public final fun values(): jet.Array<test.Enum> public final /*synthesized*/ fun values(): jet.Array<test.Enum>
} }
public open inner class Inner : java.lang.Object { public open inner class Inner : java.lang.Object {
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+2 -2
View File
@@ -8,8 +8,8 @@ public final enum class StaticMembersInEnum : jet.Enum<test.StaticMembersInEnum>
public class object <class-object-for-StaticMembersInEnum> { public class object <class-object-for-StaticMembersInEnum> {
private constructor <class-object-for-StaticMembersInEnum>() private constructor <class-object-for-StaticMembersInEnum>()
public final val ENTRY: test.StaticMembersInEnum public final val ENTRY: test.StaticMembersInEnum
public final fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum
public final fun values(): jet.Array<test.StaticMembersInEnum> public final /*synthesized*/ fun values(): jet.Array<test.StaticMembersInEnum>
} }
} }
compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt
+2 -2
View File
@@ -19,7 +19,7 @@ internal final enum class E : jet.Enum<test.E> {
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>() /*primary*/ private constructor <class-object-for-E>()
public final fun valueOf(/*0*/ value: jet.String): test.E public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.E
public final fun values(): jet.Array<test.E> public final /*synthesized*/ fun values(): jet.Array<test.E>
} }
} }
compiler/testData/loadKotlin/class/EnumWithGenericConstructorParameter.txt
+2 -2
View File
@@ -7,7 +7,7 @@ internal final enum class EnumWithGenericConstructorParameter : jet.Enum<test.En
internal class object <class-object-for-EnumWithGenericConstructorParameter> { internal class object <class-object-for-EnumWithGenericConstructorParameter> {
/*primary*/ private constructor <class-object-for-EnumWithGenericConstructorParameter>() /*primary*/ private constructor <class-object-for-EnumWithGenericConstructorParameter>()
public final fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter
public final fun values(): jet.Array<test.EnumWithGenericConstructorParameter> public final /*synthesized*/ fun values(): jet.Array<test.EnumWithGenericConstructorParameter>
} }
} }
compiler/testData/loadKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+2 -2
View File
@@ -7,7 +7,7 @@ internal final enum class EnumWithPrimitiveConstructorParameter : jet.Enum<test.
internal class object <class-object-for-EnumWithPrimitiveConstructorParameter> { internal class object <class-object-for-EnumWithPrimitiveConstructorParameter> {
/*primary*/ private constructor <class-object-for-EnumWithPrimitiveConstructorParameter>() /*primary*/ private constructor <class-object-for-EnumWithPrimitiveConstructorParameter>()
public final fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter
public final fun values(): jet.Array<test.EnumWithPrimitiveConstructorParameter> public final /*synthesized*/ fun values(): jet.Array<test.EnumWithPrimitiveConstructorParameter>
} }
} }
compiler/testData/loadKotlinCustom/enum/enumVisibilityBinary.txt
+6 -6
View File
@@ -8,8 +8,8 @@ internal final enum class In : jet.Enum<test.In> {
internal class object <class-object-for-In> { internal class object <class-object-for-In> {
private constructor <class-object-for-In>() private constructor <class-object-for-In>()
public final val A: test.In public final val A: test.In
public final fun valueOf(/*0*/ value: jet.String): test.In public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.In
public final fun values(): jet.Array<test.In> public final /*synthesized*/ fun values(): jet.Array<test.In>
} }
} }
@@ -21,8 +21,8 @@ private final enum class Pr : jet.Enum<test.Pr> {
private class object <class-object-for-Pr> { private class object <class-object-for-Pr> {
private constructor <class-object-for-Pr>() private constructor <class-object-for-Pr>()
public final val A: test.Pr public final val A: test.Pr
public final fun valueOf(/*0*/ value: jet.String): test.Pr public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pr
public final fun values(): jet.Array<test.Pr> public final /*synthesized*/ fun values(): jet.Array<test.Pr>
} }
} }
@@ -34,7 +34,7 @@ public final enum class Pu : jet.Enum<test.Pu> {
public class object <class-object-for-Pu> { public class object <class-object-for-Pu> {
private constructor <class-object-for-Pu>() private constructor <class-object-for-Pu>()
public final val A: test.Pu public final val A: test.Pu
public final fun valueOf(/*0*/ value: jet.String): test.Pu public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pu
public final fun values(): jet.Array<test.Pu> public final /*synthesized*/ fun values(): jet.Array<test.Pu>
} }
} }
compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt
+6 -6
View File
@@ -8,8 +8,8 @@ internal final enum class In : jet.Enum<test.In> {
internal class object <class-object-for-In> { internal class object <class-object-for-In> {
/*primary*/ private constructor <class-object-for-In>() /*primary*/ private constructor <class-object-for-In>()
public final val A: test.In public final val A: test.In
public final fun valueOf(/*0*/ value: jet.String): test.In public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.In
public final fun values(): jet.Array<test.In> public final /*synthesized*/ fun values(): jet.Array<test.In>
private enum entry A : test.In { private enum entry A : test.In {
/*primary*/ private constructor A() /*primary*/ private constructor A()
@@ -27,8 +27,8 @@ private final enum class Pr : jet.Enum<test.Pr> {
private class object <class-object-for-Pr> { private class object <class-object-for-Pr> {
/*primary*/ private constructor <class-object-for-Pr>() /*primary*/ private constructor <class-object-for-Pr>()
public final val A: test.Pr public final val A: test.Pr
public final fun valueOf(/*0*/ value: jet.String): test.Pr public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pr
public final fun values(): jet.Array<test.Pr> public final /*synthesized*/ fun values(): jet.Array<test.Pr>
private enum entry A : test.Pr { private enum entry A : test.Pr {
/*primary*/ private constructor A() /*primary*/ private constructor A()
@@ -46,8 +46,8 @@ public final enum class Pu : jet.Enum<test.Pu> {
public class object <class-object-for-Pu> { public class object <class-object-for-Pu> {
/*primary*/ private constructor <class-object-for-Pu>() /*primary*/ private constructor <class-object-for-Pu>()
public final val A: test.Pu public final val A: test.Pu
public final fun valueOf(/*0*/ value: jet.String): test.Pu public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pu
public final fun values(): jet.Array<test.Pu> public final /*synthesized*/ fun values(): jet.Array<test.Pu>
private enum entry A : test.Pu { private enum entry A : test.Pu {
/*primary*/ private constructor A() /*primary*/ private constructor A()
compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
+2 -2
View File
@@ -11,8 +11,8 @@ internal final class A {
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
private constructor <class-object-for-E>() private constructor <class-object-for-E>()
public final val ENTRY: test.A.E public final val ENTRY: test.A.E
public final fun valueOf(/*0*/ value: jet.String): test.A.E public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E
public final fun values(): jet.Array<test.A.E> public final /*synthesized*/ fun values(): jet.Array<test.A.E>
} }
} }
} }
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
+2 -2
View File
@@ -15,8 +15,8 @@ internal final class A {
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
private constructor <class-object-for-E>() private constructor <class-object-for-E>()
public final val ENTRY: test.A.E public final val ENTRY: test.A.E
public final fun valueOf(/*0*/ value: jet.String): test.A.E public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E
public final fun values(): jet.Array<test.A.E> public final /*synthesized*/ fun values(): jet.Array<test.A.E>
} }
} }
} }
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
+2 -2
View File
@@ -15,8 +15,8 @@ internal final class A {
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>() /*primary*/ private constructor <class-object-for-E>()
public final val ENTRY: test.A.E public final val ENTRY: test.A.E
public final fun valueOf(/*0*/ value: jet.String): test.A.E public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E
public final fun values(): jet.Array<test.A.E> public final /*synthesized*/ fun values(): jet.Array<test.A.E>
private enum entry ENTRY : test.A.E { private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY() /*primary*/ private constructor ENTRY()
compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
+2 -2
View File
@@ -11,8 +11,8 @@ internal final class A {
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>() /*primary*/ private constructor <class-object-for-E>()
public final val ENTRY: test.A.E public final val ENTRY: test.A.E
public final fun valueOf(/*0*/ value: jet.String): test.A.E public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E
public final fun values(): jet.Array<test.A.E> public final /*synthesized*/ fun values(): jet.Array<test.A.E>
private enum entry ENTRY : test.A.E { private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY() /*primary*/ private constructor ENTRY()
compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
+2 -2
View File
@@ -8,7 +8,7 @@ internal final enum class MyEnum : jet.Enum<test.MyEnum> {
internal class object <class-object-for-MyEnum> { internal class object <class-object-for-MyEnum> {
private constructor <class-object-for-MyEnum>() private constructor <class-object-for-MyEnum>()
public final val ENTRY: test.MyEnum public final val ENTRY: test.MyEnum
public final fun valueOf(/*0*/ value: jet.String): test.MyEnum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.MyEnum
public final fun values(): jet.Array<test.MyEnum> public final /*synthesized*/ fun values(): jet.Array<test.MyEnum>
} }
} }
compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt
+2 -2
View File
@@ -8,8 +8,8 @@ internal final enum class MyEnum : jet.Enum<test.MyEnum> {
internal class object <class-object-for-MyEnum> { internal class object <class-object-for-MyEnum> {
/*primary*/ private constructor <class-object-for-MyEnum>() /*primary*/ private constructor <class-object-for-MyEnum>()
public final val ENTRY: test.MyEnum public final val ENTRY: test.MyEnum
public final fun valueOf(/*0*/ value: jet.String): test.MyEnum public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.MyEnum
public final fun values(): jet.Array<test.MyEnum> public final /*synthesized*/ fun values(): jet.Array<test.MyEnum>
private enum entry ENTRY : test.MyEnum { private enum entry ENTRY : test.MyEnum {
/*primary*/ private constructor ENTRY() /*primary*/ private constructor ENTRY()
core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class DescriptorFactory {
) { ) {
SimpleFunctionDescriptorImpl values = SimpleFunctionDescriptorImpl values =
new SimpleFunctionDescriptorImpl(classObject, Collections.<AnnotationDescriptor>emptyList(), VALUES_METHOD_NAME, new SimpleFunctionDescriptorImpl(classObject, Collections.<AnnotationDescriptor>emptyList(), VALUES_METHOD_NAME,
CallableMemberDescriptor.Kind.DECLARATION); CallableMemberDescriptor.Kind.SYNTHESIZED);
return values.initialize(null, classObject.getThisAsReceiverParameter(), Collections.<TypeParameterDescriptor>emptyList(), return values.initialize(null, classObject.getThisAsReceiverParameter(), Collections.<TypeParameterDescriptor>emptyList(),
Collections.<ValueParameterDescriptor>emptyList(), Collections.<ValueParameterDescriptor>emptyList(),
returnType, Modality.FINAL, returnType, Modality.FINAL,
@@ -99,7 +99,7 @@ public class DescriptorFactory {
) { ) {
SimpleFunctionDescriptorImpl values = SimpleFunctionDescriptorImpl values =
new SimpleFunctionDescriptorImpl(classObject, Collections.<AnnotationDescriptor>emptyList(), VALUE_OF_METHOD_NAME, new SimpleFunctionDescriptorImpl(classObject, Collections.<AnnotationDescriptor>emptyList(), VALUE_OF_METHOD_NAME,
CallableMemberDescriptor.Kind.DECLARATION); CallableMemberDescriptor.Kind.SYNTHESIZED);
ValueParameterDescriptor parameterDescriptor = new ValueParameterDescriptorImpl( ValueParameterDescriptor parameterDescriptor = new ValueParameterDescriptorImpl(
values, values,
0, 0,
idea/testData/libraries/decompiled/Color.kt
-4
View File
@@ -10,10 +10,6 @@ package testData.libraries
[public final val GREEN: testData.libraries.Color] /* compiled code */ [public final val GREEN: testData.libraries.Color] /* compiled code */
[public final val RED: 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<testData.libraries.Color> { /* compiled code */ }]
}]] }]]
[internal final val rgb: jet.Int] /* compiled code */ [internal final val rgb: jet.Int] /* compiled code */