From 5d77ae075c8935153e9b2cd795e3c9b958091ea9 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 5 Mar 2014 19:11:20 +0400
Subject: [PATCH] rename: in -> incoming, out -> outgoing

---
 .../jet/lang/cfg/JetFlowInformationProvider.java       |  2 +-
 .../org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt  | 10 +++++-----
 .../org/jetbrains/jet/cfg/AbstractDataFlowTest.java    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
index c7dbfe16068..cb0688b0e36 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
@@ -502,7 +502,7 @@ public class JetFlowInformationProvider {
         Set<VariableDescriptor> declaredVariables = getPseudocodeVariablesData().getDeclaredVariables(pseudocode, false);
         for (VariableDescriptor variable : declaredVariables) {
             if (variable instanceof PropertyDescriptor) {
-                PseudocodeVariablesData.VariableInitState variableInitState = initializers.getIn().get(variable);
+                PseudocodeVariablesData.VariableInitState variableInitState = initializers.getIncoming().get(variable);
                 if (variableInitState == null) return;
                 trace.record(BindingContext.IS_INITIALIZED, (PropertyDescriptor) variable, variableInitState.isInitialized);
             }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
index b3b93415f74..6213468daa6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
@@ -69,7 +69,7 @@ fun <D> Pseudocode.traverse(
         }
         val edges = edgesMap.get(instruction)
         if (edges != null) {
-            analyzeInstruction(instruction, edges.`in`, edges.out)
+            analyzeInstruction(instruction, edges.incoming, edges.outgoing)
         }
     }
 }
@@ -163,8 +163,8 @@ private fun <D> Pseudocode.collectDataFromSubgraph(
                         if (newValue == null)
                             null
                         else
-                            Edges(updateEdge(lastInstruction, instruction, newValue.`in`),
-                                  updateEdge(lastInstruction, instruction, newValue.out))
+                            Edges(updateEdge(lastInstruction, instruction, newValue.incoming),
+                                  updateEdge(lastInstruction, instruction, newValue.outgoing))
                 updateEdgeDataForInstruction(previousValue, updatedValue)
                 continue
             }
@@ -177,7 +177,7 @@ private fun <D> Pseudocode.collectDataFromSubgraph(
             val previousData = edgesMap.get(previousInstruction)
             if (previousData != null) {
                 incomingEdgesData.add(updateEdge(
-                        previousInstruction, instruction, previousData.out))
+                        previousInstruction, instruction, previousData.outgoing))
             }
         }
         val mergedData = mergeEdges(instruction, incomingEdgesData)
@@ -185,7 +185,7 @@ private fun <D> Pseudocode.collectDataFromSubgraph(
     }
 }
 
-data class Edges<T>(val `in`: T, val out: T)
+data class Edges<T>(val incoming: T, val outgoing: T)
 
 
 // returns false when interrupted by handler
diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java
index c5f2879f38c..d414d7b6a30 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java
+++ b/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java
@@ -93,8 +93,8 @@ public abstract class AbstractDataFlowTest extends AbstractPseudocodeTest {
     @NotNull
     private <D> String dumpEdgesData(String prefix, @NotNull Edges<Map<VariableDescriptor, D>> edges) {
         return prefix +
-               " in: " + renderVariableMap(edges.getIn()) +
-               " out: " + renderVariableMap(edges.getOut());
+               " in: " + renderVariableMap(edges.getIncoming()) +
+               " out: " + renderVariableMap(edges.getOutgoing());
     }
 
     private <D> String renderVariableMap(Map<VariableDescriptor, D> map) {