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

Adding local functions through builder

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-29 15:30:58 +04:00
parent 0a3557d331
commit 5bedec575d
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+1
View File
@@ -44,6 +44,7 @@ public interface JetControlFlowBuilder {
// Declarations // Declarations
void declare(@NotNull JetParameter parameter); void declare(@NotNull JetParameter parameter);
void declare(@NotNull JetVariableDeclaration property); void declare(@NotNull JetVariableDeclaration property);
void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode);
// Labels // Labels
@NotNull @NotNull
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+6 -1
View File
@@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode; import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import java.util.Collection;
import java.util.List; import java.util.List;
public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder { public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
@@ -208,6 +207,12 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
builder.declare(property); builder.declare(property);
} }
@Override
public void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode) {
assert builder != null;
builder.declareFunction(subroutine, pseudocode);
}
@Override @Override
public void repeatPseudocode(@NotNull Label startLabel, @NotNull Label finishLabel) { public void repeatPseudocode(@NotNull Label startLabel, @NotNull Label finishLabel) {
assert builder != null; assert builder != null;
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+6 -2
View File
@@ -74,8 +74,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
JetControlFlowInstructionsGeneratorWorker worker = popBuilder(subroutine); JetControlFlowInstructionsGeneratorWorker worker = popBuilder(subroutine);
if (!builders.empty()) { if (!builders.empty()) {
JetControlFlowInstructionsGeneratorWorker builder = builders.peek(); JetControlFlowInstructionsGeneratorWorker builder = builders.peek();
LocalFunctionDeclarationInstruction instruction = new LocalFunctionDeclarationInstruction(subroutine, worker.getPseudocode()); builder.declareFunction(subroutine, worker.getPseudocode());
builder.add(instruction);
} }
return worker.getPseudocode(); return worker.getPseudocode();
} }
@@ -247,6 +246,11 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
add(new VariableDeclarationInstruction(property)); add(new VariableDeclarationInstruction(property));
} }
@Override
public void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode) {
add(new LocalFunctionDeclarationInstruction(subroutine, pseudocode));
}
@Override @Override
public void read(@NotNull JetElement element) { public void read(@NotNull JetElement element) {
add(new ReadValueInstruction(element)); add(new ReadValueInstruction(element));