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

Refactor: inject ResolverClassData in constructor of ClassDescriptorFromJvmBytecode

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-04 21:58:26 +04:00
parent 44031be74c
commit db5c04b360
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java
+5 -7
View File
@@ -36,7 +36,8 @@ public class ClassDescriptorFromJvmBytecode extends MutableClassDescriptorLite {
@NotNull
private final JavaDescriptorResolver javaDescriptorResolver;
private ResolverClassData resolverBinaryClassData = null;
@NotNull
private final ResolverClassData resolverBinaryClassData;
// lazy
@@ -44,24 +45,21 @@ public class ClassDescriptorFromJvmBytecode extends MutableClassDescriptorLite {
public ClassDescriptorFromJvmBytecode(
@NotNull DeclarationDescriptor containingDeclaration, @NotNull ClassKind kind,
@NotNull JavaDescriptorResolver javaDescriptorResolver
@NotNull JavaDescriptorResolver javaDescriptorResolver,
@NotNull ResolverClassData data
) {
super(containingDeclaration, kind);
this.javaDescriptorResolver = javaDescriptorResolver;
resolverBinaryClassData = data;
}
@NotNull
@Override
public Collection<ConstructorDescriptor> getConstructors() {
if (constructors == null) {
assert resolverBinaryClassData != null;
this.constructors = javaDescriptorResolver.resolveConstructors(resolverBinaryClassData,
this);
}
return constructors;
}
public void setClassData(@NotNull ResolverClassData resolverBinaryClassData) {
this.resolverBinaryClassData = resolverBinaryClassData;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java
+4 -6
View File
@@ -110,10 +110,9 @@ public final class JavaClassObjectResolver {
String qualifiedName = classObjectPsiClass.getQualifiedName();
assert qualifiedName != null;
FqName fqName = new FqName(qualifiedName);
ClassDescriptorFromJvmBytecode classObjectDescriptor
= new ClassDescriptorFromJvmBytecode(containing, ClassKind.CLASS_OBJECT, javaDescriptorResolver);
ResolverClassData classObjectData = ResolverClassData.createBinaryClassData(classObjectPsiClass, fqName);
classObjectDescriptor.setClassData(classObjectData);
ClassDescriptorFromJvmBytecode classObjectDescriptor
= new ClassDescriptorFromJvmBytecode(containing, ClassKind.CLASS_OBJECT, javaDescriptorResolver, classObjectData);
classObjectDescriptor.setSupertypes(supertypesResolver.getSupertypes(classObjectDescriptor, new PsiClassWrapper(classObjectPsiClass), classObjectData,
Collections.<TypeParameterDescriptor>emptyList()
));
@@ -151,10 +150,9 @@ public final class JavaClassObjectResolver {
) {
FqNameUnsafe fqName = DescriptorResolverUtils.getFqNameForClassObject(psiClass);
ClassDescriptorFromJvmBytecode classObjectDescriptor = new ClassDescriptorFromJvmBytecode(
containing, ClassKind.CLASS_OBJECT, javaDescriptorResolver);
ResolverClassData classData = ResolverClassData.createBinaryClassData(psiClass, null);
classObjectDescriptor.setClassData(classData);
ClassDescriptorFromJvmBytecode classObjectDescriptor = new ClassDescriptorFromJvmBytecode(
containing, ClassKind.CLASS_OBJECT, javaDescriptorResolver, classData);
ResolverClassData data = ResolverClassData.createSyntheticClassObjectClassData(psiClass);
setUpClassObjectDescriptor(classObjectDescriptor, containing, fqName, data, getClassObjectName(containing.getName().getName()));
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+2 -3
View File
@@ -224,10 +224,9 @@ public final class JavaClassResolver {
) {
JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass);
ClassKind kind = getClassKind(psiClass, jetClassAnnotation);
ClassDescriptorFromJvmBytecode classDescriptor
= new ClassDescriptorFromJvmBytecode(containingDeclaration, kind, javaDescriptorResolver);
ResolverClassData classData = ResolverClassData.createBinaryClassData(psiClass, fqName);
classDescriptor.setClassData(classData);
ClassDescriptorFromJvmBytecode classDescriptor
= new ClassDescriptorFromJvmBytecode(containingDeclaration, kind, javaDescriptorResolver, classData);
cache(javaClassToKotlinFqName(fqName), classDescriptor);
classDescriptor.setName(Name.identifier(psiClass.getName()));