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

Injectors regenerated

Browse Source
This commit is contained in:
Andrey Breslav
2013-03-05 20:45:13 +04:00
parent deda45135e
commit 7107288f88
11 changed files with 109 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java
+10 -14
View File
@@ -34,7 +34,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForJvmCodegen {
private final JetTypeMapper jetTypeMapper;
private final List<JetFile> listOfJetFile;
private final BuiltinToJavaTypesMapping builtinToJavaTypesMapping;
@@ -47,7 +47,7 @@ public class InjectorForJvmCodegen {
private ScriptCodegen scriptCodegen;
private IntrinsicMethods intrinsics;
private ClassFileFactory classFileFactory;
public InjectorForJvmCodegen(
@NotNull JetTypeMapper jetTypeMapper,
@NotNull List<JetFile> listOfJetFile,
@@ -76,37 +76,33 @@ public class InjectorForJvmCodegen {
intrinsics.init();
}
@PreDestroy
public void destroy() {
}
public JetTypeMapper getJetTypeMapper() {
return this.jetTypeMapper;
}
public List getListOfJetFile() {
return this.listOfJetFile;
}
public GenerationState getGenerationState() {
return this.generationState;
}
public Project getProject() {
return this.project;
}
public ScriptCodegen getScriptCodegen() {
return this.scriptCodegen;
}
public IntrinsicMethods getIntrinsics() {
return this.intrinsics;
}
public ClassFileFactory getClassFileFactory() {
return this.classFileFactory;
}
}
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+10 -10
View File
@@ -42,7 +42,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForJavaDescriptorResolver {
private final Project project;
private final BindingTrace bindingTrace;
private final ModuleDescriptor moduleDescriptor;
@@ -64,7 +64,7 @@ public class InjectorForJavaDescriptorResolver {
private JavaFunctionResolver javaFunctionResolver;
private JavaInnerClassResolver javaInnerClassResolver;
private JavaPropertyResolver javaPropertyResolver;
public InjectorForJavaDescriptorResolver(
@NotNull Project project,
@NotNull BindingTrace bindingTrace,
@@ -166,33 +166,33 @@ public class InjectorForJavaDescriptorResolver {
psiClassFinder.initialize();
}
@PreDestroy
public void destroy() {
}
public Project getProject() {
return this.project;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
public ModuleDescriptor getModuleDescriptor() {
return this.moduleDescriptor;
}
public JavaSemanticServices getJavaSemanticServices() {
return this.javaSemanticServices;
}
public JavaDescriptorResolver getJavaDescriptorResolver() {
return this.javaDescriptorResolver;
}
public PsiClassFinderImpl getPsiClassFinder() {
return this.psiClassFinder;
}
}
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+9 -9
View File
@@ -42,7 +42,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForJavaSemanticServices {
private JavaSemanticServices javaSemanticServices;
private JavaDescriptorResolver javaDescriptorResolver;
private BindingTrace bindingTrace;
@@ -64,7 +64,7 @@ public class InjectorForJavaSemanticServices {
private JavaFunctionResolver javaFunctionResolver;
private JavaInnerClassResolver javaInnerClassResolver;
private JavaPropertyResolver javaPropertyResolver;
public InjectorForJavaSemanticServices(
@NotNull Project project
) {
@@ -164,29 +164,29 @@ public class InjectorForJavaSemanticServices {
psiClassFinder.initialize();
}
@PreDestroy
public void destroy() {
}
public JavaSemanticServices getJavaSemanticServices() {
return this.javaSemanticServices;
}
public JavaDescriptorResolver getJavaDescriptorResolver() {
return this.javaDescriptorResolver;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
public PsiClassFinderImpl getPsiClassFinder() {
return this.psiClassFinder;
}
public Project getProject() {
return this.project;
}
}
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+16 -16
View File
@@ -26,7 +26,6 @@ import com.intellij.openapi.project.Project;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl;
@@ -62,12 +61,13 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer {
private TopDownAnalyzer topDownAnalyzer;
private TopDownAnalysisContext topDownAnalysisContext;
private BodyResolver bodyResolver;
@@ -113,7 +113,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
private JavaFunctionResolver javaFunctionResolver;
private JavaInnerClassResolver javaInnerClassResolver;
private JavaPropertyResolver javaPropertyResolver;
public InjectorForTopDownAnalyzerForJvm(
@NotNull Project project,
@NotNull TopDownAnalysisParameters topDownAnalysisParameters,
@@ -341,53 +341,53 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
psiClassFinder.initialize();
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}
public TopDownAnalysisContext getTopDownAnalysisContext() {
return this.topDownAnalysisContext;
}
public BodyResolver getBodyResolver() {
return this.bodyResolver;
}
public ControlFlowAnalyzer getControlFlowAnalyzer() {
return this.controlFlowAnalyzer;
}
public DeclarationsChecker getDeclarationsChecker() {
return this.declarationsChecker;
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
public Project getProject() {
return this.project;
}
public TopDownAnalysisParameters getTopDownAnalysisParameters() {
return this.topDownAnalysisParameters;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
public ModuleConfiguration getModuleConfiguration() {
return this.moduleConfiguration;
}
public NamespaceFactoryImpl getNamespaceFactory() {
return this.namespaceFactory;
}
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
+9 -9
View File
@@ -40,7 +40,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForBodyResolve {
private BodyResolver bodyResolver;
private final Project project;
private final TopDownAnalysisParameters topDownAnalysisParameters;
@@ -60,7 +60,7 @@ public class InjectorForBodyResolve {
private DeclarationsChecker declarationsChecker;
private ScriptBodyResolver scriptBodyResolver;
private TopDownAnalysisContext topDownAnalysisContext;
public InjectorForBodyResolve(
@NotNull Project project,
@NotNull TopDownAnalysisParameters topDownAnalysisParameters,
@@ -140,29 +140,29 @@ public class InjectorForBodyResolve {
topDownAnalysisContext.setTopDownAnalysisParameters(topDownAnalysisParameters);
}
@PreDestroy
public void destroy() {
}
public BodyResolver getBodyResolver() {
return this.bodyResolver;
}
public Project getProject() {
return this.project;
}
public TopDownAnalysisParameters getTopDownAnalysisParameters() {
return this.topDownAnalysisParameters;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
public BodiesResolveContext getBodiesResolveContext() {
return this.bodiesResolveContext;
}
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
+11 -11
View File
@@ -36,7 +36,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForLazyResolve {
private final Project project;
private final ResolveSession resolveSession;
private final BindingTrace bindingTrace;
@@ -52,7 +52,7 @@ public class InjectorForLazyResolve {
private CallResolver callResolver;
private ArgumentTypeResolver argumentTypeResolver;
private CandidateResolver candidateResolver;
public InjectorForLazyResolve(
@NotNull Project project,
@NotNull ResolveSession resolveSession,
@@ -108,37 +108,37 @@ public class InjectorForLazyResolve {
candidateResolver.setArgumentTypeResolver(argumentTypeResolver);
}
@PreDestroy
public void destroy() {
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices;
}
public TypeResolver getTypeResolver() {
return this.typeResolver;
}
public ScopeProvider getScopeProvider() {
return this.scopeProvider;
}
public AnnotationResolver getAnnotationResolver() {
return this.annotationResolver;
}
public QualifiedExpressionResolver getQualifiedExpressionResolver() {
return this.qualifiedExpressionResolver;
}
public JetImportsFactory getJetImportsFactory() {
return this.jetImportsFactory;
}
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
+6 -6
View File
@@ -32,7 +32,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForMacros {
private ExpressionTypingServices expressionTypingServices;
private final Project project;
private final ModuleConfiguration moduleConfiguration;
@@ -44,7 +44,7 @@ public class InjectorForMacros {
private DescriptorResolver descriptorResolver;
private QualifiedExpressionResolver qualifiedExpressionResolver;
private CandidateResolver candidateResolver;
public InjectorForMacros(
@NotNull Project project,
@NotNull ModuleConfiguration moduleConfiguration
@@ -92,17 +92,17 @@ public class InjectorForMacros {
candidateResolver.setArgumentTypeResolver(argumentTypeResolver);
}
@PreDestroy
public void destroy() {
}
public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices;
}
public Project getProject() {
return this.project;
}
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+13 -13
View File
@@ -50,7 +50,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerBasic {
private TopDownAnalyzer topDownAnalyzer;
private TopDownAnalysisContext topDownAnalysisContext;
private BodyResolver bodyResolver;
@@ -80,7 +80,7 @@ public class InjectorForTopDownAnalyzerBasic {
private OverrideResolver overrideResolver;
private TypeHierarchyResolver typeHierarchyResolver;
private ScriptBodyResolver scriptBodyResolver;
public InjectorForTopDownAnalyzerBasic(
@NotNull Project project,
@NotNull TopDownAnalysisParameters topDownAnalysisParameters,
@@ -220,45 +220,45 @@ public class InjectorForTopDownAnalyzerBasic {
scriptBodyResolver.setTrace(bindingTrace);
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}
public TopDownAnalysisContext getTopDownAnalysisContext() {
return this.topDownAnalysisContext;
}
public BodyResolver getBodyResolver() {
return this.bodyResolver;
}
public ControlFlowAnalyzer getControlFlowAnalyzer() {
return this.controlFlowAnalyzer;
}
public DeclarationsChecker getDeclarationsChecker() {
return this.declarationsChecker;
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
public Project getProject() {
return this.project;
}
public TopDownAnalysisParameters getTopDownAnalysisParameters() {
return this.topDownAnalysisParameters;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
}
compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
+10 -10
View File
@@ -33,7 +33,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForTests {
private DescriptorResolver descriptorResolver;
private ExpressionTypingServices expressionTypingServices;
private TypeResolver typeResolver;
@@ -46,7 +46,7 @@ public class InjectorForTests {
private QualifiedExpressionResolver qualifiedExpressionResolver;
private ArgumentTypeResolver argumentTypeResolver;
private CandidateResolver candidateResolver;
public InjectorForTests(
@NotNull Project project
) {
@@ -94,33 +94,33 @@ public class InjectorForTests {
candidateResolver.setArgumentTypeResolver(argumentTypeResolver);
}
@PreDestroy
public void destroy() {
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices;
}
public TypeResolver getTypeResolver() {
return this.typeResolver;
}
public CallResolver getCallResolver() {
return this.callResolver;
}
public KotlinBuiltIns getKotlinBuiltIns() {
return this.kotlinBuiltIns;
}
public Project getProject() {
return this.project;
}
}
generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class GenerateInjectors {
// Parameters
generator.addPublicParameter(JetTypeMapper.class);
generator.addPublicParameter(DiType.listOf(JetFile.class));
generator.addParameter(DiType.listOf(JetFile.class));
generator.addParameter(BuiltinToJavaTypesMapping.class);
generator.addPublicParameter(GenerationState.class);
generator.addParameter(ClassBuilderFactory.class);
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+14 -14
View File
@@ -50,7 +50,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerForJs {
private TopDownAnalyzer topDownAnalyzer;
private TopDownAnalysisContext topDownAnalysisContext;
private BodyResolver bodyResolver;
@@ -80,7 +80,7 @@ public class InjectorForTopDownAnalyzerForJs {
private OverrideResolver overrideResolver;
private TypeHierarchyResolver typeHierarchyResolver;
private ScriptBodyResolver scriptBodyResolver;
public InjectorForTopDownAnalyzerForJs(
@NotNull Project project,
@NotNull TopDownAnalysisParameters topDownAnalysisParameters,
@@ -220,49 +220,49 @@ public class InjectorForTopDownAnalyzerForJs {
scriptBodyResolver.setTrace(bindingTrace);
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}
public TopDownAnalysisContext getTopDownAnalysisContext() {
return this.topDownAnalysisContext;
}
public BodyResolver getBodyResolver() {
return this.bodyResolver;
}
public ControlFlowAnalyzer getControlFlowAnalyzer() {
return this.controlFlowAnalyzer;
}
public DeclarationsChecker getDeclarationsChecker() {
return this.declarationsChecker;
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
public Project getProject() {
return this.project;
}
public TopDownAnalysisParameters getTopDownAnalysisParameters() {
return this.topDownAnalysisParameters;
}
public BindingTrace getBindingTrace() {
return this.bindingTrace;
}
public ModuleConfiguration getModuleConfiguration() {
return this.moduleConfiguration;
}
}