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

Unused code removed from TopDownAnalysisContext

Browse Source
This commit is contained in:
Andrey Breslav
2015-01-23 20:11:49 +03:00
parent 32a3b58f14
commit b567356702
1 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+5 -31
View File
@@ -25,17 +25,17 @@ import kotlin.Function1;
import kotlin.KotlinPackage; import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor;
import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.resolve.scopes.WritableScope;
import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.ExceptionTracker;
import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.storage.StorageManager;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.*; import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
public class TopDownAnalysisContext implements BodiesResolveContext { public class TopDownAnalysisContext implements BodiesResolveContext {
@@ -43,9 +43,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
private final Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = Maps.newLinkedHashMap(); private final Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = Maps.newLinkedHashMap();
private final Map<JetClassInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap(); private final Map<JetClassInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
protected final Map<JetFile, MutablePackageFragmentDescriptor> packageFragments = Maps.newHashMap(); private final Set<JetFile> files = new LinkedHashSet<JetFile>();
protected final Set<JetFile> files = new LinkedHashSet<JetFile>();
private List<MutableClassDescriptor> classesTopologicalOrder = null;
private final Map<JetDeclaration, JetScope> declaringScopes = Maps.newHashMap(); private final Map<JetDeclaration, JetScope> declaringScopes = Maps.newHashMap();
private final Map<JetNamedFunction, SimpleFunctionDescriptor> functions = Maps.newLinkedHashMap(); private final Map<JetNamedFunction, SimpleFunctionDescriptor> functions = Maps.newLinkedHashMap();
@@ -53,13 +51,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
private final Map<JetParameter, PropertyDescriptor> primaryConstructorParameterProperties = Maps.newHashMap(); private final Map<JetParameter, PropertyDescriptor> primaryConstructorParameterProperties = Maps.newHashMap();
private Map<JetCallableDeclaration, CallableMemberDescriptor> members = null; private Map<JetCallableDeclaration, CallableMemberDescriptor> members = null;
// File scopes - package scope extended with imports
protected final Map<JetFile, WritableScope> fileScopes = Maps.newHashMap();
public final Map<JetDeclarationContainer, DeclarationDescriptor> forDeferredResolver = Maps.newHashMap();
public final Map<JetDeclarationContainer, JetScope> normalScope = Maps.newHashMap();
private final Map<JetScript, ScriptDescriptor> scripts = Maps.newLinkedHashMap(); private final Map<JetScript, ScriptDescriptor> scripts = Maps.newLinkedHashMap();
private final TopDownAnalysisParameters topDownAnalysisParameters; private final TopDownAnalysisParameters topDownAnalysisParameters;
@@ -116,14 +107,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
return anonymousInitializers; return anonymousInitializers;
} }
public Map<JetFile, WritableScope> getFileScopes() {
return fileScopes;
}
public Map<JetFile, MutablePackageFragmentDescriptor> getPackageFragments() {
return packageFragments;
}
@NotNull @NotNull
@Override @Override
public StorageManager getStorageManager() { public StorageManager getStorageManager() {
@@ -185,15 +168,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
return members; return members;
} }
@NotNull
public List<MutableClassDescriptor> getClassesTopologicalOrder() {
return classesTopologicalOrder;
}
public void setClassesTopologicalOrder(@NotNull List<MutableClassDescriptor> classesTopologicalOrder) {
this.classesTopologicalOrder = classesTopologicalOrder;
}
@Override @Override
@NotNull @NotNull
public DataFlowInfo getOuterDataFlowInfo() { public DataFlowInfo getOuterDataFlowInfo() {