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

Do not inject TopDownAnalysisContext into ScriptBodyResolver

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-23 11:08:09 +04:00
parent 5976a91998
commit e3744cff7c
6 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
-1
View File
@@ -263,7 +263,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
functionAnalyzerExtension.setTrace(bindingTrace); functionAnalyzerExtension.setTrace(bindingTrace);
scriptBodyResolver.setContext(topDownAnalysisContext);
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
scriptBodyResolver.setTrace(bindingTrace); scriptBodyResolver.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
-4
View File
@@ -44,7 +44,6 @@ import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
import org.jetbrains.jet.lang.resolve.DeclarationsChecker; import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension;
import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -80,7 +79,6 @@ public class InjectorForBodyResolve {
private final DeclarationsChecker declarationsChecker; private final DeclarationsChecker declarationsChecker;
private final FunctionAnalyzerExtension functionAnalyzerExtension; private final FunctionAnalyzerExtension functionAnalyzerExtension;
private final ScriptBodyResolver scriptBodyResolver; private final ScriptBodyResolver scriptBodyResolver;
private final TopDownAnalysisContext topDownAnalysisContext;
public InjectorForBodyResolve( public InjectorForBodyResolve(
@NotNull Project project, @NotNull Project project,
@@ -116,7 +114,6 @@ public class InjectorForBodyResolve {
this.declarationsChecker = new DeclarationsChecker(); this.declarationsChecker = new DeclarationsChecker();
this.functionAnalyzerExtension = new FunctionAnalyzerExtension(); this.functionAnalyzerExtension = new FunctionAnalyzerExtension();
this.scriptBodyResolver = new ScriptBodyResolver(); this.scriptBodyResolver = new ScriptBodyResolver();
this.topDownAnalysisContext = new TopDownAnalysisContext(topDownAnalysisParameters);
this.bodyResolver.setAnnotationResolver(annotationResolver); this.bodyResolver.setAnnotationResolver(annotationResolver);
this.bodyResolver.setCallResolver(callResolver); this.bodyResolver.setCallResolver(callResolver);
@@ -184,7 +181,6 @@ public class InjectorForBodyResolve {
functionAnalyzerExtension.setTrace(bindingTrace); functionAnalyzerExtension.setTrace(bindingTrace);
scriptBodyResolver.setContext(topDownAnalysisContext);
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
scriptBodyResolver.setTrace(bindingTrace); scriptBodyResolver.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
-1
View File
@@ -218,7 +218,6 @@ public class InjectorForTopDownAnalyzerBasic {
functionAnalyzerExtension.setTrace(bindingTrace); functionAnalyzerExtension.setTrace(bindingTrace);
scriptBodyResolver.setContext(topDownAnalysisContext);
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
scriptBodyResolver.setTrace(bindingTrace); scriptBodyResolver.setTrace(bindingTrace);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class BodyResolver {
resolveFunctionBodies(c); resolveFunctionBodies(c);
scriptBodyResolverResolver.resolveScriptBodies(); scriptBodyResolverResolver.resolveScriptBodies(c);
if (!topDownAnalysisParameters.isDeclaredLocally()) { if (!topDownAnalysisParameters.isDeclaredLocally()) {
computeDeferredTypes(); computeDeferredTypes();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java
+3 -7
View File
@@ -42,16 +42,12 @@ import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
public class ScriptBodyResolver { public class ScriptBodyResolver {
@NotNull
private TopDownAnalysisContext context;
@NotNull @NotNull
private ExpressionTypingServices expressionTypingServices; private ExpressionTypingServices expressionTypingServices;
@NotNull @NotNull
private BindingTrace trace; private BindingTrace trace;
@Inject
public void setContext(@NotNull TopDownAnalysisContext context) { public void setContext(@NotNull TopDownAnalysisContext context) {
this.context = context;
} }
@Inject @Inject
@@ -66,11 +62,11 @@ public class ScriptBodyResolver {
public void resolveScriptBodies() { public void resolveScriptBodies(@NotNull BodiesResolveContext c) {
for (Map.Entry<JetScript, ScriptDescriptor> e : context.getScripts().entrySet()) { for (Map.Entry<JetScript, ScriptDescriptor> e : c.getScripts().entrySet()) {
JetScript declaration = e.getKey(); JetScript declaration = e.getKey();
ScriptDescriptor descriptor = e.getValue(); ScriptDescriptor descriptor = e.getValue();
WritableScope scope = context.getScriptScopes().get(declaration); WritableScope scope = c.getScriptScopes().get(declaration);
// TODO: lock in resolveScriptDeclarations // TODO: lock in resolveScriptDeclarations
scope.changeLockLevel(WritableScope.LockLevel.READING); scope.changeLockLevel(WritableScope.LockLevel.READING);
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
-1
View File
@@ -218,7 +218,6 @@ public class InjectorForTopDownAnalyzerForJs {
functionAnalyzerExtension.setTrace(bindingTrace); functionAnalyzerExtension.setTrace(bindingTrace);
scriptBodyResolver.setContext(topDownAnalysisContext);
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
scriptBodyResolver.setTrace(bindingTrace); scriptBodyResolver.setTrace(bindingTrace);