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

refactoring: extracted 'checkPseudocode'

Browse Source
This commit is contained in:
Svetlana Isakova
2014-03-05 14:44:29 +04:00
parent 5de4c5965c
commit 04947fa6a9
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java
+8 -10
View File
@@ -115,9 +115,16 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment
instructionDump.append("\n---------------------\n"); instructionDump.append("\n---------------------\n");
dumpInstructions((PseudocodeImpl) pseudocode, instructionDump); dumpInstructions((PseudocodeImpl) pseudocode, instructionDump);
instructionDump.append("=====================\n"); instructionDump.append("=====================\n");
checkPseudocode((PseudocodeImpl) pseudocode);
}
File expectedInstructionsFile = JetTestUtils.replaceExtension(file, "instructions");
JetTestUtils.assertEqualsToFile(expectedInstructionsFile, instructionDump.toString());
}
private void checkPseudocode(PseudocodeImpl pseudocode) {
//check edges directions //check edges directions
Collection<Instruction> instructions = ((PseudocodeImpl)pseudocode).getAllInstructions(); Collection<Instruction> instructions = pseudocode.getAllInstructions();
for (Instruction instruction : instructions) { for (Instruction instruction : instructions) {
if (!((InstructionImpl)instruction).isDead()) { if (!((InstructionImpl)instruction).isDead()) {
for (Instruction nextInstruction : instruction.getNextInstructions()) { for (Instruction nextInstruction : instruction.getNextInstructions()) {
@@ -132,15 +139,6 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment
} }
} }
File expectedInstructionsFile = JetTestUtils.replaceExtension(file, "instructions");
JetTestUtils.assertEqualsToFile(expectedInstructionsFile, instructionDump.toString());
// StringBuilder graphDump = new StringBuilder();
// for (Pseudocode pseudocode : pseudocodes) {
// topOrderDump(pseudocode.)
// }
}
private static String formatInstruction(Instruction instruction, int maxLength, Set<Instruction> remainedAfterPostProcessInstructions) { private static String formatInstruction(Instruction instruction, int maxLength, Set<Instruction> remainedAfterPostProcessInstructions) {
String[] parts = instruction.toString().split("\n"); String[] parts = instruction.toString().split("\n");
boolean isRemovedThroughPostProcess = !remainedAfterPostProcessInstructions.contains(instruction); boolean isRemovedThroughPostProcess = !remainedAfterPostProcessInstructions.contains(instruction);