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

working on REPL: implemented previous lines importing

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-08 04:19:24 +04:00
parent c580a75f20
commit 6946abbcea
17 changed files with 414 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+11 -7
View File
@@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.PsiClassFinderForJvm;
import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.DeclarationResolver;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
@@ -41,7 +42,6 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
import org.jetbrains.jet.lang.resolve.ImportsResolver;
import org.jetbrains.jet.lang.resolve.DelegationResolver;
import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.OverloadResolver;
import org.jetbrains.jet.lang.resolve.OverrideResolver;
import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver;
@@ -74,6 +74,7 @@ public class InjectorForTopDownAnalyzerForJvm {
private JavaBridgeConfiguration javaBridgeConfiguration;
private JavaDescriptorResolver javaDescriptorResolver;
private PsiClassFinderForJvm psiClassFinderForJvm;
private NamespaceFactoryImpl namespaceFactory;
private DeclarationResolver declarationResolver;
private AnnotationResolver annotationResolver;
private CallResolver callResolver;
@@ -83,7 +84,6 @@ public class InjectorForTopDownAnalyzerForJvm {
private OverloadingConflictResolver overloadingConflictResolver;
private ImportsResolver importsResolver;
private DelegationResolver delegationResolver;
private NamespaceFactoryImpl namespaceFactory;
private OverloadResolver overloadResolver;
private OverrideResolver overrideResolver;
private TypeHierarchyResolver typeHierarchyResolver;
@@ -113,6 +113,7 @@ public class InjectorForTopDownAnalyzerForJvm {
this.javaBridgeConfiguration = new JavaBridgeConfiguration();
this.javaDescriptorResolver = new JavaDescriptorResolver();
this.psiClassFinderForJvm = new PsiClassFinderForJvm();
this.namespaceFactory = new NamespaceFactoryImpl();
this.declarationResolver = new DeclarationResolver();
this.annotationResolver = new AnnotationResolver();
this.callResolver = new CallResolver();
@@ -122,7 +123,6 @@ public class InjectorForTopDownAnalyzerForJvm {
this.overloadingConflictResolver = new OverloadingConflictResolver();
this.importsResolver = new ImportsResolver();
this.delegationResolver = new DelegationResolver();
this.namespaceFactory = new NamespaceFactoryImpl();
this.overloadResolver = new OverloadResolver();
this.overrideResolver = new OverrideResolver();
this.typeHierarchyResolver = new TypeHierarchyResolver();
@@ -176,6 +176,10 @@ public class InjectorForTopDownAnalyzerForJvm {
psiClassFinderForJvm.setCompilerDependencies(compilerDependencies);
psiClassFinderForJvm.setProject(project);
this.namespaceFactory.setConfiguration(javaBridgeConfiguration);
this.namespaceFactory.setModuleDescriptor(moduleDescriptor);
this.namespaceFactory.setTrace(bindingTrace);
declarationResolver.setAnnotationResolver(annotationResolver);
declarationResolver.setContext(topDownAnalysisContext);
declarationResolver.setDescriptorResolver(descriptorResolver);
@@ -207,10 +211,6 @@ public class InjectorForTopDownAnalyzerForJvm {
delegationResolver.setContext(topDownAnalysisContext);
delegationResolver.setTrace(bindingTrace);
namespaceFactory.setConfiguration(javaBridgeConfiguration);
namespaceFactory.setModuleDescriptor(moduleDescriptor);
namespaceFactory.setTrace(bindingTrace);
overloadResolver.setContext(topDownAnalysisContext);
overloadResolver.setTrace(bindingTrace);
@@ -291,4 +291,8 @@ public class InjectorForTopDownAnalyzerForJvm {
return this.javaBridgeConfiguration;
}
public NamespaceFactoryImpl getNamespaceFactory() {
return this.namespaceFactory;
}
}