From 333a91395a43a721c62a6e2445bf4400f1b517de Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 26 Dec 2014 18:17:32 +0300
Subject: [PATCH] Moved TailRecursionKind to cfg package

---
 .../src/org/jetbrains/jet/codegen/TailRecursionCodegen.java    | 2 +-
 .../org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java | 3 +--
 .../jet/lang/{resolve/calls => cfg}/TailRecursionKind.java     | 2 +-
 .../src/org/jetbrains/jet/lang/resolve/BindingContext.java     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/lang/{resolve/calls => cfg}/TailRecursionKind.java (95%)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
index 94f6cbba00c..29ed40df6f0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lang.psi.ValueArgument;
-import org.jetbrains.jet.lang.resolve.calls.TailRecursionKind;
+import org.jetbrains.jet.lang.cfg.TailRecursionKind;
 import org.jetbrains.jet.lang.resolve.calls.model.*;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
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 0c3f373b3ed..e2a3147e9d9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
@@ -52,7 +52,6 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage;
-import org.jetbrains.jet.lang.resolve.calls.TailRecursionKind;
 import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver;
@@ -71,7 +70,7 @@ import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORW
 import static org.jetbrains.jet.lang.diagnostics.Errors.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE;
 import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL;
-import static org.jetbrains.jet.lang.resolve.calls.TailRecursionKind.*;
+import static org.jetbrains.jet.lang.cfg.TailRecursionKind.*;
 import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
 import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
 import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TailRecursionKind.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TailRecursionKind.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java
index 1f33c581c94..b8eb11e9597 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TailRecursionKind.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.calls;
+package org.jetbrains.jet.lang.cfg;
 
 public enum TailRecursionKind {
     TAIL_CALL(true),
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
index c3083b5f650..3d60198ef35 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.calls.TailRecursionKind;
+import org.jetbrains.jet.lang.cfg.TailRecursionKind;
 import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo;