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

refactoring: extracted methods

Browse Source 
computeInstructionColumnWidth,
computeNextInstructionsColumnWidth
This commit is contained in:
Svetlana Isakova
2014-03-05 14:10:54 +04:00
parent 010937525b
commit b9c7e1e328
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java
+40 -26
View File
@@ -208,30 +208,9 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment
List<Instruction> instructions = pseudocode.getAllInstructions(); List<Instruction> instructions = pseudocode.getAllInstructions();
Set<Instruction> remainedAfterPostProcessInstructions = Sets.newHashSet(pseudocode.getInstructions()); Set<Instruction> remainedAfterPostProcessInstructions = Sets.newHashSet(pseudocode.getInstructions());
List<PseudocodeImpl.PseudocodeLabel> labels = pseudocode.getLabels(); List<PseudocodeImpl.PseudocodeLabel> labels = pseudocode.getLabels();
int maxLength = 0; int instructionColumnWidth = countInstructionColumnWidth(instructions);
int maxNextLength = 0; int nextInstructionsColumnWidth = countNextInstructionsColumnWidth(instructions);
for (Instruction instruction : instructions) {
String instuctionText = instruction.toString();
if (instuctionText.length() > maxLength) {
String[] parts = instuctionText.split("\n");
if (parts.length > 1) {
for (String part : parts) {
if (part.length() > maxLength) {
maxLength = part.length();
}
}
}
else {
if (instuctionText.length() > maxLength) {
maxLength = instuctionText.length();
}
}
}
String instructionListText = formatInstructionList(instruction.getNextInstructions());
if (instructionListText.length() > maxNextLength) {
maxNextLength = instructionListText.length();
}
}
for (int i = 0; i < instructions.size(); i++) { for (int i = 0; i < instructions.size(); i++) {
Instruction instruction = instructions.get(i); Instruction instruction = instructions.get(i);
for (PseudocodeImpl.PseudocodeLabel label: labels) { for (PseudocodeImpl.PseudocodeLabel label: labels) {
@@ -242,13 +221,14 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment
StringBuilder line = new StringBuilder(); StringBuilder line = new StringBuilder();
line.append(formatInstruction(instruction, maxLength, remainedAfterPostProcessInstructions)); line.append(formatInstruction(instruction, instructionColumnWidth, remainedAfterPostProcessInstructions));
// Only print NEXT and PREV if the values are non-trivial // Only print NEXT and PREV if the values are non-trivial
Instruction next = i == instructions.size() - 1 ? null : instructions.get(i + 1); Instruction next = i == instructions.size() - 1 ? null : instructions.get(i + 1);
Collection<Instruction> nextInstructions = instruction.getNextInstructions(); Collection<Instruction> nextInstructions = instruction.getNextInstructions();
if (!sameContents(next, nextInstructions)) { if (!sameContents(next, nextInstructions)) {
line.append(" NEXT:").append(String.format("%1$-" + maxNextLength + "s", formatInstructionList(nextInstructions))); line.append(" NEXT:").append(
String.format("%1$-" + nextInstructionsColumnWidth + "s", formatInstructionList(nextInstructions)));
} }
Instruction prev = i == 0 ? null : instructions.get(i - 1); Instruction prev = i == 0 ? null : instructions.get(i - 1);
@@ -261,6 +241,40 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment
} }
} }
private static int countInstructionColumnWidth(List<Instruction> instructions) {
int maxWidth = 0;
for (Instruction instruction : instructions) {
String instuctionText = instruction.toString();
if (instuctionText.length() > maxWidth) {
String[] parts = instuctionText.split("\n");
if (parts.length > 1) {
for (String part : parts) {
if (part.length() > maxWidth) {
maxWidth = part.length();
}
}
}
else {
if (instuctionText.length() > maxWidth) {
maxWidth = instuctionText.length();
}
}
}
}
return maxWidth;
}
private static int countNextInstructionsColumnWidth(List<Instruction> instructions) {
int maxWidth = 0;
for (Instruction instruction : instructions) {
String instructionListText = formatInstructionList(instruction.getNextInstructions());
if (instructionListText.length() > maxWidth) {
maxWidth = instructionListText.length();
}
}
return maxWidth;
}
private static boolean sameContents(@Nullable Instruction natural, Collection<Instruction> actual) { private static boolean sameContents(@Nullable Instruction natural, Collection<Instruction> actual) {
if (natural == null) { if (natural == null) {
return actual.isEmpty(); return actual.isEmpty();