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

Minor: Inject builtins in ControlFlowAnalyzer

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-23 17:30:09 +03:00
parent 0830e48029
commit 7203a7833a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java
+4 -2
View File
@@ -32,9 +32,11 @@ import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
public class ControlFlowAnalyzer { public class ControlFlowAnalyzer {
@NotNull private final BindingTrace trace; @NotNull private final BindingTrace trace;
@NotNull private final KotlinBuiltIns builtIns;
public ControlFlowAnalyzer(@NotNull BindingTrace trace) { public ControlFlowAnalyzer(@NotNull BindingTrace trace, @NotNull KotlinBuiltIns builtIns) {
this.trace = trace; this.trace = trace;
this.builtIns = builtIns;
} }
public void process(@NotNull BodiesResolveContext c) { public void process(@NotNull BodiesResolveContext c) {
@@ -65,7 +67,7 @@ public class ControlFlowAnalyzer {
private void checkSecondaryConstructor(@NotNull JetSecondaryConstructor constructor) { private void checkSecondaryConstructor(@NotNull JetSecondaryConstructor constructor) {
JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider(constructor, trace); JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider(constructor, trace);
flowInformationProvider.checkDeclaration(); flowInformationProvider.checkDeclaration();
flowInformationProvider.checkFunction(KotlinBuiltIns.getInstance().getUnitType()); flowInformationProvider.checkFunction(builtIns.getUnitType());
} }
private void checkDeclarationContainer(@NotNull BodiesResolveContext c, JetDeclarationContainer declarationContainer) { private void checkDeclarationContainer(@NotNull BodiesResolveContext c, JetDeclarationContainer declarationContainer) {