From 67304c64ffce03c6ea34c3194cce5fa90585b93f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 8 Aug 2012 19:36:19 +0400 Subject: [PATCH] Removed unused myProject field from IntrinsicMethods. Removed from injector parameters, etc. --- .../jetbrains/jet/codegen/GenerationState.java | 15 ++++++--------- .../jet/codegen/intrinsics/IntrinsicMethods.java | 6 ------ .../jetbrains/jet/di/InjectorForJvmCodegen.java | 6 ------ .../jvm/compiler/KotlinToJVMBytecodeCompiler.java | 2 +- .../jet/cli/jvm/repl/ReplInterpreter.java | 2 +- .../org/jetbrains/jet/asJava/JetLightClass.java | 2 +- .../jetbrains/jet/codegen/CodegenTestCase.java | 2 +- .../jetbrains/jet/codegen/GenerationUtils.java | 2 +- .../internal/codewindow/BytecodeToolwindow.java | 2 +- .../jetbrains/jet/di/AllInjectorsGenerator.java | 1 - 10 files changed, 12 insertions(+), 28 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java index f970e41208a..72e89ad3ac1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java @@ -19,10 +19,10 @@ */ package org.jetbrains.jet.codegen; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; +import org.jetbrains.asm4.commons.Method; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.di.InjectorForJvmCodegen; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; @@ -30,11 +30,10 @@ import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; +import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.utils.Progress; -import org.jetbrains.asm4.commons.Method; import java.util.Collection; import java.util.Collections; @@ -42,7 +41,6 @@ import java.util.List; import java.util.Map; public class GenerationState { - private final Project project; private final Progress progress; @NotNull private final AnalyzeExhaust analyzeExhaust; @@ -60,20 +58,19 @@ public class GenerationState { private Method scriptConstructorMethod; - public GenerationState(Project project, ClassBuilderFactory builderFactory, AnalyzeExhaust analyzeExhaust, List files) { - this(project, builderFactory, Progress.DEAF, analyzeExhaust, files, BuiltinToJavaTypesMapping.ENABLED); + public GenerationState(ClassBuilderFactory builderFactory, AnalyzeExhaust analyzeExhaust, List files) { + this(builderFactory, Progress.DEAF, analyzeExhaust, files, BuiltinToJavaTypesMapping.ENABLED); } - public GenerationState(Project project, ClassBuilderFactory builderFactory, Progress progress, + public GenerationState(ClassBuilderFactory builderFactory, Progress progress, @NotNull AnalyzeExhaust exhaust, @NotNull List files, @NotNull BuiltinToJavaTypesMapping builtinToJavaTypesMapping) { - this.project = project; this.progress = progress; this.analyzeExhaust = exhaust; this.files = files; this.classBuilderMode = builderFactory.getClassBuilderMode(); this.injector = new InjectorForJvmCodegen( analyzeExhaust.getBindingContext(), - this.files, project, builtinToJavaTypesMapping, builderFactory.getClassBuilderMode(), this, builderFactory); + this.files, builtinToJavaTypesMapping, builderFactory.getClassBuilderMode(), this, builderFactory); } private void markUsed() { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java index 9602583de9a..4aad835fc8f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -65,17 +65,11 @@ public class IntrinsicMethods { public static final String KOTLIN_ARRAYS_ARRAY = "kotlin.arrays.array"; public static final String KOTLIN_JAVA_CLASS_PROPERTY = "kotlin.javaClass.property"; - private Project myProject; private final Map namedMethods = new HashMap(); private static final IntrinsicMethod ARRAY_ITERATOR = new ArrayIterator(); private final IntrinsicsMap intrinsicsMap = new IntrinsicsMap(); - @Inject - public void setMyProject(Project myProject) { - this.myProject = myProject; - } - @PostConstruct public void init() { namedMethods.put(KOTLIN_JAVA_CLASS_FUNCTION, new JavaClassFunction()); diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java index 2837110638b..1a4039db2b2 100644 --- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java @@ -20,7 +20,6 @@ package org.jetbrains.jet.di; import org.jetbrains.jet.lang.resolve.BindingContext; import java.util.List; import org.jetbrains.jet.lang.psi.JetFile; -import com.intellij.openapi.project.Project; import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping; import org.jetbrains.jet.codegen.ClassBuilderMode; import org.jetbrains.jet.codegen.GenerationState; @@ -40,7 +39,6 @@ public class InjectorForJvmCodegen { private final BindingContext bindingContext; private final List listOfJetFile; - private final Project project; private final BuiltinToJavaTypesMapping builtinToJavaTypesMapping; private final ClassBuilderMode classBuilderMode; private final GenerationState generationState; @@ -56,7 +54,6 @@ public class InjectorForJvmCodegen { public InjectorForJvmCodegen( @NotNull BindingContext bindingContext, @NotNull List listOfJetFile, - @NotNull Project project, @NotNull BuiltinToJavaTypesMapping builtinToJavaTypesMapping, @NotNull ClassBuilderMode classBuilderMode, @NotNull GenerationState generationState, @@ -64,7 +61,6 @@ public class InjectorForJvmCodegen { ) { this.bindingContext = bindingContext; this.listOfJetFile = listOfJetFile; - this.project = project; this.builtinToJavaTypesMapping = builtinToJavaTypesMapping; this.classBuilderMode = classBuilderMode; this.generationState = generationState; @@ -92,8 +88,6 @@ public class InjectorForJvmCodegen { this.scriptCodegen.setMemberCodegen(memberCodegen); this.scriptCodegen.setState(generationState); - this.intrinsics.setMyProject(project); - this.classFileFactory.setBuilderFactory(classBuilderFactory); this.classFileFactory.setState(generationState); 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 fcd5fb1139b..cfd3dbf3969 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 @@ -339,7 +339,7 @@ public class KotlinToJVMBytecodeCompiler { environment.getConfiguration().get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY).report(CompilerMessageSeverity.LOGGING, message, CompilerMessageLocation.NO_LOCATION); } }; - GenerationState generationState = new GenerationState(project, ClassBuilderFactories.binaries(stubs), backendProgress, + GenerationState generationState = new GenerationState(ClassBuilderFactories.binaries(stubs), backendProgress, exhaust, environment.getSourceFiles(), environment.getConfiguration().get( JVMConfigurationKeys.BUILTIN_TO_JAVA_TYPES_MAPPING_KEY, diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index 8c2da3446e4..04d00a1461d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -236,7 +236,7 @@ public class ReplInterpreter { earierScripts.add(Pair.create(earlierLine.getScriptDescriptor(), earlierLine.getClassName())); } - GenerationState generationState = new GenerationState(jetCoreEnvironment.getProject(), ClassBuilderFactories.binaries(false), backendProgress, + GenerationState generationState = new GenerationState(ClassBuilderFactories.binaries(false), backendProgress, AnalyzeExhaust.success(trace.getBindingContext()), Collections.singletonList(psiFile), BuiltinToJavaTypesMapping.ENABLED); generationState.compileScript(psiFile.getScript(), scriptClassName, earierScripts, CompilationErrorHandler.THROW_EXCEPTION); diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java index 2f432a6a288..29418e20807 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java @@ -180,7 +180,7 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa throw new IllegalStateException("failed to analyze: " + context.getError(), context.getError()); } - final GenerationState state = new GenerationState(project, builderFactory, context, Collections.singletonList(file)) { + final GenerationState state = new GenerationState(builderFactory, context, Collections.singletonList(file)) { @Override protected void generateNamespace(FqName fqName, Collection namespaceFiles, CompilationErrorHandler errorHandler, Progress progress) { PsiManager manager = PsiManager.getInstance(project); diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 321ce3a8eea..12b25272e29 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -274,7 +274,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { BuiltinsScopeExtensionMode.ALL); analyzeExhaust.throwIfError(); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); - alreadyGenerated = new GenerationState(myEnvironment.getProject(), classBuilderFactory, analyzeExhaust, myFiles.getPsiFiles()); + alreadyGenerated = new GenerationState(classBuilderFactory, analyzeExhaust, myFiles.getPsiFiles()); alreadyGenerated.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); return alreadyGenerated; } diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index 50594685b8c..4e76fbc812a 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -41,7 +41,7 @@ public class GenerationUtils { final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( psiFile, Collections.emptyList(), BuiltinsScopeExtensionMode.ALL); analyzeExhaust.throwIfError(); - GenerationState state = new GenerationState(psiFile.getProject(), ClassBuilderFactories.binaries(false), analyzeExhaust, Collections.singletonList(psiFile)); + GenerationState state = new GenerationState(ClassBuilderFactories.binaries(false), analyzeExhaust, Collections.singletonList(psiFile)); state.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); return state; } diff --git a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java index 9ea5583e1b3..531214af3ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java @@ -209,7 +209,7 @@ public class BytecodeToolwindow extends JPanel implements Disposable { if (binding.isError()) { return printStackTraceToString(binding.getError()); } - state = new GenerationState(myProject, ClassBuilderFactories.TEXT, binding, Collections.singletonList(file)); + state = new GenerationState(ClassBuilderFactories.TEXT, binding, Collections.singletonList(file)); state.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); } catch (Exception e) { diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index ca2442f9d50..f3f137cd08c 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -189,7 +189,6 @@ public class AllInjectorsGenerator { DependencyInjectorGenerator generator = new DependencyInjectorGenerator(false); generator.addParameter(BindingContext.class); generator.addParameter(DiType.listOf(JetFile.class)); - generator.addParameter(Project.class); generator.addParameter(BuiltinToJavaTypesMapping.class); generator.addParameter(ClassBuilderMode.class); generator.addPublicParameter(GenerationState.class);