From 20eb285f357eab138044ed1cac9e26acb16ffa09 Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Thu, 30 Aug 2012 12:01:57 +0300
Subject: [PATCH] binding package introduced

---
 .../src/org/jetbrains/jet/codegen/ClassCodegen.java      | 3 +--
 .../src/org/jetbrains/jet/codegen/ClosureCodegen.java    | 8 ++++----
 .../src/org/jetbrains/jet/codegen/CodegenUtil.java       | 2 +-
 .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 4 +++-
 .../src/org/jetbrains/jet/codegen/FunctionCodegen.java   | 2 +-
 .../jetbrains/jet/codegen/ImplementationBodyCodegen.java | 9 ++++++---
 .../src/org/jetbrains/jet/codegen/JetTypeMapper.java     | 7 +++----
 .../src/org/jetbrains/jet/codegen/NamespaceCodegen.java  | 2 +-
 .../src/org/jetbrains/jet/codegen/ScriptCodegen.java     | 2 +-
 .../codegen/{state => binding}/BindingContextAware.java  | 2 +-
 .../codegen/{state => binding}/BindingTraceAware.java    | 2 +-
 .../codegen/{context => binding}/CalculatedClosure.java  | 3 ++-
 .../{context => binding}/CodegenAnnotatingVisitor.java   | 4 ++--
 .../jet/codegen/{context => binding}/CodegenBinding.java | 2 +-
 .../jet/codegen/{context => binding}/MutableClosure.java | 3 ++-
 .../jet/codegen/context/AnonymousClassContext.java       | 3 ++-
 .../org/jetbrains/jet/codegen/context/ClassContext.java  | 3 ++-
 .../jetbrains/jet/codegen/context/ClosureContext.java    | 3 ++-
 .../jetbrains/jet/codegen/context/CodegenContext.java    | 6 ++++--
 .../org/jetbrains/jet/codegen/context/LocalLookup.java   | 5 +++--
 .../jetbrains/jet/codegen/context/ReceiverContext.java   | 1 +
 .../org/jetbrains/jet/codegen/context/ScriptContext.java | 1 +
 .../org/jetbrains/jet/codegen/state/GenerationState.java | 2 +-
 .../jetbrains/jet/codegen/state/GenerationStrategy.java  | 2 +-
 .../org/jetbrains/jet/codegen/state/TypeMapperAware.java | 1 +
 .../tests/org/jetbrains/jet/codegen/GenerationUtils.java | 2 +-
 .../jet/plugin/debugger/JetPositionManager.java          | 4 ++--
 .../jet/plugin/debugger/JetPositionManagerTest.java      | 2 +-
 28 files changed, 52 insertions(+), 38 deletions(-)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{state => binding}/BindingContextAware.java (96%)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{state => binding}/BindingTraceAware.java (96%)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{context => binding}/CalculatedClosure.java (93%)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{context => binding}/CodegenAnnotatingVisitor.java (99%)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{context => binding}/CodegenBinding.java (99%)
 rename compiler/backend/src/org/jetbrains/jet/codegen/{context => binding}/MutableClosure.java (97%)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
