From aa20af3cf33b6cd1c1b4b062f95d2dbb469fdec3 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 12 May 2014 17:24:12 +0400 Subject: [PATCH] Minor. Unused code removed Follow-up for https://github.com/JetBrains/kotlin/commit/db00500404e4862548ed5eb49f7289e1e8eba99c#commitcomment-6242775 --- .../compiler/KotlinToJVMBytecodeCompiler.java | 1 - .../resolve/java/AnalyzerFacadeForJVM.java | 6 +- .../resolve/CachedBodiesResolveContext.java | 129 ------------------ .../checkers/AbstractJetDiagnosticsTest.java | 2 +- .../jet/lang/resolve/lazy/JvmResolveUtil.java | 21 +-- .../k2js/analyze/AnalyzerFacadeForJS.java | 18 +-- 6 files changed, 10 insertions(+), 167 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 161522b3a81..c39e7d81baf 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -282,7 +282,6 @@ public class KotlinToJVMBytecodeCompiler { environment.getSourceFiles(), sharedTrace, Predicates.alwaysTrue(), - false, sharedModule, new CliSourcesMemberFilter(environment)); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index 5e4025e4925..8d0f96fe0ad 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -121,7 +121,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Collection files, BindingTrace trace, Predicate filesToAnalyzeCompletely, - boolean storeContextForBodiesResolve, ModuleDescriptorImpl module, MemberFilter memberFilter ) { @@ -138,10 +137,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { memberFilter); try { module.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider()); - TopDownAnalysisContext topDownAnalysisContext = injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, files); - BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? - new CachedBodiesResolveContext(topDownAnalysisContext) : - null; + injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, files); return AnalyzeExhaust.success(trace.getBindingContext(), module); } finally { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java deleted file mode 100644 index 82018a00dd9..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2010-2013 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.resolve; - -import com.google.common.base.Function; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; - -import java.util.Collection; -import java.util.Collections; -import java.util.Map; - -/** - * A storage for the part of {@see TopDownAnalysisContext} collected during headers analysis that will be used during resolution of - * bodies -*/ -public class CachedBodiesResolveContext implements BodiesResolveContext { - private final Collection files; - private final Map classes; - private final Map anonymousInitializers; - private final Map properties; - private final Map functions; - private final Function declaringScopes; - private final Map scripts; - private final DataFlowInfo outerDataFlowInfo; - - private @NotNull TopDownAnalysisParameters topDownAnalysisParameters; - - public CachedBodiesResolveContext(TopDownAnalysisContext context) { - files = Collections.unmodifiableCollection(context.getFiles()); - classes = Collections.unmodifiableMap(context.getDeclaredClasses()); - anonymousInitializers = Collections.unmodifiableMap(context.getAnonymousInitializers()); - properties = Collections.unmodifiableMap(context.getProperties()); - functions = Collections.unmodifiableMap(context.getFunctions()); - declaringScopes = context.getDeclaringScopes(); - scripts = Collections.unmodifiableMap(context.getScripts()); - outerDataFlowInfo = context.getOuterDataFlowInfo(); - - topDownAnalysisParameters = context.getTopDownAnalysisParameters(); - } - - @NotNull - @Override - public StorageManager getStorageManager() { - return topDownAnalysisParameters.getStorageManager(); - } - - @NotNull - @Override - public ExceptionTracker getExceptionTracker() { - return topDownAnalysisParameters.getExceptionTracker(); - } - - @Override - public Collection getFiles() { - return files; - } - - @Override - public Map getDeclaredClasses() { - return classes; - } - - @Override - public Map getAnonymousInitializers() { - return anonymousInitializers; - } - - @Override - public Map getProperties() { - return properties; - } - - @Override - public Map getFunctions() { - return functions; - } - - @Override - public Function getDeclaringScopes() { - return declaringScopes; - } - - @Override - public Map getScripts() { - return scripts; - } - - @Override - public DataFlowInfo getOuterDataFlowInfo() { - return outerDataFlowInfo; - } - - @NotNull - @Override - public TopDownAnalysisParameters getTopDownAnalysisParameters() { - return topDownAnalysisParameters; - } - - @Override - public boolean completeAnalysisNeeded(@NotNull PsiElement element) { - PsiFile containingFile = element.getContainingFile(); - return containingFile != null && topDownAnalysisParameters.getAnalyzeCompletely().apply(containingFile); - } -} diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 93aafa3b954..311aa1f8965 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -53,7 +53,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( getProject(), jetFiles, support.getTrace(), - Predicates.alwaysTrue(), false, support.getModule(), + Predicates.alwaysTrue(), support.getModule(), MemberFilter.ALWAYS_TRUE).getBindingContext(); boolean ok = true; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 67228652a64..0f85b475ccf 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -61,7 +61,7 @@ public class JvmResolveUtil { } AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( - project, files, filesToAnalyzeCompletely, false); + project, files, filesToAnalyzeCompletely); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -73,22 +73,11 @@ public class JvmResolveUtil { Project project, Collection files, Predicate filesToAnalyzeCompletely - ) { - return analyzeFilesWithJavaIntegration( - project, files, filesToAnalyzeCompletely, false); - } - - @NotNull - public static AnalyzeExhaust analyzeFilesWithJavaIntegration( - Project project, - Collection files, - Predicate filesToAnalyzeCompletely, - boolean storeContextForBodiesResolve ) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); - return analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, - storeContextForBodiesResolve); + return analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely + ); } @NotNull @@ -96,11 +85,9 @@ public class JvmResolveUtil { Project project, Collection files, BindingTrace trace, - Predicate filesToAnalyzeCompletely, - boolean storeContextForBodiesResolve + Predicate filesToAnalyzeCompletely ) { return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, trace, filesToAnalyzeCompletely, - storeContextForBodiesResolve, AnalyzerFacadeForJVM.createJavaModule(""), MemberFilter.ALWAYS_TRUE); } diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index d8813755bee..b4878f3da2b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -70,19 +70,13 @@ public final class AnalyzerFacadeForJS { return analyzeFiles(files, Predicates.alwaysTrue(), config).getBindingContext(); } - @NotNull - public static AnalyzeExhaust analyzeFiles( - @NotNull Collection files, - @NotNull Predicate filesToAnalyzeCompletely, @NotNull Config config) { - return analyzeFiles(files, filesToAnalyzeCompletely, config, false); - } - //TODO: refactor @NotNull public static AnalyzeExhaust analyzeFiles( @NotNull Collection files, - @NotNull Predicate filesToAnalyzeCompletely, @NotNull Config config, - boolean storeContextForBodiesResolve) { + @NotNull Predicate filesToAnalyzeCompletely, + @NotNull Config config + ) { Project project = config.getProject(); ModuleDescriptorImpl owner = createJsModule(""); @@ -107,11 +101,7 @@ public final class AnalyzerFacadeForJS { Collection allFiles = libraryModule != null ? files : Config.withJsLibAdded(files, config); - TopDownAnalysisContext topDownAnalysisContext = - injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, allFiles); - BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? - new CachedBodiesResolveContext(topDownAnalysisContext) : - null; + injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, allFiles); return AnalyzeExhaust.success(trace.getBindingContext(), owner); } finally {