From 1d2e02afb4e837ce682d97c4d57b57b8d9387315 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 14 Feb 2012 17:34:29 +0400 Subject: [PATCH] use MutableClassDescriptorLite instead of MutableClassDescriptor where MutableClassDescriptor is not necessary --- .../jet/lang/descriptors/MutableClassDescriptor.java | 4 ++-- .../lang/descriptors/MutableClassDescriptorLite.java | 10 +++++----- .../jet/lang/descriptors/NamespaceDescriptorImpl.java | 6 +++--- .../jetbrains/jet/lang/descriptors/NamespaceLike.java | 6 +++--- .../org/jetbrains/jet/lang/resolve/AnalyzingUtils.java | 6 +++--- .../jet/lang/resolve/DeclarationResolver.java | 2 +- .../jetbrains/jet/lang/resolve/TopDownAnalyzer.java | 7 ++++--- .../jet/lang/resolve/TypeHierarchyResolver.java | 4 ++-- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java index 2a507aa783c..4d2021fba8e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java @@ -50,7 +50,7 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite { @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull final MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull final MutableClassDescriptorLite classObjectDescriptor) { ClassObjectStatus r = super.setClassObjectDescriptor(classObjectDescriptor); if (r != ClassObjectStatus.OK) { return r; @@ -122,7 +122,7 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite { } @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { super.addClassifierDescriptor(classDescriptor); scopeForMemberResolution.addClassifierDescriptor(classDescriptor); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java index bee872a2149..a3722cf3551 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java @@ -36,7 +36,7 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp private Modality modality; private Visibility visibility; - private MutableClassDescriptor classObjectDescriptor; + private MutableClassDescriptorLite classObjectDescriptor; private JetType classObjectType; private JetType defaultType; private final ClassKind kind; @@ -65,7 +65,7 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { if (this.classObjectDescriptor != null) return ClassObjectStatus.DUPLICATE; if (!isStatic(this.getContainingDeclaration())) { return ClassObjectStatus.NOT_ALLOWED; @@ -226,7 +226,7 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp @Override @Nullable - public MutableClassDescriptor getClassObjectDescriptor() { + public MutableClassDescriptorLite getClassObjectDescriptor() { return classObjectDescriptor; } @@ -251,7 +251,7 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp } @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { getScopeForMemberLookupAsWritableScope().addClassifierDescriptor(classDescriptor); innerClassesAndObjects.put(classDescriptor.getName(), classDescriptor); } @@ -269,7 +269,7 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp } @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptor objectDescriptor) { + public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { getScopeForMemberLookupAsWritableScope().addObjectDescriptor(objectDescriptor); innerClassesAndObjects.put(objectDescriptor.getName(), objectDescriptor); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java index 8c0252afe9e..88cb95a6571 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java @@ -39,12 +39,12 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl imp } @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { memberScope.addClassifierDescriptor(classDescriptor); } @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptor objectDescriptor) { + public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { memberScope.addObjectDescriptor(objectDescriptor); } @@ -59,7 +59,7 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl imp } @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { throw new IllegalStateException("Must be guaranteed not to happen by the parser"); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceLike.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceLike.java index 6f74641d910..85eb81f9c5f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceLike.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceLike.java @@ -63,9 +63,9 @@ public interface NamespaceLike extends DeclarationDescriptor { void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor); - void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor); + void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor); - void addObjectDescriptor(@NotNull MutableClassDescriptor objectDescriptor); + void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor); void addFunctionDescriptor(@NotNull NamedFunctionDescriptor functionDescriptor); @@ -77,5 +77,5 @@ public interface NamespaceLike extends DeclarationDescriptor { NOT_ALLOWED } - ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor); + ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java index bab57d0a763..cc988da3bf1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java @@ -115,12 +115,12 @@ public class AnalyzingUtils { } @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { scope.addClassifierDescriptor(classDescriptor); } @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptor objectDescriptor) { + public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { } @@ -135,7 +135,7 @@ public class AnalyzingUtils { } @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { throw new IllegalStateException("Must be guaranteed not to happen by the parser"); } }, files, filesToAnalyzeCompletely, flowDataTraceFactory, configuration); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 517f1ad2493..7d95d9c4cd7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -133,7 +133,7 @@ public class DeclarationResolver { @Override public void visitEnumEntry(JetEnumEntry enumEntry) { if (enumEntry.getPrimaryConstructorParameterList() == null) { - MutableClassDescriptor classObjectDescriptor = ((MutableClassDescriptor) namespaceLike).getClassObjectDescriptor(); + MutableClassDescriptorLite classObjectDescriptor = ((MutableClassDescriptor) namespaceLike).getClassObjectDescriptor(); assert classObjectDescriptor != null; PropertyDescriptor propertyDescriptor = context.getDescriptorResolver().resolveObjectDeclarationAsPropertyDescriptor(classObjectDescriptor, enumEntry, context.getClasses().get(enumEntry)); classObjectDescriptor.addPropertyDescriptor(propertyDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 86ec027c2e2..44f65902ea0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -10,6 +10,7 @@ import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.MutableClassDescriptor; +import org.jetbrains.jet.lang.descriptors.MutableClassDescriptorLite; import org.jetbrains.jet.lang.descriptors.NamedFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptorImpl; @@ -136,12 +137,12 @@ public class TopDownAnalyzer { } @Override - public void addClassifierDescriptor(@NotNull MutableClassDescriptor classDescriptor) { + public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { } @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptor objectDescriptor) { + public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { } @@ -156,7 +157,7 @@ public class TopDownAnalyzer { } @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { return ClassObjectStatus.NOT_ALLOWED; } }, Collections.singletonList(object), Predicates.equalTo(object.getContainingFile()), JetControlFlowDataTraceFactory.EMPTY, Configuration.EMPTY, true); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index da0d17519cc..3a3d9af9d8b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -108,7 +108,7 @@ public class TypeHierarchyResolver { @Override public void visitEnumEntry(JetEnumEntry enumEntry) { - MutableClassDescriptor classObjectDescriptor = ((MutableClassDescriptor) owner).getClassObjectDescriptor(); + MutableClassDescriptorLite classObjectDescriptor = ((MutableClassDescriptor) owner).getClassObjectDescriptor(); assert classObjectDescriptor != null : enumEntry.getParent().getText(); if (enumEntry.getPrimaryConstructorParameterList() == null) { createClassDescriptorForObject(enumEntry, classObjectDescriptor, outerScopeForStatic, ClassKind.ENUM_ENTRY); @@ -126,7 +126,7 @@ public class TypeHierarchyResolver { private MutableClassDescriptor createClassDescriptorForObject(@NotNull JetClassOrObject declaration, @NotNull NamespaceLike owner, JetScope scope, ClassKind classKind) { MutableClassDescriptor mutableClassDescriptor = new MutableClassDescriptor(context.getTrace(), owner, scope, classKind) { @Override - public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { return ClassObjectStatus.NOT_ALLOWED; } };