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

refactoring: inlined createEdges function

Browse Source
This commit is contained in:
Svetlana Isakova
2014-03-03 14:47:04 +04:00
parent d2bdb3cb6d
commit 0a4abd2ebd
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
-1
View File
@@ -186,7 +186,6 @@ private fun <D> Pseudocode.collectDataFromSubgraph(
} }
data class Edges<T>(val `in`: T, val out: T) data class Edges<T>(val `in`: T, val out: T)
fun <T> createEdges(`in`: T, out: T) = Edges(`in`, out)
// returns false when interrupted by handler // returns false when interrupted by handler
compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+3 -4
View File
@@ -38,7 +38,6 @@ import java.util.Set;
import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD; import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD; import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.PseudocodeTraverserPackage.createEdges;
public class PseudocodeVariablesData { public class PseudocodeVariablesData {
private final Pseudocode pseudocode; private final Pseudocode pseudocode;
@@ -159,7 +158,7 @@ public class PseudocodeVariablesData {
mergeIncomingEdgesDataForInitializers(incomingEdgesData); mergeIncomingEdgesDataForInitializers(incomingEdgesData);
Map<VariableDescriptor, VariableInitState> exitInstructionData = addVariableInitStateFromCurrentInstructionIfAny( Map<VariableDescriptor, VariableInitState> exitInstructionData = addVariableInitStateFromCurrentInstructionIfAny(
instruction, enterInstructionData, lexicalScopeVariableInfo); instruction, enterInstructionData, lexicalScopeVariableInfo);
return createEdges(enterInstructionData, exitInstructionData); return new Edges<Map<VariableDescriptor, VariableInitState>>(enterInstructionData, exitInstructionData);
} }
} }
); );
@@ -267,7 +266,7 @@ public class PseudocodeVariablesData {
instruction, true, bindingContext); instruction, true, bindingContext);
if (variableDescriptor == null || if (variableDescriptor == null ||
(!(instruction instanceof ReadValueInstruction) && !(instruction instanceof WriteValueInstruction))) { (!(instruction instanceof ReadValueInstruction) && !(instruction instanceof WriteValueInstruction))) {
return createEdges(enterResult, enterResult); return new Edges<Map<VariableDescriptor, VariableUseState>>(enterResult, enterResult);
} }
Map<VariableDescriptor, VariableUseState> exitResult = Maps.newHashMap(enterResult); Map<VariableDescriptor, VariableUseState> exitResult = Maps.newHashMap(enterResult);
if (instruction instanceof ReadValueInstruction) { if (instruction instanceof ReadValueInstruction) {
@@ -288,7 +287,7 @@ public class PseudocodeVariablesData {
exitResult.put(variableDescriptor, VariableUseState.WRITTEN_AFTER_READ); exitResult.put(variableDescriptor, VariableUseState.WRITTEN_AFTER_READ);
} }
} }
return createEdges(enterResult, exitResult); return new Edges<Map<VariableDescriptor, VariableUseState>>(enterResult, exitResult);
} }
} }
); );