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

refactoring: merge traverseNextInstructions & traverseInstructionsInReverseOrder

Browse Source 
into one method (traverseFollowingInstructions)
This commit is contained in:
Svetlana Isakova
2012-12-13 14:54:30 +04:00
parent f5d6e8d751
commit 7a03c85549
1 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java
+15 -41
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.cfg.pseudocode;
import com.google.common.collect.*;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.cfg.Label;
@@ -162,13 +161,13 @@ public class PseudocodeImpl implements Pseudocode {
public List<Instruction> getReversedInstructions() {
if (reversedInstructions == null) {
LinkedHashSet<Instruction> traversedInstructions = Sets.newLinkedHashSet();
traverseInstructionsInReverseOrder(sinkInstruction, traversedInstructions);
traverseFollowingInstructions(sinkInstruction, traversedInstructions, false);
if (traversedInstructions.size() < instructions.size()) {
List<Instruction> simplyReversedInstructions = Lists.newArrayList(instructions);
Collections.reverse(simplyReversedInstructions);
for (Instruction instruction : simplyReversedInstructions) {
if (!traversedInstructions.contains(instruction)) {
traverseInstructionsInReverseOrder(instruction, traversedInstructions);
traverseFollowingInstructions(instruction, traversedInstructions, false);
}
}
}
@@ -177,29 +176,6 @@ public class PseudocodeImpl implements Pseudocode {
return reversedInstructions;
}
private static void traverseInstructionsInReverseOrder(@NotNull Instruction rootInstruction,
@NotNull LinkedHashSet<Instruction> instructions) {
Deque<Instruction> stack = Queues.newArrayDeque();
stack.push(rootInstruction);
List<Instruction> previousInstructions = Lists.newArrayList();
while ( !stack.isEmpty() ) {
final Instruction instruction = stack.pop();
if ( instructions.contains(instruction) )
continue;
instructions.add(instruction);
// Reverse iteration order to match the original recursive order.
previousInstructions.addAll(instruction.getPreviousInstructions());
for (Instruction previousInstruction : Lists.reverse(previousInstructions)) {
stack.push(previousInstruction);
}
previousInstructions.clear();
}
}
//for tests only
@NotNull
public List<Instruction> getAllInstructions() {
@@ -363,7 +339,7 @@ public class PseudocodeImpl implements Pseudocode {
private Set<Instruction> collectReachableInstructions() {
Set<Instruction> visited = Sets.newHashSet();
traverseNextInstructions(getEnterInstruction(), visited);
traverseFollowingInstructions(getEnterInstruction(), visited, true);
if (!visited.contains(getExitInstruction())) {
visited.add(getExitInstruction());
}
@@ -376,28 +352,26 @@ public class PseudocodeImpl implements Pseudocode {
return visited;
}
private static void traverseNextInstructions(@NotNull Instruction rootInstruction, @NotNull Set<Instruction> visited) {
private static void traverseFollowingInstructions(
@NotNull Instruction rootInstruction,
@NotNull Set<Instruction> visited,
boolean directOrder
) {
Deque<Instruction> stack = Queues.newArrayDeque();
stack.push(rootInstruction);
List<Instruction> nextInstructions = Lists.newArrayList();
while (!stack.isEmpty()) {
final Instruction instruction = stack.pop();
if (visited.contains(instruction))
continue;
Instruction instruction = stack.pop();
visited.add(instruction);
// Reverse iteration order to match the original recursive order.
nextInstructions.addAll(instruction.getNextInstructions());
for (Instruction nextInstruction : Lists.reverse(nextInstructions)) {
if ( nextInstruction == null )
continue;
Collection<Instruction> followingInstructions =
directOrder ? instruction.getNextInstructions() : instruction.getPreviousInstructions();
stack.push(nextInstruction);
for (Instruction followingInstruction : followingInstructions) {
if (followingInstruction != null && !visited.contains(followingInstruction)) {
stack.push(followingInstruction);
}
}
nextInstructions.clear();
}
}