index ad946892c49..8c9a526f7ee 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
@@ -25,10 +25,9 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
-import javax.inject.Inject;
 import java.util.Map;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.enumEntryNeedSubclass;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
 
 /**
  * @author max
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
index b131883d1e3..120bc6c8396 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
@@ -28,9 +28,9 @@ import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
 import org.jetbrains.asm4.signature.SignatureWriter;
-import org.jetbrains.jet.codegen.context.CalculatedClosure;
+import org.jetbrains.jet.codegen.binding.CalculatedClosure;
 import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.MutableClosure;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -49,8 +49,8 @@ import java.util.List;
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.*;
 import static org.jetbrains.jet.codegen.CodegenUtil.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.classNameForAnonymousClass;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.isLocalNamedFun;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.classNameForAnonymousClass;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.isLocalNamedFun;
 
 public class ClosureCodegen {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java
index efd22b45aa4..195cfde8732 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.jetbrains.jet.codegen.context.CalculatedClosure;
+import org.jetbrains.jet.codegen.binding.CalculatedClosure;
 import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
 import org.jetbrains.jet.codegen.signature.JvmMethodParameterKind;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 3559f10fbbe..a773b50a836 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -31,6 +31,8 @@ import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
+import org.jetbrains.jet.codegen.binding.CalculatedClosure;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.context.*;
 import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethod;
 import org.jetbrains.jet.codegen.signature.JvmPropertyAccessorSignature;
@@ -57,7 +59,7 @@ import java.util.*;
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.*;
 import static org.jetbrains.jet.codegen.CodegenUtil.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.*;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.*;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index fb4a217ed63..39ed5935356 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -47,7 +47,7 @@ import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.JAVA_ARRAY_GENERIC_TYPE;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.OBJECT_TYPE;
 import static org.jetbrains.jet.codegen.CodegenUtil.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.isLocalFun;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.isLocalFun;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDeclaration;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index a2e2fab45f5..5e6cabaf1fd 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -26,6 +26,9 @@ import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
+import org.jetbrains.jet.codegen.binding.CalculatedClosure;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.context.*;
 import org.jetbrains.jet.codegen.signature.*;
 import org.jetbrains.jet.codegen.signature.kotlin.JetMethodAnnotationWriter;
@@ -50,9 +53,9 @@ import java.util.*;
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.CodegenUtil.*;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.CLOSURE;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.eclosingClassDescriptor;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.enumEntryNeedSubclass;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.eclosingClassDescriptor;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.classDescriptorToDeclaration;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
index 10833f2dc58..d787825bb62 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
@@ -20,10 +20,10 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.Type;
-import org.jetbrains.jet.codegen.context.CalculatedClosure;
+import org.jetbrains.jet.codegen.binding.CalculatedClosure;
 import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
 import org.jetbrains.jet.codegen.signature.*;
-import org.jetbrains.jet.codegen.state.BindingTraceAware;
+import org.jetbrains.jet.codegen.binding.BindingTraceAware;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 import org.jetbrains.jet.lang.psi.JetElement;
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 
-import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -45,7 +44,7 @@ import java.util.Map;
 
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.CodegenUtil.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.*;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDeclaration;
 
 /**
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
index 31197cf0c29..e711cede387 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
-import org.jetbrains.jet.codegen.context.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
index cbac388ab27..b6d5a17859d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
@@ -43,7 +43,7 @@ import java.util.List;
 
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmTypeConstants.OBJECT_TYPE;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.*;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 
 /**
  * @author Stepan Koltsov
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/BindingContextAware.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingContextAware.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/BindingContextAware.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingContextAware.java
index 0e0ab13f41a..395a5aeb9af 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/BindingContextAware.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingContextAware.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.jet.codegen.binding;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingContext;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/BindingTraceAware.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingTraceAware.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/BindingTraceAware.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingTraceAware.java
index 9f6a1e9d701..c8d2ef4aa4d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/BindingTraceAware.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingTraceAware.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.jet.codegen.binding;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java
index f8f1674eff4..235be8d9c63 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.jet.codegen.binding;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.Type;
+import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
index ce0dcfd60f9..77dd2d71048 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.jet.codegen.binding;
 
 import com.intellij.util.containers.Stack;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -33,7 +33,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.jetbrains.jet.codegen.CodegenUtil.peekFromStack;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.*;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 
 /**
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenBinding.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
index d4c9808861f..7c43d042810 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.jet.codegen.binding;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java
index a2fa2d1d80b..89b77af6945 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.jet.codegen.binding;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.Type;
+import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
index 99e6366722c..b7352cc211c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
@@ -18,9 +18,10 @@ package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.CLOSURE;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
 /**
  * @author alex.tkachman
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
index 463fc61ba6c..04df9290743 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
@@ -18,9 +18,10 @@ package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.CLOSURE;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
 /**
  * @author alex.tkachman
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
index d99f79d7df2..b71e426412a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
@@ -19,11 +19,12 @@ package org.jetbrains.jet.codegen.context;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.CLOSURE;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
 /**
  * @author alex.tkachman
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
index 3f3900357b6..c7b495df512 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.jet.codegen.*;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -29,8 +31,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.jetbrains.jet.codegen.AsmTypeConstants.*;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.CLASS_FOR_FUNCTION;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.FQN;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLASS_FOR_FUNCTION;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.FQN;
 
 /*
  * @author max
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java
index 34914814306..78b8a38e7c5 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java
@@ -18,14 +18,15 @@ package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.asm4.Type;
 import org.jetbrains.jet.codegen.*;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.types.JetType;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.classNameForAnonymousClass;
-import static org.jetbrains.jet.codegen.context.CodegenBinding.isLocalNamedFun;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.classNameForAnonymousClass;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.isLocalNamedFun;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescriptorToDeclaration;
 
 /**
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
index ef3fff7f685..dcbea39e9e5 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
index b402aef58e6..221df5c10a2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
@@ -19,6 +19,7 @@ package org.jetbrains.jet.codegen.context;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
index d5986f4ba70..b750818b2a3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.analyzer.AnalyzeExhaust;
 import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.context.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
 import org.jetbrains.jet.di.InjectorForJvmCodegen;
 import org.jetbrains.jet.lang.psi.JetFile;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationStrategy.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationStrategy.java
index c447ad6c558..b1711bb6b36 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationStrategy.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationStrategy.java
@@ -33,7 +33,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.registerClassNameForScript;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
 
 /**
  * @author alex.tkachman
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/TypeMapperAware.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/TypeMapperAware.java
index 9184a78dcc1..0c1e7765201 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/TypeMapperAware.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/TypeMapperAware.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.codegen.state;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.JetTypeMapper;
+import org.jetbrains.jet.codegen.binding.BindingTraceAware;
 
 /**
  * @author alex.tkachman
diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
index 727a594b847..241f88dcf79 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.registerClassNameForScript;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
 
 /**
  * @author Stepan Koltsov
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
index 2727b6514aa..7a75607db74 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
@@ -41,7 +41,7 @@ import org.jetbrains.jet.codegen.ClassBuilderMode;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.MapTypeMode;
 import org.jetbrains.jet.codegen.NamespaceCodegen;
-import org.jetbrains.jet.codegen.context.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -52,7 +52,7 @@ import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.context.CodegenBinding.*;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 
 /**
  * @author yole
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java
index 2086809e752..8c066398547 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.ClassBuilderMode;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.JetTypeMapper;
-import org.jetbrains.jet.codegen.context.CodegenBinding;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;