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

Do not inject TopDownAnalysisParameters into BodyResolver

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-23 12:44:24 +04:00
parent 442658396d
commit 42c7c54ea0
5 changed files with 1 additions and 12 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
@@ -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);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java
-1
View File
@@ -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);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
-1
View File
@@ -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);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+1 -8
View File
@@ -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();
}
}
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
-1
View File
@@ -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);