From 42c7c54ea01fd1ab28056c7314556befcbfbe937 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Sun, 23 Feb 2014 12:44:24 +0400 Subject: [PATCH] Do not inject TopDownAnalysisParameters into BodyResolver --- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 1 - .../src/org/jetbrains/jet/di/InjectorForBodyResolve.java | 1 - .../jet/di/InjectorForTopDownAnalyzerBasic.java | 1 - .../src/org/jetbrains/jet/lang/resolve/BodyResolver.java | 9 +-------- .../jet/di/InjectorForTopDownAnalyzerForJs.java | 1 - 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index c152f92216a..657aaae5f9e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -201,7 +201,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly bodyResolver.setExpressionTypingServices(expressionTypingServices); bodyResolver.setFunctionAnalyzerExtension(functionAnalyzerExtension); bodyResolver.setScriptBodyResolverResolver(scriptBodyResolver); - bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index b1e2eddf020..8f4edb53898 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -117,7 +117,6 @@ public class InjectorForBodyResolve { this.bodyResolver.setExpressionTypingServices(expressionTypingServices); this.bodyResolver.setFunctionAnalyzerExtension(functionAnalyzerExtension); this.bodyResolver.setScriptBodyResolverResolver(scriptBodyResolver); - this.bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); this.bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 48f078da742..6449dc7cbf1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -156,7 +156,6 @@ public class InjectorForTopDownAnalyzerBasic { bodyResolver.setExpressionTypingServices(expressionTypingServices); bodyResolver.setFunctionAnalyzerExtension(functionAnalyzerExtension); bodyResolver.setScriptBodyResolverResolver(scriptBodyResolver); - bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index e06edad87c4..e10307038dd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -53,8 +53,6 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.DEFERRED_TYPE; import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; public class BodyResolver { - @NotNull - private TopDownAnalysisParameters topDownAnalysisParameters; @NotNull private ScriptBodyResolver scriptBodyResolverResolver; @NotNull @@ -74,11 +72,6 @@ public class BodyResolver { @NotNull private FunctionAnalyzerExtension functionAnalyzerExtension; - @Inject - public void setTopDownAnalysisParameters(@NotNull TopDownAnalysisParameters topDownAnalysisParameters) { - this.topDownAnalysisParameters = topDownAnalysisParameters; - } - @Inject public void setScriptBodyResolverResolver(@NotNull ScriptBodyResolver scriptBodyResolverResolver) { this.scriptBodyResolverResolver = scriptBodyResolverResolver; @@ -136,7 +129,7 @@ public class BodyResolver { scriptBodyResolverResolver.resolveScriptBodies(c); - if (!topDownAnalysisParameters.isDeclaredLocally()) { + if (!c.getTopDownAnalysisParameters().isDeclaredLocally()) { computeDeferredTypes(); } } diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 500522cb792..32a2e9eeceb 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -156,7 +156,6 @@ public class InjectorForTopDownAnalyzerForJs { bodyResolver.setExpressionTypingServices(expressionTypingServices); bodyResolver.setFunctionAnalyzerExtension(functionAnalyzerExtension); bodyResolver.setScriptBodyResolverResolver(scriptBodyResolver); - bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver);