From 6e15ed3153e6fbcacd2b8798b9c5ebea29768210 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 15 Oct 2012 17:14:05 +0400 Subject: [PATCH] WithDeferredResolve removed (it was never used) --- .../MutableClassDescriptorLite.java | 13 +--------- .../descriptors/NamespaceDescriptorImpl.java | 12 +-------- .../lang/descriptors/WithDeferredResolve.java | 25 ------------------- .../lang/resolve/TopDownAnalysisContext.java | 2 +- .../lang/resolve/TypeHierarchyResolver.java | 6 ++--- 5 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/descriptors/WithDeferredResolve.java 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 01dab6767eb..da643a50d59 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java @@ -37,8 +37,7 @@ import java.util.List; /** * @author Stepan Koltsov */ -public abstract class MutableClassDescriptorLite extends ClassDescriptorBase - implements WithDeferredResolve { +public abstract class MutableClassDescriptorLite extends ClassDescriptorBase { private List annotations = Lists.newArrayList(); @@ -68,16 +67,6 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase this.kind = kind; } - @Override - public void forceResolve() { - - } - - @Override - public boolean isAlreadyResolved() { - return false; - } - @NotNull @Override public DeclarationDescriptor getContainingDeclaration() { 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 e97dccd31d7..77345674a36 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java @@ -28,7 +28,7 @@ import java.util.List; /** * @author abreslav */ -public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl implements WithDeferredResolve { +public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { private WritableScope memberScope; @@ -102,14 +102,4 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl imp return builder; } - - @Override - public void forceResolve() { - - } - - @Override - public boolean isAlreadyResolved() { - return false; - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/WithDeferredResolve.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/WithDeferredResolve.java deleted file mode 100644 index da3177fa2e4..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/WithDeferredResolve.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.descriptors; - -/** - * @author Nikolay Krasko - */ -public interface WithDeferredResolve { - void forceResolve(); - boolean isAlreadyResolved(); -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index bb5ec650242..ed81b3ddcba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -47,7 +47,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext { // File scopes - package scope extended with imports protected final Map namespaceScopes = Maps.newHashMap(); - public final Map forDeferredResolver = Maps.newHashMap(); + public final Map forDeferredResolver = Maps.newHashMap(); public final Map normalScope = Maps.newHashMap(); 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 09edbc218c6..f207cd7a421 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -112,7 +112,7 @@ public class TypeHierarchyResolver { JetDeclarationContainer declarationContainer = forDeferredResolve.poll(); assert declarationContainer != null; - WithDeferredResolve descriptorForDeferredResolve = context.forDeferredResolver.get(declarationContainer); + DeclarationDescriptor descriptorForDeferredResolve = context.forDeferredResolver.get(declarationContainer); JetScope scope = context.normalScope.get(declarationContainer); // Even more temp code @@ -668,12 +668,12 @@ public class TypeHierarchyResolver { private void prepareForDeferredCall( @NotNull JetScope outerScope, - @NotNull WithDeferredResolve withDeferredResolve, + @NotNull DeclarationDescriptor descriptorForDeferredResolve, @NotNull JetDeclarationContainer container ) { forDeferredResolve.add(container); context.normalScope.put(container, outerScope); - context.forDeferredResolver.put(container, withDeferredResolve); + context.forDeferredResolver.put(container, descriptorForDeferredResolve); } @Nullable