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

Change parameter in DescriptorResolver#createEnumClassObject*Method.

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2012-08-21 16:15:28 +04:00
parent 546ec296e2
commit d28e59ac37
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+6 -6
View File
@@ -1146,11 +1146,11 @@ public class DescriptorResolver {
} }
public static SimpleFunctionDescriptor createEnumClassObjectValuesMethod( public static SimpleFunctionDescriptor createEnumClassObjectValuesMethod(
final ClassDescriptor enumClassDescriptor, @NotNull ClassDescriptor classObjectDescriptor,
BindingTrace trace BindingTrace trace
) { ) {
ClassDescriptor classObjectDescriptor = enumClassDescriptor.getClassObjectDescriptor(); final ClassDescriptor enumClassDescriptor = (ClassDescriptor) classObjectDescriptor.getContainingDeclaration();
assert classObjectDescriptor != null : "Enum class has no class object"; assert enumClassDescriptor.getKind() == ClassKind.ENUM_CLASS;
List<AnnotationDescriptor> annotations = Collections.<AnnotationDescriptor>emptyList(); List<AnnotationDescriptor> annotations = Collections.<AnnotationDescriptor>emptyList();
SimpleFunctionDescriptorImpl values = SimpleFunctionDescriptorImpl values =
new SimpleFunctionDescriptorImpl(classObjectDescriptor, annotations, new SimpleFunctionDescriptorImpl(classObjectDescriptor, annotations,
@@ -1171,11 +1171,11 @@ public class DescriptorResolver {
} }
public static SimpleFunctionDescriptor createEnumClassObjectValueOfMethod( public static SimpleFunctionDescriptor createEnumClassObjectValueOfMethod(
final ClassDescriptor enumClassDescriptor, @NotNull ClassDescriptor classObjectDescriptor,
BindingTrace trace BindingTrace trace
) { ) {
ClassDescriptor classObjectDescriptor = enumClassDescriptor.getClassObjectDescriptor(); final ClassDescriptor enumClassDescriptor = (ClassDescriptor) classObjectDescriptor.getContainingDeclaration();
assert classObjectDescriptor != null : "Enum class has no class object"; assert enumClassDescriptor.getKind() == ClassKind.ENUM_CLASS;
List<AnnotationDescriptor> annotations = Collections.<AnnotationDescriptor>emptyList(); List<AnnotationDescriptor> annotations = Collections.<AnnotationDescriptor>emptyList();
SimpleFunctionDescriptorImpl values = SimpleFunctionDescriptorImpl values =
new SimpleFunctionDescriptorImpl(classObjectDescriptor, annotations, new SimpleFunctionDescriptorImpl(classObjectDescriptor, annotations,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+2 -2
View File
@@ -303,8 +303,8 @@ public class TypeHierarchyResolver {
ConstructorDescriptorImpl primaryConstructorForObject = ConstructorDescriptorImpl primaryConstructorForObject =
createPrimaryConstructorForObject(null, classObjectDescriptor); createPrimaryConstructorForObject(null, classObjectDescriptor);
primaryConstructorForObject.setReturnType(classObjectDescriptor.getDefaultType()); primaryConstructorForObject.setReturnType(classObjectDescriptor.getDefaultType());
classObjectDescriptor.getBuilder().addFunctionDescriptor(DescriptorResolver.createEnumClassObjectValuesMethod(mutableClassDescriptor, trace)); classObjectDescriptor.getBuilder().addFunctionDescriptor(DescriptorResolver.createEnumClassObjectValuesMethod(classObjectDescriptor, trace));
classObjectDescriptor.getBuilder().addFunctionDescriptor(DescriptorResolver.createEnumClassObjectValueOfMethod(mutableClassDescriptor, trace)); classObjectDescriptor.getBuilder().addFunctionDescriptor(DescriptorResolver.createEnumClassObjectValueOfMethod(classObjectDescriptor, trace));
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
+2 -2
View File
@@ -149,12 +149,12 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
if (name.equals(DescriptorResolver.VALUES_METHOD_NAME)) { if (name.equals(DescriptorResolver.VALUES_METHOD_NAME)) {
SimpleFunctionDescriptor valuesMethod = DescriptorResolver SimpleFunctionDescriptor valuesMethod = DescriptorResolver
.createEnumClassObjectValuesMethod(classDescriptor, resolveSession.getTrace()); .createEnumClassObjectValuesMethod(thisDescriptor, resolveSession.getTrace());
result.add(valuesMethod); result.add(valuesMethod);
} }
else if (name.equals(DescriptorResolver.VALUE_OF_METHOD_NAME)) { else if (name.equals(DescriptorResolver.VALUE_OF_METHOD_NAME)) {
SimpleFunctionDescriptor valueOfMethod = DescriptorResolver SimpleFunctionDescriptor valueOfMethod = DescriptorResolver
.createEnumClassObjectValueOfMethod(classDescriptor, resolveSession.getTrace()); .createEnumClassObjectValueOfMethod(thisDescriptor, resolveSession.getTrace());
result.add(valueOfMethod); result.add(valueOfMethod);
} }
} }