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

Introduce EnumClassObjectDescriptor

Browse Source 
Extract the duplicate logic in deserialization and descriptor.loader.java
This commit is contained in:
Alexander Udalov
2014-07-06 06:50:02 +04:00
parent 8efeb3ac6a
commit de21f76e10
5 changed files with 108 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+2 -33
View File
@@ -40,20 +40,15 @@ import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor
import org.jetbrains.jet.lang.types.TypeUtils
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor
import org.jetbrains.jet.lang.descriptors.Modality
import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl
import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler
import org.jetbrains.jet.lang.resolve.scopes.WritableScope
import org.jetbrains.jet.lang.descriptors.annotations.Annotations
import org.jetbrains.jet.lang.descriptors.ClassKind
import org.jetbrains.jet.lang.resolve.DescriptorFactory
import java.util.ArrayList
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassStaticsPackageFragmentDescriptor
import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor
import org.jetbrains.jet.lang.resolve.name.SpecialNames
import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor
import org.jetbrains.jet.lang.resolve.java.lazy.resolveTopLevelClassInModule
import org.jetbrains.jet.lang.descriptors.impl.EnumClassObjectDescriptor
class LazyJavaClassDescriptor(
private val outerC: LazyJavaResolverContextWithTypes,
@@ -100,37 +95,11 @@ class LazyJavaClassDescriptor(
private val _classObjectDescriptor = c.storageManager.createNullableLazyValue {
if (jClass.isEnum()) {
val classObject = MutableClassDescriptor(this, this.getUnsubstitutedInnerClassesScope(), ClassKind.CLASS_OBJECT, false,
SpecialNames.getClassObjectName(this.getName()))
classObject.setSupertypes(listOf(KotlinBuiltIns.getInstance().getAnyType()))
classObject.setModality(Modality.FINAL)
classObject.setVisibility(jClass.getVisibility())
classObject.setTypeParameterDescriptors(listOf())
classObject.createTypeConstructor()
classObject.setPrimaryConstructor(DescriptorFactory.createPrimaryConstructorForObject(classObject))
val scope = LazyJavaClassMemberScope(c, classObject, jClass, enumClassObject = true)
val writableScope = WritableScopeImpl(scope, classObject, RedeclarationHandler.THROW_EXCEPTION, "Enum class object scope")
writableScope.changeLockLevel(WritableScope.LockLevel.BOTH)
classObject.setScopeForMemberLookup(writableScope)
createEnumSyntheticMethods(classObject, this.getDefaultType())
classObject
EnumClassObjectDescriptor(c.storageManager, this)
}
else null
}
private fun createEnumSyntheticMethods(classObject: MutableClassDescriptor, enumType: JetType) {
val valuesReturnType = KotlinBuiltIns.getInstance().getArrayType(enumType)
val valuesMethod = DescriptorFactory.createEnumClassObjectValuesMethod(classObject, valuesReturnType)
classObject.getBuilder().addFunctionDescriptor(valuesMethod)
val valueOfMethod = DescriptorFactory.createEnumClassObjectValueOfMethod(classObject, enumType)
classObject.getBuilder().addFunctionDescriptor(valueOfMethod)
}
override fun getCorrespondingPackageFragment() =
c.packageFragmentProvider.getPackageFragment(fqName) as? JavaClassStaticsPackageFragmentDescriptor
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+3 -4
View File
@@ -43,12 +43,11 @@ import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaMemberScope.
public class LazyJavaClassMemberScope(
c: LazyJavaResolverContextWithTypes,
containingDeclaration: ClassDescriptor,
private val jClass: JavaClass,
private val enumClassObject: Boolean = false
private val jClass: JavaClass
) : LazyJavaMemberScope(c, containingDeclaration) {
override fun computeMemberIndex(): MemberIndex {
return object : ClassMemberIndex(jClass, { !enumClassObject && !it.isStatic() }) {
return object : ClassMemberIndex(jClass, { !it.isStatic() }) {
// For SAM-constructors
override fun getAllMethodNames(): Collection<Name> = super.getAllMethodNames() + getAllClassNames()
}
@@ -239,7 +238,7 @@ public class LazyJavaClassMemberScope(
}
}
override fun getClassifier(name: Name): ClassifierDescriptor? = if (enumClassObject) null else nestedClasses(name)
override fun getClassifier(name: Name): ClassifierDescriptor? = nestedClasses(name)
override fun getAllClassNames(): Collection<Name> = nestedClassIndex().keySet() + enumEntryIndex().keySet()
// TODO
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+1 -3
View File
@@ -233,9 +233,7 @@ public abstract class LazyJavaMemberScope(
val field = memberIndex().findFieldByName(name)
if (field != null && !field.isEnumEntry()) {
if (!DescriptorUtils.isEnumClassObject(_containingDeclaration)) {
properties.add(resolveProperty(field))
}
properties.add(resolveProperty(field))
}
computeNonDeclaredProperties(name, properties)