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

formatting

Browse Source
This commit is contained in:
Svetlana Isakova
2014-02-23 13:25:33 +04:00
parent c2b10dc274
commit 77bc6c44a1
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java
+18 -12
View File
@@ -70,9 +70,13 @@ public class PseudocodeTraverser {
} }
public static <D> Map<Instruction, Edges<D>> collectData( public static <D> Map<Instruction, Edges<D>> collectData(
@NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, LookInsideStrategy lookInside, @NotNull Pseudocode pseudocode,
@NotNull D initialDataValue, @NotNull D initialDataValueForEnterInstruction, @NotNull TraversalOrder traversalOrder,
@NotNull InstructionDataMergeStrategy<D> instructionDataMergeStrategy) { @NotNull LookInsideStrategy lookInside,
@NotNull D initialDataValue,
@NotNull D initialDataValueForEnterInstruction,
@NotNull InstructionDataMergeStrategy<D> instructionDataMergeStrategy
) {
Map<Instruction, Edges<D>> edgesMap = Maps.newLinkedHashMap(); Map<Instruction, Edges<D>> edgesMap = Maps.newLinkedHashMap();
initializeEdgesMap(pseudocode, lookInside, edgesMap, initialDataValue); initializeEdgesMap(pseudocode, lookInside, edgesMap, initialDataValue);
@@ -103,13 +107,15 @@ public class PseudocodeTraverser {
} }
private static <D> void collectDataFromSubgraph( private static <D> void collectDataFromSubgraph(
@NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, @NotNull Pseudocode pseudocode,
LookInsideStrategy lookInside, @NotNull TraversalOrder traversalOrder,
@NotNull LookInsideStrategy lookInside,
@NotNull Map<Instruction, Edges<D>> edgesMap, @NotNull Map<Instruction, Edges<D>> edgesMap,
@NotNull InstructionDataMergeStrategy<D> instructionDataMergeStrategy, @NotNull InstructionDataMergeStrategy<D> instructionDataMergeStrategy,
@NotNull Collection<Instruction> previousSubGraphInstructions, @NotNull Collection<Instruction> previousSubGraphInstructions,
boolean[] changed, boolean isLocal) { boolean[] changed,
boolean isLocal
) {
List<Instruction> instructions = getInstructions(pseudocode, traversalOrder); List<Instruction> instructions = getInstructions(pseudocode, traversalOrder);
Instruction startInstruction = getStartInstruction(pseudocode, traversalOrder); Instruction startInstruction = getStartInstruction(pseudocode, traversalOrder);
@@ -131,8 +137,7 @@ public class PseudocodeTraverser {
if (shouldLookInside(instruction, lookInside)) { if (shouldLookInside(instruction, lookInside)) {
Pseudocode subroutinePseudocode = ((LocalFunctionDeclarationInstruction) instruction).getBody(); Pseudocode subroutinePseudocode = ((LocalFunctionDeclarationInstruction) instruction).getBody();
collectDataFromSubgraph(subroutinePseudocode, traversalOrder, lookInside, edgesMap, instructionDataMergeStrategy, collectDataFromSubgraph(subroutinePseudocode, traversalOrder, lookInside, edgesMap, instructionDataMergeStrategy,
previousInstructions, previousInstructions, changed, true);
changed, true);
Instruction lastInstruction = getLastInstruction(subroutinePseudocode, traversalOrder); Instruction lastInstruction = getLastInstruction(subroutinePseudocode, traversalOrder);
Edges<D> previousValue = edgesMap.get(instruction); Edges<D> previousValue = edgesMap.get(instruction);
Edges<D> newValue = edgesMap.get(lastInstruction); Edges<D> newValue = edgesMap.get(lastInstruction);
@@ -161,9 +166,10 @@ public class PseudocodeTraverser {
} }
public static void traverse( public static void traverse(
@NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, @NotNull Pseudocode pseudocode,
InstructionAnalyzeStrategy instructionAnalyzeStrategy) { @NotNull TraversalOrder traversalOrder,
@NotNull InstructionAnalyzeStrategy instructionAnalyzeStrategy
) {
List<Instruction> instructions = getInstructions(pseudocode, traversalOrder); List<Instruction> instructions = getInstructions(pseudocode, traversalOrder);
for (Instruction instruction : instructions) { for (Instruction instruction : instructions) {
if (instruction instanceof LocalFunctionDeclarationInstruction) { if (instruction instanceof LocalFunctionDeclarationInstruction) {