From 3b97bb612970876c2c4805c27643ee7810e0fca6 Mon Sep 17 00:00:00 2001
From: Pavel Talanov <Pavel.Talanov@jetbrains.com>
Date: Fri, 2 Dec 2011 16:28:47 +0400
Subject: [PATCH] imolement most of the intrinsic logic. test fixes to follow

---
 .idea/workspace.xml                           | 973 ++++++++++--------
 .../k2js/declarations/DeclarationVisitor.java |   2 +-
 .../{general => context}/Aliaser.java         |   3 +-
 .../translate/{utils => context}/Namer.java   |   2 +-
 .../{general => context}/StaticContext.java   |   3 +-
 .../TranslationContext.java                   |   3 +-
 .../ClassDeclarationTranslator.java           |   4 +-
 .../declaration/ClassTranslator.java          |   2 +-
 .../declaration/DeclarationBodyVisitor.java   |   2 +-
 .../declaration/NamespaceTranslator.java      |   4 +-
 .../declaration/PropertyTranslator.java       |   2 +-
 .../expression/ExpressionVisitor.java         |  17 +-
 .../expression/FunctionTranslator.java        |   2 +-
 .../expression/PatternTranslator.java         |   2 +-
 .../translate/expression/WhenTranslator.java  |   2 +-
 .../translate/general/AbstractTranslator.java |   1 +
 .../k2js/translate/general/Translation.java   |   2 +
 .../translate/general/TranslatorVisitor.java  |   1 +
 .../AbstractInitializerTranslator.java        |   4 +-
 .../ClassInitializerTranslator.java           |   4 +-
 .../initializer/InitializerVisitor.java       |   2 +-
 .../NamespaceInitializerTranslator.java       |   2 +-
 .../intrinsic/BinaryOperationIntrinsic.java   |   2 +-
 .../k2js/translate/intrinsic/Intrinsic.java   |   2 +-
 .../k2js/translate/intrinsic/Intrinsics.java  |   7 +-
 .../PrimitiveCompareToIntrinsic.java          |   2 +-
 .../intrinsic/PrimitiveEqualsIntrinsic.java   |   2 +-
 .../intrinsic/UnaryOperationIntrinsic.java    |   2 +-
 .../operation/AssignmentTranslator.java       |  56 +
 .../operation/BinaryOperationTranslator.java  | 129 ++-
 .../translate/operation/EqualsTranslator.java |   9 -
 .../operation/IncrementTranslator.java        | 152 +++
 ...ava => IntrinsicAssignmentTranslator.java} |  28 +-
 ...java => IntrinsicIncrementTranslator.java} |  33 +-
 .../operation/OperationTranslator.java        | 157 ---
 .../translate/operation/OperatorTable.java    |  19 -
 ...va => OverloadedAssignmentTranslator.java} |  43 +-
 .../OverloadedIncrementTranslator.java        |  53 +
 .../OverloadedUnaryOperationTranslator.java   |  44 -
 .../operation/UnaryOperationTranslator.java   | 132 +--
 .../translate/reference/AccessTranslator.java |  44 +
 .../reference/ArrayAccessTranslator.java      |  60 +-
 .../translate/reference/CallTranslator.java   |   2 +-
 .../reference/PropertyAccessTranslator.java   |  80 +-
 .../reference/ReferenceAccessTranslator.java  |  45 +
 .../reference/ReferenceTranslator.java        |   2 +-
 .../k2js/translate/utils/BindingUtils.java    |  14 +
 .../k2js/translate/utils/DescriptorUtils.java |  23 +
 .../k2js/translate/utils/PsiUtils.java        |  11 +
 .../translate/utils/TranslationUtils.java     |  14 +-
 .../patternMatching/cases/multipleCases.kt    |   4 +-
 .../patternMatching/cases/whenNotValue.kt     |   4 +-
 .../patternMatching/cases/whenValue.kt        |   4 +-
 53 files changed, 1218 insertions(+), 1000 deletions(-)
 rename translator/src/org/jetbrains/k2js/translate/{general => context}/Aliaser.java (96%)
 rename translator/src/org/jetbrains/k2js/translate/{utils => context}/Namer.java (98%)
 rename translator/src/org/jetbrains/k2js/translate/{general => context}/StaticContext.java (97%)
 rename translator/src/org/jetbrains/k2js/translate/{general => context}/TranslationContext.java (98%)
 create mode 100644 translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java
 delete mode 100644 translator/src/org/jetbrains/k2js/translate/operation/EqualsTranslator.java
 create mode 100644 translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
 rename translator/src/org/jetbrains/k2js/translate/operation/{IntrinsicBinaryOperationTranslator.java => IntrinsicAssignmentTranslator.java} (51%)
 rename translator/src/org/jetbrains/k2js/translate/operation/{IntrinsicUnaryOperationTranslator.java => IntrinsicIncrementTranslator.java} (58%)
 delete mode 100644 translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java
 rename translator/src/org/jetbrains/k2js/translate/operation/{OverloadedBinaryOperationTranslator.java => OverloadedAssignmentTranslator.java} (58%)
 create mode 100644 translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java
 delete mode 100644 translator/src/org/jetbrains/k2js/translate/operation/OverloadedUnaryOperationTranslator.java
 create mode 100644 translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java
 create mode 100644 translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java
 create mode 100644 translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c292e4af82d..85246e6097c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,24 +8,59 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/BinaryOperationIntrinsic.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsic.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/StaticContext.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\EqualsTranslator.java" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\OperationTranslator.java" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\OverloadedUnaryOperationTranslator.java" afterPath="" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\general\Aliaser.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\general\StaticContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\general\TranslationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\IntrinsicBinaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\IntrinsicUnaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\operation\OverloadedBinaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\translate\utils\Namer.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/GenerationState.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/GenerationState.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenNotValue.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenNotValue.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -67,8 +102,8 @@
         <option name="CONDITION_ENABLED" value="false" />
         <option name="CLASS_FILTERS_ENABLED" value="false" />
         <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="&#13;&#13;JAVA" />
-        <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+        <option name="CONDITION" value="JAVA" />
+        <option name="LOG_MESSAGE" value="JAVA" />
       </breakpoint>
       <breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="41" class="JetTestCaseBuilder" package="">
         <option name="ENABLED" value="true" />
@@ -96,7 +131,7 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java" line="32" class="org.jetbrains.k2js.translate.operation.OperationTranslator" package="org.jetbrains.k2js.translate.operation">
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java" line="2" class="AssignmentTranslator.java" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -109,20 +144,7 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java" line="33" class="org.jetbrains.k2js.intrinsic.IntrinsicDeclarationVisitor" package="org.jetbrains.k2js.intrinsic">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java" line="26" class="org.jetbrains.k2js.intrinsic.IntrinsicDeclarationVisitor" package="org.jetbrains.k2js.intrinsic">
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java" line="16" class="org.jetbrains.k2js.translate.reference.AccessTranslator" package="org.jetbrains.k2js.translate.reference">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -149,8 +171,8 @@
         <option name="CONDITION_ENABLED" value="false" />
         <option name="CLASS_FILTERS_ENABLED" value="false" />
         <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="&#13;&#13;JAVA" />
-        <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+        <option name="CONDITION" value="JAVA" />
+        <option name="LOG_MESSAGE" value="JAVA" />
       </breakpoint>
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -164,8 +186,8 @@
         <option name="CONDITION_ENABLED" value="false" />
         <option name="CLASS_FILTERS_ENABLED" value="false" />
         <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="&#13;&#13;JAVA" />
-        <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+        <option name="CONDITION" value="JAVA" />
+        <option name="LOG_MESSAGE" value="JAVA" />
       </breakpoint>
     </breakpoint_any>
     <breakpoint_rules />
@@ -183,8 +205,8 @@
       <property name="field_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByClasses" value="true" />
       <property name="exception_breakpoints_viewId" value="TABLE" />
-      <property name="field_breakpoints_viewId" value="TABLE" />
       <property name="exception_breakpoints_groupByClasses" value="true" />
+      <property name="field_breakpoints_viewId" value="TABLE" />
       <property name="method_breakpoints_groupByMethods" value="false" />
     </ui_properties>
   </component>
@@ -192,72 +214,22 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.6067114">
+    <splitter split-orientation="horizontal" split-proportion="0.59112775">
       <split-first>
         <leaf>
-          <file leaf-file-name="Intrinsics.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java">
+          <file leaf-file-name="Namer.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="39" column="91" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                    <element signature="e#616#647#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="StandardClassesTest.java" pinned="false" current="true" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="20" column="27" selection-start="390" selection-end="390" vertical-scroll-proportion="0.48022598">
+                <state line="17" column="19" selection-start="494" selection-end="494" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="breakDoWhile.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/while/out/breakDoWhile.js">
+          <file leaf-file-name="DescriptorUtils.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="WhileTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WhileTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="16" column="16" selection-start="297" selection-end="297" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="JetStandardLibrary.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="30" column="13" selection-start="1140" selection-end="1140" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="e#14956#14978#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="Library.jet" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Library.jet">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="DeclarationVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="70" column="42" selection-start="653" selection-end="2962" vertical-scroll-proportion="0.0">
+                <state line="14" column="12" selection-start="273" selection-end="273" vertical-scroll-proportion="0.0">
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -265,10 +237,19 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="IntrinsicDeclarationVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java">
+          <file leaf-file-name="FunctionDescriptorImpl.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="33" column="0" selection-start="1215" selection-end="1215" vertical-scroll-proportion="0.0">
+                <state line="115" column="0" selection-start="3980" selection-end="4122" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="BinaryOperationTranslator.java" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="104" column="50" selection-start="4637" selection-end="4637" vertical-scroll-proportion="0.6785244">
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -276,8 +257,44 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="assign.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/operation/out/assign.js">
+          <file leaf-file-name="AssignmentTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="7" column="43" selection-start="360" selection-end="360" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="PatternMatchingTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="32" column="16" selection-start="666" selection-end="666" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="whenValue.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="21" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="whenNotValue.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenNotValue.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="14" selection-start="98" selection-end="98" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="whenExecutesOnlyOnce.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt">
               <provider selected="true" editor-type-id="text-editor">
                 <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
@@ -285,10 +302,10 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="DeclarationContext.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationContext.java">
+          <file leaf-file-name="multipleCases.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="9" column="19" selection-start="362" selection-end="362" vertical-scroll-proportion="0.0">
+                <state line="8" column="24" selection-start="128" selection-end="128" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -298,10 +315,19 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="BinaryOperationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
+          <file leaf-file-name="FunctionTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="42" column="47" selection-start="1748" selection-end="1748" vertical-scroll-proportion="0.0">
+                <state line="52" column="16" selection-start="1210" selection-end="1210" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="compareTo.js" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/operatorOverloading/out/compareTo.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="14" column="30" selection-start="307" selection-end="307" vertical-scroll-proportion="0.3409742">
                   <folding />
                 </state>
               </provider>
@@ -310,54 +336,25 @@
           <file leaf-file-name="Declarations.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="47" column="12" selection-start="1898" selection-end="1898" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="e#1007#1041#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="OperationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="32" column="0" selection-start="1356" selection-end="1356" vertical-scroll-proportion="0.0">
+                <state line="61" column="0" selection-start="2425" selection-end="2425" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="OperationTest.java" pinned="false" current="false" current-in-tab="true">
+          <file leaf-file-name="OperationTest.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/OperationTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="36" column="16" selection-start="814" selection-end="814" vertical-scroll-proportion="0.92727274">
+                <state line="31" column="16" selection-start="674" selection-end="674" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="PatternMatchingTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
+          <file leaf-file-name="IncrementTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="37" column="16" selection-start="772" selection-end="772" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="ClassInheritanceTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ClassInheritanceTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="47" column="16" selection-start="1168" selection-end="1168" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="FunctionTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="37" column="16" selection-start="833" selection-end="833" vertical-scroll-proportion="0.0">
+                <state line="24" column="22" selection-start="1160" selection-end="1160" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -372,26 +369,47 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ReferenceTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
+          <file leaf-file-name="ClassInheritanceTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ClassInheritanceTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="73" column="0" selection-start="2860" selection-end="2860" vertical-scroll-proportion="0.0">
+                <state line="32" column="16" selection-start="732" selection-end="732" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ParentRunner.class" pinned="false" current="false" current-in-tab="false">
-            <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 110.408/lib/junit-4.10.jar!/org/junit/runners/ParentRunner.class">
+          <file leaf-file-name="OperatorConventions.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="34" column="4" selection-start="2015" selection-end="2015" vertical-scroll-proportion="0.0">
+                <state line="46" column="87" selection-start="1700" selection-end="1700" vertical-scroll-proportion="0.0">
                   <folding>
-                    <element signature="e#0#3733#0" expanded="true" />
+                    <element signature="e#1561#1571#0" expanded="true" />
+                    <element signature="e#1726#1736#0" expanded="true" />
+                    <element signature="e#2334#2352#0" expanded="false" />
+                    <element signature="e#2736#2756#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="ExpressionVisitor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="96" column="29" selection-start="4144" selection-end="4155" vertical-scroll-proportion="-15.423077">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="OverloadedIncrementTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="14" column="50" selection-start="579" selection-end="579" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -413,22 +431,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/GenerationState.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/PlainBinaryOperationTranslator.java" />
         <option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/BinaryOperationIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/StaticContext.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java" />
+        <option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
+        <option value="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenNotValue.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/operatorOverloading/out/compareTo.js" />
       </list>
     </option>
   </component>
@@ -532,7 +550,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -579,11 +596,87 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
+              <option name="myItemId" value="standardClasses" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="while" />
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="standardClasses" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patternMatching" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patternMatching" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="operatorOverloading" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -605,11 +698,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="while" />
+              <option name="myItemId" value="operatorOverloading" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -627,7 +716,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
+              <option name="myItemId" value="class" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -649,6 +738,32 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translate" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="utils" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -689,7 +804,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="intrinsic" />
+              <option name="myItemId" value="translate" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="context" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -715,28 +834,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="declarations" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -791,6 +888,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Favorites" />
     </panes>
   </component>
@@ -809,9 +907,9 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -829,8 +927,8 @@
       <recent name="org.jetbrains.k2js.test.examples" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.All in jetTests">
-    <configuration default="false" name="ClassInheritanceTest.initializersOfBasicClassExecute" type="JUnit" factoryName="JUnit" temporary="true">
+  <component name="RunManager" selected="JUnit.tests">
+    <configuration default="false" name="BasicClassTest.complexExpressionAsConstructorParameter" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
@@ -841,129 +939,139 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.BasicClassTest" />
+      <option name="METHOD_NAME" value="complexExpressionAsConstructorParameter" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="49392" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="FunctionTest.closureWithParameterAndBoxing" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
+      <option name="METHOD_NAME" value="closureWithParameterAndBoxing" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="49394" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="FunctionTest.loopClosure" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
+      <option name="METHOD_NAME" value="loopClosure" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="49396" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="BasicClassTest.constructorWithPropertiesAsParameters" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.BasicClassTest" />
+      <option name="METHOD_NAME" value="constructorWithPropertiesAsParameters" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="49398" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="ClassInheritanceTest.complexInitializationOrder" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
       <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.ClassInheritanceTest" />
-      <option name="METHOD_NAME" value="initializersOfBasicClassExecute" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Debug" />
-      <method />
-    </configuration>
-    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="BasicClassTest.SimpleInitializer" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.BasicClassTest" />
-      <option name="METHOD_NAME" value="SimpleInitializer" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Debug" />
-      <method />
-    </configuration>
-    <configuration default="false" name="PropertyAccessTest.namespaceCustomAccessors" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.PropertyAccessTest" />
-      <option name="METHOD_NAME" value="namespaceCustomAccessors" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="OperationTest.assign" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.OperationTest" />
-      <option name="METHOD_NAME" value="assign" />
+      <option name="METHOD_NAME" value="complexInitializationOrder" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" value="" />
@@ -974,6 +1082,7 @@
         <value defaultName="moduleWithDependencies" />
       </option>
       <envs />
+      <dir value="$PROJECT_DIR$/translator" />
       <patterns />
       <RunnerSettings RunnerId="Debug">
         <option name="DEBUG_PORT" value="" />
@@ -1043,7 +1152,7 @@
     </configuration>
     <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
       <JSDebuggerConfigurationSettings>
-        <option name="engineId" value="embedded" />
+        <option name="engineId" />
         <option name="fileUrl" />
       </JSDebuggerConfigurationSettings>
       <method>
@@ -1103,12 +1212,12 @@
       <method />
     </configuration>
     <list size="6">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.initializersOfBasicClassExecute" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.tests" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.BasicClassTest.SimpleInitializer" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.PropertyAccessTest.namespaceCustomAccessors" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.OperationTest.assign" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.BasicClassTest.complexExpressionAsConstructorParameter" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.FunctionTest.closureWithParameterAndBoxing" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.FunctionTest.loopClosure" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.BasicClassTest.constructorWithPropertiesAsParameters" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.tests" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.complexInitializationOrder" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -1163,7 +1272,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1176" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32853025" sideWeight="0.49812934" order="7" side_tool="false" content_ui="tabs" />
@@ -1171,18 +1280,18 @@
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756963" sideWeight="0.46606094" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24973261" sideWeight="0.7183908" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28530258" sideWeight="0.7557456" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27185398" sideWeight="0.35435596" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.6705091" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32854405" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32853025" sideWeight="0.45750934" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22382325" sideWeight="0.45750934" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.49812934" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.284342" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.728146" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20363443" sideWeight="0.7271854" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2728146" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24906467" sideWeight="0.69836694" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30163306" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3275862" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -1226,7 +1335,7 @@
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix test" />
+    <option name="LAST_COMMIT_MESSAGE" value="imolement most of the intrinsic logic. test fixes to follow" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1239,12 +1348,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="Binary operation overloading for most cases (except contains, compareTo)." />
-    <MESSAGE value="Added test for operator overloading." />
-    <MESSAGE value="Lots of refactoring and code improvements." />
-    <MESSAGE value="Refactoring." />
-    <MESSAGE value="Added properties as constructor parameters support(Not initialized yet)." />
-    <MESSAGE value="Added support for initialization of properties as constructor parameters." />
     <MESSAGE value="Refactoring function translator." />
     <MESSAGE value="Added test." />
     <MESSAGE value="Reorganised project structure." />
@@ -1264,6 +1367,12 @@
     <MESSAGE value="Reworked ExtractionVisitor into Declaration visitor." />
     <MESSAGE value="Work on reference expression. Test fixes to follow." />
     <MESSAGE value="fix test" />
+    <MESSAGE value="Array test passes." />
+    <MESSAGE value="supported array access expressions." />
+    <MESSAGE value="work on intrinsic implementation: split binary expression translation into 2 classes" />
+    <MESSAGE value="work on intrinsic implementation: binary intrinsics" />
+    <MESSAGE value="implement some of the intrinsic functionality" />
+    <MESSAGE value="imolement most of the intrinsic logic. test fixes to follow" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1273,134 +1382,120 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="13" selection-start="1140" selection-end="1140" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#14956#14978#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="61" selection-start="1142" selection-end="1142" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#1182#1204#0" expanded="true" />
-            <element signature="e#2484#2512#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Library.jet">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/StaticContext.java">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="86" column="90" selection-start="2721" selection-end="2721" vertical-scroll-proportion="0.0">
+        <state line="217" column="41" selection-start="9530" selection-end="9530" vertical-scroll-proportion="-25.48">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TraitTest.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="16" selection-start="836" selection-end="836" vertical-scroll-proportion="0.0">
+        <state line="8" column="24" selection-start="128" selection-end="128" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java">
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="70" column="42" selection-start="653" selection-end="2962" vertical-scroll-proportion="0.0">
+        <state line="32" column="16" selection-start="666" selection-end="666" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="17" selection-start="202" selection-end="202" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="21" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="63" selection-start="503" selection-end="503" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="22" selection-start="1160" selection-end="1160" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="61" column="0" selection-start="2425" selection-end="2425" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="52" column="16" selection-start="1210" selection-end="1210" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="72" selection-start="1127" selection-end="1127" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenNotValue.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="14" selection-start="98" selection-end="98" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="70" column="93" selection-start="2923" selection-end="2923" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="43" selection-start="360" selection-end="360" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/operatorOverloading/out/compareTo.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="14" column="30" selection-start="307" selection-end="307" vertical-scroll-proportion="0.3409742">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="104" column="50" selection-start="4637" selection-end="4637" vertical-scroll-proportion="0.6785244">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/OperationTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="16" selection-start="814" selection-end="814" vertical-scroll-proportion="0.92727274">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/operation/out/assign.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1215" selection-end="1215" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 110.283/lib/guava-r09.jar!/com/google/common/collect/ImmutableBiMap.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="22" selection-start="255" selection-end="255" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WhileTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="16" selection-start="297" selection-end="297" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/BinaryOperationIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="25" selection-start="965" selection-end="965" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/while/out/breakDoWhile.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="91" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#616#647#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/intrinsic/Intrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="63" selection-start="376" selection-end="513" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="27" selection-start="390" selection-end="390" vertical-scroll-proportion="0.48022598">
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java b/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
index 140defe6d3b..852097285cc 100644
--- a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
+++ b/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
@@ -5,7 +5,7 @@ import com.google.dart.compiler.backend.js.ast.JsScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.k2js.translate.utils.Namer;
+import org.jetbrains.k2js.translate.context.Namer;
 
 /**
  * @author Talanov Pavel
diff --git a/translator/src/org/jetbrains/k2js/translate/general/Aliaser.java b/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java
similarity index 96%
rename from translator/src/org/jetbrains/k2js/translate/general/Aliaser.java
rename to translator/src/org/jetbrains/k2js/translate/context/Aliaser.java
index 7843afc6c15..11c90d80d10 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/Aliaser.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/Aliaser.java
@@ -1,4 +1,4 @@
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
@@ -6,7 +6,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
-import org.jetbrains.k2js.translate.utils.Namer;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/Namer.java b/translator/src/org/jetbrains/k2js/translate/context/Namer.java
similarity index 98%
rename from translator/src/org/jetbrains/k2js/translate/utils/Namer.java
rename to translator/src/org/jetbrains/k2js/translate/context/Namer.java
index c542172c4fc..ba56538db1e 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/Namer.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/Namer.java
@@ -1,4 +1,4 @@
-package org.jetbrains.k2js.translate.utils;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
diff --git a/translator/src/org/jetbrains/k2js/translate/general/StaticContext.java b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
similarity index 97%
rename from translator/src/org/jetbrains/k2js/translate/general/StaticContext.java
rename to translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
index e4e972501ea..edb2bc082ff 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/StaticContext.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
@@ -1,4 +1,4 @@
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsProgram;
@@ -11,7 +11,6 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
 import org.jetbrains.k2js.declarations.Declarations;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
-import org.jetbrains.k2js.translate.utils.Namer;
 
 public class StaticContext {
 
diff --git a/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java b/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
similarity index 98%
rename from translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java
rename to translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
index 2b0e3a70abb..decd176d820 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
@@ -1,4 +1,4 @@
-package org.jetbrains.k2js.translate.general;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsProgram;
@@ -10,7 +10,6 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.k2js.declarations.Declarations;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.Namer;
 
 /**
  * @author Talanov Pavel
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
index 12b4bafeb89..de3f1243dee 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
@@ -8,11 +8,11 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetNamespace;
+import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.Namer;
 import org.jetbrains.k2js.utils.ClassSorter;
 
 import java.util.ArrayList;
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
index f6e9ae273fd..ed417846713 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
@@ -12,9 +12,9 @@ import org.jetbrains.jet.lang.descriptors.ClassKind;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetParameter;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 import java.util.ArrayList;
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java b/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java
index 2659d820196..0ece6d5b853 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java
@@ -4,8 +4,8 @@ import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.general.TranslatorVisitor;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
index 3739e32e73b..b1857e9e5b6 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java
@@ -4,10 +4,10 @@ import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetNamespace;
+import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.utils.Namer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
index 8abe4a6126d..4a586c9f647 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
@@ -9,9 +9,9 @@ import org.jetbrains.jet.lang.descriptors.PropertyGetterDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
 import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.jet.lang.psi.JetPropertyAccessor;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 import java.util.ArrayList;
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
index a7d5523dda4..ce0e1e58870 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
@@ -8,12 +8,13 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.constants.NullValue;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.general.TranslatorVisitor;
-import org.jetbrains.k2js.translate.operation.OperationTranslator;
+import org.jetbrains.k2js.translate.operation.BinaryOperationTranslator;
+import org.jetbrains.k2js.translate.operation.IncrementTranslator;
 import org.jetbrains.k2js.translate.operation.UnaryOperationTranslator;
-import org.jetbrains.k2js.translate.reference.ArrayAccessTranslator;
+import org.jetbrains.k2js.translate.reference.AccessTranslator;
 import org.jetbrains.k2js.translate.reference.CallTranslator;
 import org.jetbrains.k2js.translate.reference.PropertyAccessTranslator;
 import org.jetbrains.k2js.translate.reference.ReferenceTranslator;
@@ -95,7 +96,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     @NotNull
     public JsNode visitBinaryExpression(@NotNull JetBinaryExpression expression,
                                         @NotNull TranslationContext context) {
-        return OperationTranslator.translate(expression, context);
+        return BinaryOperationTranslator.translate(expression, context);
     }
 
     @Override
@@ -302,7 +303,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     @NotNull
     public JsNode visitPostfixExpression(@NotNull JetPostfixExpression expression,
                                          @NotNull TranslationContext context) {
-        return UnaryOperationTranslator.translate(expression, context);
+        return IncrementTranslator.translate(expression, context);
     }
 
     @Override
@@ -372,9 +373,9 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
 
     @Override
     @NotNull
-    public JsInvocation visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression,
-                                                   @NotNull TranslationContext context) {
-        return ArrayAccessTranslator.translateAsArrayGetterCall(expression, context);
+    public JsNode visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression,
+                                             @NotNull TranslationContext context) {
+        return AccessTranslator.translateAsGet(expression, context);
     }
 
 
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
index 258aec028aa..dae708e48c1 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
@@ -4,9 +4,9 @@ import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java
index c3e87c624d7..8c2d8dc7fef 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java
@@ -7,9 +7,9 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
index 4c797019d6f..e96f807491f 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
@@ -5,9 +5,9 @@ import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java b/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java
index e8e7cd87b0d..1713b14bacb 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java
@@ -2,6 +2,7 @@ package org.jetbrains.k2js.translate.general;
 
 import com.google.dart.compiler.backend.js.ast.JsProgram;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 
 /**
  * @author Talanov Pavel
diff --git a/translator/src/org/jetbrains/k2js/translate/general/Translation.java b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
index 87845208460..ce2a390b98d 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/Translation.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
@@ -8,6 +8,8 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
+import org.jetbrains.k2js.translate.context.StaticContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.declaration.ClassTranslator;
 import org.jetbrains.k2js.translate.declaration.NamespaceTranslator;
 import org.jetbrains.k2js.translate.expression.ExpressionVisitor;
diff --git a/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java b/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java
index 88af4c2edc1..22fb2517f4f 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java
@@ -3,6 +3,7 @@ package org.jetbrains.k2js.translate.general;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetVisitor;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 
 /**
  * @author Talanov Pavel
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
index 30797b50a08..d3d04f34b75 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
@@ -6,9 +6,9 @@ import com.google.dart.compiler.backend.js.ast.JsScope;
 import com.google.dart.compiler.backend.js.ast.JsStatement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.utils.Namer;
 
 import java.util.List;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
index 2f563829d3c..eed06e3d8ba 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
@@ -9,9 +9,9 @@ import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetDelegationSpecifier;
 import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 import org.jetbrains.jet.lang.psi.JetParameter;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
-import org.jetbrains.k2js.translate.utils.Namer;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
 import java.util.ArrayList;
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java b/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java
index 4acf0aa2667..651aa6d5720 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java
@@ -5,8 +5,8 @@ import com.google.dart.compiler.backend.js.ast.JsStatement;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.general.TranslatorVisitor;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
index ddaaa807df4..5e3c8c443b6 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
@@ -5,7 +5,7 @@ import com.google.dart.compiler.backend.js.ast.JsScope;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetNamespace;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 
 /**
  * @author Talanov Pavel
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java
index 6baab3bcd1e..a552032247e 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java
@@ -5,7 +5,7 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperator;
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java
index 954cb55da84..7dbe85cb0c9 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java
@@ -2,7 +2,7 @@ package org.jetbrains.k2js.translate.intrinsic;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 
 import java.util.List;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
index 3b91bacfbff..88b4c5850c1 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
@@ -7,6 +7,7 @@ import org.jetbrains.jet.lang.types.JetStandardLibrary;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
+import org.jetbrains.k2js.translate.utils.DescriptorUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,15 +58,17 @@ public final class Intrinsics {
     private void addUnaryIntrinsics(@NotNull FunctionDescriptor descriptor) {
         String functionName = descriptor.getName();
         JetToken token = OperatorConventions.UNARY_OPERATION_NAMES.inverse().get(functionName);
-        if (token != null) {
+        boolean isUnary = !DescriptorUtils.hasParameters(descriptor);
+        if (isUnary && (token != null)) {
             descriptorToIntrinsicMap.put(descriptor, UnaryOperationIntrinsic.newInstance(token));
         }
     }
 
     private void addBinaryIntrinsics(@NotNull FunctionDescriptor descriptor) {
         String functionName = descriptor.getName();
+        boolean isUnary = !DescriptorUtils.hasParameters(descriptor);
         JetToken token = OperatorConventions.BINARY_OPERATION_NAMES.inverse().get(functionName);
-        if (token != null && OperatorTable.hasCorrespondingBinaryOperator(token)) {
+        if (token != null && OperatorTable.hasCorrespondingBinaryOperator(token) && (!isUnary)) {
             descriptorToIntrinsicMap.put(descriptor, BinaryOperationIntrinsic.newInstance(token));
         }
     }
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java
index a8abea879a4..d4590486e56 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveCompareToIntrinsic.java
@@ -4,7 +4,7 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperation;
 import com.google.dart.compiler.backend.js.ast.JsBinaryOperator;
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java
index fc504b8aeef..36cc7eb69d1 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/PrimitiveEqualsIntrinsic.java
@@ -3,7 +3,7 @@ package org.jetbrains.k2js.translate.intrinsic;
 import com.google.dart.compiler.backend.js.ast.JsExpression;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 
 import java.util.List;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java
index 63991827f77..03bf3360070 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java
@@ -5,7 +5,7 @@ import com.google.dart.compiler.backend.js.ast.JsPrefixOperation;
 import com.google.dart.compiler.backend.js.ast.JsUnaryOperator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 
 import java.util.List;
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java
new file mode 100644
index 00000000000..646e0a82396
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java
@@ -0,0 +1,56 @@
+package org.jetbrains.k2js.translate.operation;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetBinaryExpression;
+import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
+import org.jetbrains.jet.lexer.JetToken;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.k2js.translate.reference.AccessTranslator;
+
+import static org.jetbrains.k2js.translate.utils.BindingUtils.isVariableReassignment;
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOperation;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRightExpression;
+
+/**
+ * @author Talanov Pavel
+ */
+public abstract class AssignmentTranslator extends AbstractTranslator {
+
+    public static boolean isAssignmentOperator(JetBinaryExpression expression) {
+        JetToken operationToken = getOperationToken(expression);
+        return (OperatorConventions.ASSIGNMENT_OPERATIONS.keySet().contains(operationToken)
+                || OperatorTable.isAssignment(operationToken));
+    }
+
+    @NotNull
+    public static JsExpression translate(@NotNull JetBinaryExpression expression,
+                                         @NotNull TranslationContext context) {
+        if (isIntrinsicOperation(context, expression)) {
+            return IntrinsicAssignmentTranslator.translate(expression, context);
+        }
+        return OverloadedAssignmentTranslator.translate(expression, context);
+    }
+
+    @NotNull
+    protected final JetBinaryExpression expression;
+    protected final AccessTranslator accessTranslator;
+    protected final boolean isVariableReassignment;
+    @NotNull
+    protected final JsExpression right;
+
+    protected AssignmentTranslator(@NotNull JetBinaryExpression expression,
+                                   @NotNull TranslationContext context) {
+        super(context);
+        this.expression = expression;
+        this.isVariableReassignment = isVariableReassignment(context.bindingContext(), expression);
+        this.accessTranslator = AccessTranslator.getAccessTranslator(expression.getLeft(), context());
+        this.right = translateRightExpression(context(), expression);
+    }
+
+    @NotNull
+    abstract protected JsExpression translate();
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
index 073d96a0329..bf0aff3144e 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
@@ -1,14 +1,29 @@
 package org.jetbrains.k2js.translate.operation;
 
+import com.google.dart.compiler.backend.js.ast.JsBinaryOperation;
+import com.google.dart.compiler.backend.js.ast.JsBinaryOperator;
 import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsInvocation;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
+import org.jetbrains.jet.lang.psi.JetOperationExpression;
+import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.reference.PropertyAccessTranslator;
+import org.jetbrains.jet.lexer.JetTokens;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.k2js.translate.intrinsic.CompareToIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.EqualsIntrinsic;
+import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
+import org.jetbrains.k2js.translate.reference.CallTranslator;
 
-import static org.jetbrains.k2js.translate.utils.BindingUtils.isVariableReassignment;
+import java.util.Arrays;
+
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression;
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
 import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateLeftExpression;
 import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRightExpression;
 
@@ -16,44 +31,98 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRight
 /**
  * @author Talanov Pavel
  */
-public abstract class BinaryOperationTranslator extends OperationTranslator {
+public final class BinaryOperationTranslator extends AbstractTranslator {
+
+
+    //TODO: move to utils
+    @NotNull
+    private static DeclarationDescriptor getOperationDescriptor(@NotNull JetOperationExpression expression,
+                                                                @NotNull TranslationContext context) {
+        DeclarationDescriptor descriptorForReferenceExpression = getDescriptorForReferenceExpression
+                (context.bindingContext(), expression.getOperation());
+        assert descriptorForReferenceExpression != null;
+        return descriptorForReferenceExpression;
+    }
+
+    @NotNull
+    public static JsExpression translate(@NotNull JetBinaryExpression expression,
+                                         @NotNull TranslationContext context) {
+        return (new BinaryOperationTranslator(expression, context).translate());
+    }
+
+    private BinaryOperationTranslator(@NotNull JetBinaryExpression expression,
+                                      @NotNull TranslationContext context) {
+        super(context);
+        this.expression = expression;
+        this.operationDescriptor =
+                getFunctionDescriptorForOperationExpression(context().bindingContext(), expression);
+    }
 
     @NotNull
     private final JetBinaryExpression expression;
-    protected final boolean isPropertyOnTheLeft;
-    protected final boolean isVariableReassignment;
-    @NotNull
-    protected final JsExpression left;
-    @NotNull
-    protected final JsExpression right;
 
-    protected BinaryOperationTranslator(@NotNull JetBinaryExpression expression,
-                                        @NotNull TranslationContext context) {
-        super(context);
-        this.expression = expression;
-        this.isPropertyOnTheLeft = isPropertyAccess(expression.getLeft());
-        this.isVariableReassignment = isVariableReassignment(context.bindingContext(), expression);
+    @Nullable
+    private final FunctionDescriptor operationDescriptor;
 
-        this.right = translateRightExpression(context(), expression);
-        //TODO: decide whether it is harmful to possibly translateNamespace left expression more than once
-        this.left = translateLeftExpression(context(), expression);
+    @NotNull
+    private JsExpression translate() {
+        if (AssignmentTranslator.isAssignmentOperator(expression)) {
+            return AssignmentTranslator.translate(expression, context());
+        }
+        if (operationDescriptor == null) {
+            return translateAsUnOverloadableBinaryOperation();
+        }
+        if (isEqualsCall()) {
+            return translateAsEqualsCall();
+        }
+        if (isCompareToCall()) {
+            return translateAsCompareToCall();
+        }
+        return CallTranslator.translate(expression, context());
+    }
+
+    private boolean isEqualsCall() {
+        //TODO: add descriptor is equals utils
+        assert operationDescriptor != null;
+        boolean isEquals = operationDescriptor.getName().equals("equals");
+        boolean isIntrinsic = context().intrinsics().hasDescriptor(operationDescriptor);
+        return isEquals && isIntrinsic;
     }
 
     @NotNull
-    abstract protected JsExpression translate();
+    private JsExpression translateAsEqualsCall() {
+        Intrinsic intrinsic = context().intrinsics().
+                getIntrinsic(getOperationDescriptor(expression, context()));
+        //TODO
+        ((EqualsIntrinsic) intrinsic).setNegated(expression.getOperationToken().equals(JetTokens.EXCLEQ));
+        JsExpression left = translateLeftExpression(context(), expression);
+        JsExpression right = translateRightExpression(context(), expression);
+        return intrinsic.apply(left, Arrays.asList(right), context());
+    }
 
-
-    @NotNull
-    protected JetToken getOperationToken() {
-        return (JetToken) expression.getOperationToken();
+    private boolean isCompareToCall() {
+        DeclarationDescriptor operationDescriptor = getOperationDescriptor(expression, context());
+        return (operationDescriptor.getName().equals("compareTo")
+                && (context().intrinsics().hasDescriptor(operationDescriptor)));
     }
 
     @NotNull
-    protected JsInvocation setterCall(@NotNull JsExpression assignTo) {
-        JsInvocation setterCall =
-                PropertyAccessTranslator.translateAsPropertySetterCall(expression.getLeft(), context());
-        setterCall.setArguments(assignTo);
-        return setterCall;
+    private JsExpression translateAsCompareToCall() {
+        Intrinsic intrinsic = context().intrinsics().
+                getIntrinsic(getOperationDescriptor(expression, context()));
+        ((CompareToIntrinsic) intrinsic).setComparisonToken((JetToken) expression.getOperationToken());
+        return intrinsic.apply(translateLeftExpression(context(), expression),
+                Arrays.asList(translateRightExpression(context(), expression)), context());
+    }
+
+    @NotNull
+    private JsExpression translateAsUnOverloadableBinaryOperation() {
+        JetToken token = getOperationToken(expression);
+        JsBinaryOperator operator = OperatorTable.getBinaryOperator(token);
+        assert OperatorConventions.NOT_OVERLOADABLE.contains(token);
+        JsExpression left = translateLeftExpression(context(), expression);
+        JsExpression right = translateRightExpression(context(), expression);
+        return new JsBinaryOperation(operator, left, right);
     }
 
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/EqualsTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/EqualsTranslator.java
deleted file mode 100644
index 11ba6e06915..00000000000
--- a/translator/src/org/jetbrains/k2js/translate/operation/EqualsTranslator.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.jetbrains.k2js.translate.operation;
-
-/**
- * @author Talanov Pavel
- */
-public final class EqualsTranslator {
-
-
-}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
new file mode 100644
index 00000000000..737bd95f1d0
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
@@ -0,0 +1,152 @@
+package org.jetbrains.k2js.translate.operation;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsName;
+import com.google.dart.compiler.backend.js.ast.JsNameRef;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetExpression;
+import org.jetbrains.jet.lang.psi.JetPrefixExpression;
+import org.jetbrains.jet.lang.psi.JetUnaryExpression;
+import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.k2js.translate.reference.AccessTranslator;
+
+import static org.jetbrains.k2js.translate.utils.BindingUtils.isStatement;
+import static org.jetbrains.k2js.translate.utils.BindingUtils.isVariableReassignment;
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOperation;
+
+/**
+ * @author Talanov Pavel
+ */
+//TODO: reexamine class, see if can be clearer
+public abstract class IncrementTranslator extends AbstractTranslator {
+
+    public static boolean isIncrement(@NotNull JetUnaryExpression expression) {
+        return OperatorConventions.INCREMENT_OPERATIONS.contains(getOperationToken(expression));
+    }
+
+    @NotNull
+    public static JsExpression translate(@NotNull JetUnaryExpression expression,
+                                         @NotNull TranslationContext context) {
+        if (isIntrinsicOperation(context, expression)) {
+            return IntrinsicIncrementTranslator.translate(expression, context);
+        }
+        return OverloadedIncrementTranslator.translate(expression, context);
+    }
+
+    @NotNull
+    protected final JetUnaryExpression expression;
+    @NotNull
+    protected final AccessTranslator accessTranslator;
+    protected final boolean isPrefix;
+    private final boolean isVariableReassignment;
+    private final boolean isStatement;
+
+    protected IncrementTranslator(@NotNull JetUnaryExpression expression,
+                                  @NotNull TranslationContext context) {
+        super(context);
+        this.expression = expression;
+        this.isPrefix = isPrefix(expression);
+        this.isVariableReassignment = isVariableReassignment(context.bindingContext(), expression);
+        this.isStatement = isStatement(context().bindingContext(), expression);
+        //TODO: use util method
+        JetExpression baseExpression = expression.getBaseExpression();
+        assert baseExpression != null;
+        this.accessTranslator = AccessTranslator.getAccessTranslator(baseExpression, context());
+    }
+
+    @NotNull
+    protected abstract JsExpression translate();
+
+    @NotNull
+    protected JsExpression translateAsMethodCall() {
+        if (isStatement || isPrefix) {
+            return asPrefix();
+        }
+        if (isVariableReassignment) {
+            return asPostfixWithReassignment();
+        } else {
+            return asPostfixWithNoReassignment();
+        }
+    }
+
+    @NotNull
+    private JsExpression asPrefix() {
+        JsExpression getExpression = accessTranslator.translateAsGet();
+        if (isVariableReassignment) {
+            return variableReassignment(getExpression);
+        }
+        return operationExpression(getExpression);
+    }
+
+    //TODO: decide if this expression can be optimised in case of direct access (not property)
+    @NotNull
+    private JsExpression asPostfixWithReassignment() {
+        // code fragment: expr(a++)
+        // generate: expr( (t1 = a, t2 = t1, a = t1.inc(), t2) )
+        TemporaryVariable t1 = declareTemporary(accessTranslator.translateAsGet());
+        TemporaryVariable t2 = declareTemporary(t1.nameReference());
+        JsExpression variableReassignment = variableReassignment(t1.nameReference());
+        return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(),
+                variableReassignment, t2.nameReference());
+    }
+
+    @NotNull
+    private JsExpression asPostfixWithNoReassignment() {
+        // code fragment: expr(a++)
+        // generate: expr( (t1 = a, t2 = t1, t2.inc(), t1) )
+        TemporaryVariable t1 = declareTemporary(accessTranslator.translateAsGet());
+        TemporaryVariable t2 = declareTemporary(t1.nameReference());
+        JsExpression methodCall = operationExpression(t2.nameReference());
+        JsExpression returnedValue = t1.nameReference();
+        return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(), methodCall, returnedValue);
+    }
+
+    @NotNull
+    private JsExpression variableReassignment(@NotNull JsExpression toCallMethodUpon) {
+        JsExpression overloadedMethodCallOnPropertyGetter = operationExpression(toCallMethodUpon);
+        return accessTranslator.translateAsSet(overloadedMethodCallOnPropertyGetter);
+    }
+
+    @NotNull
+    abstract JsExpression operationExpression(@NotNull JsExpression receiver);
+
+
+    private boolean isPrefix(@NotNull JetUnaryExpression expression) {
+        return (expression instanceof JetPrefixExpression);
+    }
+
+    //TODO: consider moving into context
+    protected final class TemporaryVariable {
+
+        @NotNull
+        private final JsExpression assignmentExpression;
+        @NotNull
+        private final JsName variableName;
+
+        private TemporaryVariable(@NotNull JsExpression initExpression) {
+            this.variableName = context().enclosingScope().declareTemporary();
+            this.assignmentExpression = AstUtil.newAssignment(variableName.makeRef(), initExpression);
+        }
+
+        @NotNull
+        public JsNameRef nameReference() {
+            return variableName.makeRef();
+        }
+
+        @NotNull
+        public JsExpression assignmentExpression() {
+            return assignmentExpression;
+        }
+    }
+
+    @NotNull
+    public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
+        return new TemporaryVariable(initExpression);
+    }
+
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicBinaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java
similarity index 51%
rename from translator/src/org/jetbrains/k2js/translate/operation/IntrinsicBinaryOperationTranslator.java
rename to translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java
index a759347cd7a..c02b2b3b81a 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicBinaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java
@@ -5,22 +5,24 @@ import com.google.dart.compiler.backend.js.ast.JsExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
 
 /**
  * @author Talanov Pavel
  */
-public final class IntrinsicBinaryOperationTranslator extends BinaryOperationTranslator {
+public final class IntrinsicAssignmentTranslator extends AssignmentTranslator {
 
 
     @NotNull
     public static JsExpression translate(@NotNull JetBinaryExpression expression,
                                          @NotNull TranslationContext context) {
-        return (new IntrinsicBinaryOperationTranslator(expression, context)).translate();
+        return (new IntrinsicAssignmentTranslator(expression, context)).translate();
     }
 
-    private IntrinsicBinaryOperationTranslator(@NotNull JetBinaryExpression expression,
-                                               @NotNull TranslationContext context) {
+    private IntrinsicAssignmentTranslator(@NotNull JetBinaryExpression expression,
+                                          @NotNull TranslationContext context) {
         super(expression, context);
     }
 
@@ -33,19 +35,15 @@ public final class IntrinsicBinaryOperationTranslator extends BinaryOperationTra
     //TODO: refactor
     @NotNull
     private JsExpression asBinaryOperation() {
-        if (isPropertyOnTheLeft && OperatorTable.isAssignment(getOperationToken())) {
-            return setterCall(right);
+        if (OperatorTable.isAssignment(getOperationToken(expression))) {
+            return accessTranslator.translateAsSet(right);
         }
-        JetToken token = getOperationToken();
+        //TODO: logic broken
+        JetToken token = getOperationToken(expression);
         if (OperatorTable.hasCorrespondingBinaryOperator(token)) {
-            return new JsBinaryOperation(OperatorTable.getBinaryOperator(token), left, right);
+            return new JsBinaryOperation(OperatorTable.getBinaryOperator(token),
+                    accessTranslator.translateAsGet(), right);
         }
-        //TODO: implement using intrinsic mechanism
-//        if (OperatorTable.hasCorrespondingFunctionInvocation(token)) {
-//            JsInvocation functionInvocation = OperatorTable.getCorrespondingFunctionInvocation(token);
-//            functionInvocation.setArguments(left, right);
-//            return functionInvocation;
-//        }
         throw new AssertionError("Unsupported token encountered: " + token.toString());
     }
 
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicUnaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java
similarity index 58%
rename from translator/src/org/jetbrains/k2js/translate/operation/IntrinsicUnaryOperationTranslator.java
rename to translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java
index 164800d9a93..c5a6abfe34b 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicUnaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java
@@ -5,49 +5,58 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetUnaryExpression;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.reference.ReferenceAccessTranslator;
+
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
+
 
 /**
  * @author Talanov Pavel
  */
-public final class IntrinsicUnaryOperationTranslator extends UnaryOperationTranslator {
+public final class IntrinsicIncrementTranslator extends IncrementTranslator {
 
 
     @NotNull
     public static JsExpression translate(@NotNull JetUnaryExpression expression,
                                          @NotNull TranslationContext context) {
-        return (new IntrinsicUnaryOperationTranslator(expression, context))
+        return (new IntrinsicIncrementTranslator(expression, context))
                 .translate();
     }
 
-    protected IntrinsicUnaryOperationTranslator(@NotNull JetUnaryExpression expression,
-                                                @NotNull TranslationContext context) {
+    protected IntrinsicIncrementTranslator(@NotNull JetUnaryExpression expression,
+                                           @NotNull TranslationContext context) {
         super(expression, context);
     }
 
     @Override
     @NotNull
     protected JsExpression translate() {
-        if (isPropertyAccess) {
-            return translateAsMethodCall();
+        if (isPrimitiveExpressionIncrement()) {
+            return jsUnaryExpression();
         }
-        return jsUnaryExpression();
+        return translateAsMethodCall();
+    }
+
+    private boolean isPrimitiveExpressionIncrement() {
+        return accessTranslator instanceof ReferenceAccessTranslator;
     }
 
     @NotNull
     private JsExpression jsUnaryExpression() {
-        JsUnaryOperator operator = OperatorTable.getUnaryOperator(getOperationToken());
+        JsUnaryOperator operator = OperatorTable.getUnaryOperator(getOperationToken(expression));
+        JsExpression getExpression = accessTranslator.translateAsGet();
         if (isPrefix) {
-            return new JsPrefixOperation(operator, baseExpression);
+            return new JsPrefixOperation(operator, getExpression);
         } else {
-            return new JsPostfixOperation(operator, baseExpression);
+            return new JsPostfixOperation(operator, getExpression);
         }
     }
 
     @Override
     @NotNull
     protected JsExpression operationExpression(@NotNull JsExpression receiver) {
-        return unaryAsBinary(getOperationToken(), receiver);
+        return unaryAsBinary(getOperationToken(expression), receiver);
     }
 
     public JsBinaryOperation unaryAsBinary(@NotNull JetToken token, @NotNull JsExpression expression) {
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java
deleted file mode 100644
index 3ee4bb61fe8..00000000000
--- a/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.jetbrains.k2js.translate.operation;
-
-import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsName;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
-import com.google.dart.compiler.util.AstUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.psi.JetBinaryExpression;
-import org.jetbrains.jet.lang.psi.JetExpression;
-import org.jetbrains.jet.lang.psi.JetOperationExpression;
-import org.jetbrains.jet.lang.psi.JetUnaryExpression;
-import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.intrinsic.CompareToIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.EqualsIntrinsic;
-import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
-import org.jetbrains.k2js.translate.reference.ArrayAccessTranslator;
-import org.jetbrains.k2js.translate.reference.CallTranslator;
-import org.jetbrains.k2js.translate.reference.PropertyAccessTranslator;
-
-import java.util.Arrays;
-
-import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateLeftExpression;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRightExpression;
-
-/**
- * @author Talanov Pavel
- */
-public class OperationTranslator extends AbstractTranslator {
-
-    @NotNull
-    public static JsExpression translate(@NotNull JetBinaryExpression expression,
-                                         @NotNull TranslationContext context) {
-        //TODO: move to assignment translator
-        if (ArrayAccessTranslator.canBeArraySetterCall(expression)) {
-            return ArrayAccessTranslator.translateAsArraySetterCall(expression, context);
-        }
-        DeclarationDescriptor descriptorForReferenceExpression = getDescriptorForReferenceExpression
-                (context.bindingContext(), expression.getOperation());
-        if (descriptorForReferenceExpression == null) {
-            return IntrinsicBinaryOperationTranslator.translate(expression, context);
-        }
-        if (isEqualsCall(expression, context)) {
-            return translateAsEqualsCall(expression, context);
-        }
-        if (isCompareToCall(expression, context)) {
-            return translateAsCompareToCall(expression, context);
-        }
-        return CallTranslator.translate(expression, context);
-    }
-
-    @NotNull
-    public static JsExpression translate(@NotNull JetUnaryExpression expression,
-                                         @NotNull TranslationContext context) {
-        return CallTranslator.translate(expression, context);
-    }
-
-
-    public static boolean isEqualsCall(@NotNull JetBinaryExpression expression,
-                                       @NotNull TranslationContext context) {
-        DeclarationDescriptor operationDescriptor = getOperationDescriptor(expression, context);
-        //TODO: add descriptor is equals utils
-        boolean isEquals = operationDescriptor.getName().equals("equals");
-        boolean isIntrinsic = context.intrinsics().hasDescriptor(operationDescriptor);
-        return isEquals && isIntrinsic;
-    }
-
-    @NotNull
-    public static JsExpression translateAsEqualsCall(@NotNull JetBinaryExpression expression,
-                                                     @NotNull TranslationContext context) {
-        Intrinsic intrinsic = context.intrinsics().
-                getIntrinsic(getOperationDescriptor(expression, context));
-        //TODO
-        ((EqualsIntrinsic) intrinsic).setNegated(expression.getOperationToken().equals(JetTokens.EXCLEQ));
-        return intrinsic.apply(translateLeftExpression(context, expression),
-                Arrays.asList(translateRightExpression(context, expression)), context);
-    }
-
-    public static boolean isCompareToCall(@NotNull JetBinaryExpression expression,
-                                          @NotNull TranslationContext context) {
-        DeclarationDescriptor operationDescriptor = getOperationDescriptor(expression, context);
-        return (operationDescriptor.getName().equals("compareTo")
-                && (context.intrinsics().hasDescriptor(operationDescriptor)));
-    }
-
-    @NotNull
-    public static JsExpression translateAsCompareToCall(@NotNull JetBinaryExpression expression,
-                                                        @NotNull TranslationContext context) {
-        Intrinsic intrinsic = context.intrinsics().
-                getIntrinsic(getOperationDescriptor(expression, context));
-        ((CompareToIntrinsic) intrinsic).setComparisonToken((JetToken) expression.getOperationToken());
-        return intrinsic.apply(translateLeftExpression(context, expression),
-                Arrays.asList(translateRightExpression(context, expression)), context);
-    }
-
-    protected OperationTranslator(@NotNull TranslationContext context) {
-        super(context);
-    }
-
-    //TODO: refactor
-    @Nullable
-    protected static JsNameRef getOverloadedOperationReference(@NotNull JetOperationExpression operationExpression,
-                                                               @NotNull TranslationContext context) {
-        DeclarationDescriptor operationDescriptor = getOperationDescriptor(operationExpression, context);
-        if (!context.isDeclared(operationDescriptor)) {
-            return null;
-        }
-        return context.getNameForDescriptor(operationDescriptor).makeRef();
-    }
-
-    @NotNull
-    private static DeclarationDescriptor getOperationDescriptor(@NotNull JetOperationExpression expression,
-                                                                @NotNull TranslationContext context) {
-        DeclarationDescriptor descriptorForReferenceExpression = getDescriptorForReferenceExpression
-                (context.bindingContext(), expression.getOperation());
-        assert descriptorForReferenceExpression != null;
-        return descriptorForReferenceExpression;
-    }
-
-    protected boolean isPropertyAccess(@NotNull JetExpression expression) {
-        return PropertyAccessTranslator.canBePropertyAccess(expression, context());
-
-    }
-
-    protected final class TemporaryVariable {
-
-        @NotNull
-        private final JsExpression assignmentExpression;
-        @NotNull
-        private final JsName variableName;
-
-        private TemporaryVariable(@NotNull JsExpression initExpression) {
-            this.variableName = context().enclosingScope().declareTemporary();
-            this.assignmentExpression = AstUtil.newAssignment(variableName.makeRef(), initExpression);
-        }
-
-        @NotNull
-        public JsNameRef nameReference() {
-            return variableName.makeRef();
-        }
-
-        @NotNull
-        public JsExpression assignmentExpression() {
-            return assignmentExpression;
-        }
-    }
-
-    @NotNull
-    public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
-        return new TemporaryVariable(initExpression);
-    }
-}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java b/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java
index cb3af9534fb..ca13967267b 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java
@@ -1,10 +1,7 @@
 package org.jetbrains.k2js.translate.operation;
 
 import com.google.dart.compiler.backend.js.ast.JsBinaryOperator;
-import com.google.dart.compiler.backend.js.ast.JsInvocation;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import com.google.dart.compiler.backend.js.ast.JsUnaryOperator;
-import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -19,7 +16,6 @@ public final class OperatorTable {
 
     private static Map<JetToken, JsBinaryOperator> binaryOperatorsMap = new HashMap<JetToken, JsBinaryOperator>();
     private static Map<JetToken, JsUnaryOperator> unaryOperatorsMap = new HashMap<JetToken, JsUnaryOperator>();
-    private static Map<JetToken, JsNameRef> operatorToFunctionNameReference = new HashMap<JetToken, JsNameRef>();
 
     static {
         unaryOperatorsMap.put(JetTokens.PLUSPLUS, JsUnaryOperator.INC);     //++
@@ -51,26 +47,11 @@ public final class OperatorTable {
         binaryOperatorsMap.put(JetTokens.PERCEQ, JsBinaryOperator.ASG_MOD);
     }
 
-    //TODO: resolve
-    static {
-        //operatorToFunctionNameReference.put(JetTokens.IS_KEYWORD, Namer.isOperationReference());
-    }
 
     public static boolean hasCorrespondingBinaryOperator(@NotNull JetToken token) {
         return binaryOperatorsMap.containsKey(token);
     }
 
-    public static boolean hasCorrespondingFunctionInvocation(@NotNull JetToken token) {
-        return operatorToFunctionNameReference.containsKey(token);
-    }
-
-    @NotNull
-    static public JsInvocation getCorrespondingFunctionInvocation(@NotNull JetToken token) {
-        JsNameRef functionReference = operatorToFunctionNameReference.get(token);
-        assert functionReference != null : "Token should represent a function call!";
-        return AstUtil.newInvocation(functionReference);
-    }
-
     @NotNull
     static public JsBinaryOperator getBinaryOperator(@NotNull JetToken token) {
         assert JetTokens.OPERATIONS.contains(token) : "Token should represent an operation!";
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedBinaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java
similarity index 58%
rename from translator/src/org/jetbrains/k2js/translate/operation/OverloadedBinaryOperationTranslator.java
rename to translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java
index 5ad71e2d15b..f356bae5856 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedBinaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java
@@ -3,29 +3,37 @@ package org.jetbrains.k2js.translate.operation;
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
+import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken;
 
 /**
  * @author Talanov Pavel
  */
-public final class OverloadedBinaryOperationTranslator extends BinaryOperationTranslator {
+public final class OverloadedAssignmentTranslator extends AssignmentTranslator {
 
     @NotNull
     public static JsExpression translate(@NotNull JetBinaryExpression expression,
                                          @NotNull TranslationContext context) {
-        return (new OverloadedBinaryOperationTranslator(expression, context)).translate();
+        return (new OverloadedAssignmentTranslator(expression, context)).translate();
     }
 
     @NotNull
     private final JsNameRef operationReference;
 
-    private OverloadedBinaryOperationTranslator(@NotNull JetBinaryExpression expression,
-                                                @NotNull TranslationContext context) {
+    private OverloadedAssignmentTranslator(@NotNull JetBinaryExpression expression,
+                                           @NotNull TranslationContext context) {
         super(expression, context);
-        JsNameRef overloadedOperationReference = getOverloadedOperationReference(expression, context);
+        //TODO: util
+        DeclarationDescriptor overloadedOperationDescriptor = getDescriptorForReferenceExpression
+                (context.bindingContext(), expression.getOperation());
+        assert overloadedOperationDescriptor != null;
+        JsNameRef overloadedOperationReference = context().getNameForDescriptor(overloadedOperationDescriptor).makeRef();
         assert overloadedOperationReference != null;
         this.operationReference = overloadedOperationReference;
     }
@@ -41,7 +49,7 @@ public final class OverloadedBinaryOperationTranslator extends BinaryOperationTr
 
     @NotNull
     private JsExpression asCompareToOverload() {
-        JetToken operationToken = getOperationToken();
+        JetToken operationToken = getOperationToken(expression);
         assert (OperatorConventions.COMPARISON_OPERATIONS.contains(operationToken));
         JsNumberLiteral zeroLiteral = program().getNumberLiteral(0);
         JsBinaryOperator correspondingOperator = OperatorTable.getBinaryOperator(operationToken);
@@ -49,36 +57,29 @@ public final class OverloadedBinaryOperationTranslator extends BinaryOperationTr
     }
 
     private boolean isCompareTo() {
-        String nameForOperationSymbol = OperatorConventions.getNameForOperationSymbol(getOperationToken());
+        //util
+        JetToken operationToken = getOperationToken(expression);
+        String nameForOperationSymbol = OperatorConventions.getNameForOperationSymbol(operationToken);
         assert nameForOperationSymbol != null : "Must have a name for overloaded operator";
         return (nameForOperationSymbol.equals("compareTo"));
     }
 
     @NotNull
     private JsExpression asOverloadedMethodCall() {
-        if (isPropertyOnTheLeft && isVariableReassignment) {
-            return propertyReassignment();
-        }
         if (isVariableReassignment) {
-            return nonPropertyReassignment();
+            return reassignment();
         }
         return overloadedMethodInvocation();
     }
 
     @NotNull
-    private JsInvocation propertyReassignment() {
-        return setterCall(overloadedMethodInvocation());
-    }
-
-    @NotNull
-    private JsExpression nonPropertyReassignment() {
-        assert left instanceof JsNameRef : "Reassignment should be called on l-value.";
-        return AstUtil.newAssignment((JsNameRef) left, overloadedMethodInvocation());
+    private JsExpression reassignment() {
+        return accessTranslator.translateAsSet(overloadedMethodInvocation());
     }
 
     @NotNull
     private JsExpression overloadedMethodInvocation() {
-        AstUtil.setQualifier(operationReference, left);
+        AstUtil.setQualifier(operationReference, accessTranslator.translateAsGet());
         return AstUtil.newInvocation(operationReference, right);
     }
 
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java
new file mode 100644
index 00000000000..9cbd5893327
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java
@@ -0,0 +1,53 @@
+package org.jetbrains.k2js.translate.operation;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsNameRef;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.psi.JetUnaryExpression;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.utils.BindingUtils;
+
+/**
+ * @author Talanov Pavel
+ */
+// TODO: provide better increment translator logic
+public final class OverloadedIncrementTranslator extends IncrementTranslator {
+
+    @NotNull
+    public static JsExpression translate(@NotNull JetUnaryExpression expression,
+                                         @NotNull TranslationContext context) {
+        return (new OverloadedIncrementTranslator(expression, context))
+                .translate();
+    }
+
+    @NotNull
+    private final JsNameRef operationReference;
+
+    private OverloadedIncrementTranslator(@NotNull JetUnaryExpression expression,
+                                          @NotNull TranslationContext context) {
+        super(expression, context);
+        //TODO: DUBLICATE CODE
+        DeclarationDescriptor overloadedOperationDescriptor = BindingUtils.getDescriptorForReferenceExpression
+                (context.bindingContext(), expression.getOperation());
+        assert overloadedOperationDescriptor != null;
+        JsNameRef overloadedOperationReference = context().getNameForDescriptor(overloadedOperationDescriptor).makeRef();
+        assert overloadedOperationReference != null;
+        this.operationReference = overloadedOperationReference;
+    }
+
+    @Override
+    @NotNull
+    protected JsExpression translate() {
+        return translateAsMethodCall();
+    }
+
+    @Override
+    @NotNull
+    protected JsExpression operationExpression(@NotNull JsExpression receiver) {
+        AstUtil.setQualifier(operationReference, receiver);
+        return AstUtil.newInvocation(operationReference);
+    }
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedUnaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedUnaryOperationTranslator.java
deleted file mode 100644
index 3220899701e..00000000000
--- a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedUnaryOperationTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jetbrains.k2js.translate.operation;
-
-import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
-import com.google.dart.compiler.util.AstUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetUnaryExpression;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-
-/**
- * @author Talanov Pavel
- */
-public final class OverloadedUnaryOperationTranslator extends UnaryOperationTranslator {
-
-    @NotNull
-    public static JsExpression translate(@NotNull JetUnaryExpression expression,
-                                         @NotNull TranslationContext context) {
-        return (new OverloadedUnaryOperationTranslator(expression, context))
-                .translate();
-    }
-
-    @NotNull
-    private final JsNameRef operationReference;
-
-    private OverloadedUnaryOperationTranslator(@NotNull JetUnaryExpression expression,
-                                               @NotNull TranslationContext context) {
-        super(expression, context);
-        this.operationReference = getOverloadedOperationReference(expression, context);
-    }
-
-    @Override
-    @NotNull
-    protected JsExpression translate() {
-        return translateAsMethodCall();
-    }
-
-    @Override
-    @NotNull
-    protected JsExpression operationExpression(@NotNull JsExpression receiver) {
-        AstUtil.setQualifier(operationReference, receiver);
-        return AstUtil.newInvocation(operationReference);
-    }
-
-}
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java
index 77266850435..2165d90b173 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java
@@ -1,134 +1,26 @@
 package org.jetbrains.k2js.translate.operation;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsInvocation;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
-import com.google.dart.compiler.util.AstUtil;
-import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetExpression;
-import org.jetbrains.jet.lang.psi.JetPrefixExpression;
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lang.psi.JetUnaryExpression;
-import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.reference.PropertyAccessTranslator;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
-
-import static org.jetbrains.k2js.translate.utils.BindingUtils.isVariableReassignment;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.getBaseExpression;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateBaseExpression;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.reference.CallTranslator;
+import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
 /**
  * @author Talanov Pavel
  */
-//TODO: reexamine class, see if can be clearer
-public abstract class UnaryOperationTranslator extends OperationTranslator {
+
+//TODO: merge with binary operation
+public final class UnaryOperationTranslator {
 
     @NotNull
-    private final JetUnaryExpression expression;
-    @NotNull
-    protected final JsExpression baseExpression;
-    protected final boolean isPrefix;
-    private final boolean isVariableReassignment;
-    private final boolean isStatement;
-    protected final boolean isPropertyAccess;
-
-    protected UnaryOperationTranslator(@NotNull JetUnaryExpression expression,
-                                       @NotNull TranslationContext context) {
-        super(context);
-        this.expression = expression;
-        this.isPrefix = isPrefix(expression);
-        this.isVariableReassignment = isVariableReassignment(context.bindingContext(), expression);
-        this.isStatement = BindingUtils.isStatement(context().bindingContext(), expression);
-        this.baseExpression = translateBaseExpression(context, expression);
-        this.isPropertyAccess = isPropertyAccess(getBaseExpression(expression));
-    }
-
-    @NotNull
-    protected abstract JsExpression translate();
-
-    @NotNull
-    protected JsExpression translateAsMethodCall() {
-        if (isStatement || isPrefix) {
-            return asPrefix();
-        }
-        if (isVariableReassignment) {
-            return asPostfixWithReassignment();
-        } else {
-            return asPostfixWithNoReassignment();
+    public static JsExpression translate(@NotNull JetUnaryExpression expression,
+                                         @NotNull TranslationContext context) {
+        if (IncrementTranslator.isIncrement(expression)) {
+            return IncrementTranslator.translate(expression, context);
         }
+        assert TranslationUtils.isIntrinsicOperation(context, expression);
+        return CallTranslator.translate(expression, context);
     }
-
-    @NotNull
-    private JsExpression asPrefix() {
-        if (isVariableReassignment) {
-            return variableReassignment(baseExpression);
-        }
-        return operationExpression(baseExpression);
-    }
-
-    //TODO: decide if this expression can be optimised in case of direct access (not property)
-    @NotNull
-    private JsExpression asPostfixWithReassignment() {
-        // code fragment: expr(a++)
-        // generate: expr( (t1 = a, t2 = t1, a = t1.inc(), t2) )
-        TemporaryVariable t1 = declareTemporary(baseExpression);
-        TemporaryVariable t2 = declareTemporary(t1.nameReference());
-        JsExpression variableReassignment = variableReassignment(t1.nameReference());
-        return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(),
-                variableReassignment, t2.nameReference());
-    }
-
-    @NotNull
-    private JsExpression asPostfixWithNoReassignment() {
-        // code fragment: expr(a++)
-        // generate: expr( (t1 = a, t2 = t1, t2.inc(), t1) )
-        TemporaryVariable t1 = declareTemporary(baseExpression);
-        TemporaryVariable t2 = declareTemporary(t1.nameReference());
-        JsExpression methodCall = operationExpression(t2.nameReference());
-        JsExpression returnedValue = t1.nameReference();
-        return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(), methodCall, returnedValue);
-    }
-
-    @NotNull
-    private JsExpression variableReassignment(@NotNull JsExpression toCallMethodUpon) {
-        if (isPropertyAccess) {
-            return propertyReassignment(toCallMethodUpon);
-        }
-        return localVariableReassignment(toCallMethodUpon);
-    }
-
-    private JsExpression localVariableReassignment(@NotNull JsExpression toCallMethodUpon) {
-        assert baseExpression instanceof JsNameRef : "Base expression should be an l-value";
-        return AstUtil.newAssignment((JsNameRef) baseExpression, operationExpression(toCallMethodUpon));
-    }
-
-    @NotNull
-    private JsExpression propertyReassignment(@NotNull JsExpression toCallMethodUpon) {
-        JetExpression jetBaseExpression = getBaseExpression(expression);
-        JsInvocation setterCall =
-                PropertyAccessTranslator.translateAsPropertySetterCall(jetBaseExpression, context());
-        assert PropertyAccessTranslator.canBePropertyGetterCall(jetBaseExpression, context()) : "Should be a getter call";
-        JsExpression overloadedMethodCallOnPropertyGetter = operationExpression(toCallMethodUpon);
-        setterCall.setArguments(overloadedMethodCallOnPropertyGetter);
-        return setterCall;
-    }
-
-    @NotNull
-    abstract JsExpression operationExpression(@NotNull JsExpression receiver);
-
-    @NotNull
-    protected JetToken getOperationToken() {
-        JetSimpleNameExpression operationExpression = expression.getOperation();
-        IElementType elementType = operationExpression.getReferencedNameElementType();
-        assert elementType instanceof JetToken : "Unary expression should have IElementType of type JetToken";
-        return (JetToken) elementType;
-    }
-
-    private boolean isPrefix(JetUnaryExpression expression) {
-        return (expression instanceof JetPrefixExpression);
-    }
-
-
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java
new file mode 100644
index 00000000000..385f9e161a6
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java
@@ -0,0 +1,44 @@
+package org.jetbrains.k2js.translate.reference;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.general.AbstractTranslator;
+
+/**
+ * @author Talanov Pavel
+ */
+public abstract class AccessTranslator extends AbstractTranslator {
+
+    @NotNull
+    public static AccessTranslator getAccessTranslator(@NotNull JetExpression referenceExpression,
+                                                       @NotNull TranslationContext context) {
+        assert ((referenceExpression instanceof JetReferenceExpression) ||
+                (referenceExpression instanceof JetDotQualifiedExpression));
+        if (PropertyAccessTranslator.canBePropertyAccess(referenceExpression, context)) {
+            return PropertyAccessTranslator.newInstance(referenceExpression, context);
+        }
+        if (referenceExpression instanceof JetArrayAccessExpression) {
+            return ArrayAccessTranslator.newInstance((JetArrayAccessExpression) referenceExpression, context);
+        }
+        return ReferenceAccessTranslator.newInstance((JetSimpleNameExpression) referenceExpression, context);
+    }
+
+
+    @NotNull
+    public static JsExpression translateAsGet(@NotNull JetReferenceExpression expression,
+                                              @NotNull TranslationContext context) {
+        return (getAccessTranslator(expression, context)).translateAsGet();
+    }
+
+
+    protected AccessTranslator(@Deprecated TranslationContext context) {
+        super(context);
+    }
+
+    public abstract JsExpression translateAsGet();
+
+    public abstract JsExpression translateAsSet(@NotNull JsExpression setTo);
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
index 0d519f79c22..8a92d6c1cd8 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
@@ -5,16 +5,10 @@ import com.google.dart.compiler.backend.js.ast.JsInvocation;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetArrayAccessExpression;
-import org.jetbrains.jet.lang.psi.JetBinaryExpression;
-import org.jetbrains.jet.lang.psi.JetExpression;
-import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
-import org.jetbrains.k2js.translate.operation.OperatorTable;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
@@ -23,41 +17,25 @@ import java.util.List;
 /**
  * @author Talanov Pavel
  */
-public final class ArrayAccessTranslator extends AbstractTranslator {
+public final class ArrayAccessTranslator extends AccessTranslator {
 
 
-    public static boolean canBeArraySetterCall(@NotNull JetBinaryExpression expression) {
-        //TODO: move unsafe call to util
-        return (OperatorTable.isAssignment((JetToken) expression.getOperationToken())
-                && (expression.getLeft() instanceof JetArrayAccessExpression));
+    public static ArrayAccessTranslator newInstance(@NotNull JetArrayAccessExpression expression,
+                                                    @NotNull TranslationContext context) {
+        return new ArrayAccessTranslator(expression, context);
     }
 
-    public static JsInvocation translateAsArrayGetterCall(@NotNull JetArrayAccessExpression expression,
-                                                          @NotNull TranslationContext context) {
-        return (new ArrayAccessTranslator(expression, null, context)).translateAsArrayGet();
-    }
-
-    public static JsInvocation translateAsArraySetterCall(@NotNull JetBinaryExpression expression,
-                                                          @NotNull TranslationContext context) {
-        JetExpression arrayAccess = expression.getLeft();
-        assert (arrayAccess instanceof JetArrayAccessExpression) : "Check with canBeArraySetterCall";
-        JetExpression right = expression.getRight();
-        assert right != null : "Binary expression should have a right expression";
-        JsExpression expressionToSetTo = Translation.translateAsExpression(right, context);
-        return (new ArrayAccessTranslator((JetArrayAccessExpression) arrayAccess, expressionToSetTo, context))
-                .translateAsArraySet();
-    }
+//    public static JsExpression translateAsArrayGet(@NotNull JetArrayAccessExpression expression,
+//                                                    @NotNull TranslationContext context) {
+//        return (new ArrayAccessTranslator(expression, context)).translateAsGet();
+//    }
 
     @NotNull
     private final JetArrayAccessExpression expression;
     @NotNull
     private final DeclarationDescriptor methodDescriptor;
-    @Nullable
-    private final JsExpression expressionToSetTo;
-
 
     private ArrayAccessTranslator(@NotNull JetArrayAccessExpression expression,
-                                  @Nullable JsExpression expressionToSetTo,
                                   @NotNull TranslationContext context) {
         super(context);
         this.expression = expression;
@@ -65,28 +43,28 @@ public final class ArrayAccessTranslator extends AbstractTranslator {
                 BindingUtils.getDescriptorForReferenceExpression(context.bindingContext(), expression);
         assert descriptorForReferenceExpression != null : "Array access expression must reference a descriptor";
         this.methodDescriptor = descriptorForReferenceExpression;
-        this.expressionToSetTo = expressionToSetTo;
     }
 
+    @Override
     @NotNull
-    private JsInvocation translateAsArrayGet() {
+    public JsInvocation translateAsGet() {
         return translateAsArrayAccessWithIndices();
     }
 
+    @Override
+    @NotNull
+    public JsExpression translateAsSet(@NotNull JsExpression expression) {
+        JsInvocation setCall = translateAsArrayAccessWithIndices();
+        setCall.getArguments().add(expression);
+        return setCall;
+    }
+
     private JsInvocation translateAsArrayAccessWithIndices() {
         JsNameRef accessMethodReference = getAccessMethodReference();
         AstUtil.setQualifier(accessMethodReference, translateArrayExpression());
         return AstUtil.newInvocation(accessMethodReference, translateIndexExpressions());
     }
 
-    @NotNull
-    private JsInvocation translateAsArraySet() {
-        assert expressionToSetTo != null;
-        JsInvocation setCall = translateAsArrayAccessWithIndices();
-        setCall.getArguments().add(expressionToSetTo);
-        return setCall;
-    }
-
     @NotNull
     private List<JsExpression> translateIndexExpressions() {
         return TranslationUtils.translateExpressionList(context(), expression.getIndexExpressions());
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
index 373a4fa2e4c..b7ebd35d06a 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
@@ -10,8 +10,8 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsic;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
index 57a2e5e4da1..cdf398f12ae 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
@@ -13,68 +13,54 @@ import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
-import org.jetbrains.k2js.translate.general.AbstractTranslator;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 import org.jetbrains.k2js.translate.utils.PsiUtils;
 
 /**
  * @author Talanov Pavel
  */
-public final class PropertyAccessTranslator extends AbstractTranslator {
+public final class PropertyAccessTranslator extends AccessTranslator {
 
     private static String MESSAGE = "Cannot be accessor call. Use canBeProperty*Call to ensure this method " +
             "can be called safely.";
 
+
     @NotNull
-    public static JsInvocation translateAsPropertySetterCall(@NotNull JetQualifiedExpression expression,
+    public static JsExpression translateAsPropertyGetterCall(@NotNull JetQualifiedExpression expression,
                                                              @NotNull TranslationContext context) {
         return (new PropertyAccessTranslator(expression, context))
-                .translateAsPropertySetterCall();
+                .translateAsGet();
     }
 
     @NotNull
-    public static JsInvocation translateAsPropertySetterCall(@NotNull JetSimpleNameExpression expression,
-                                                             @NotNull TranslationContext context) {
-        return (new PropertyAccessTranslator(expression, context))
-                .translateAsPropertySetterCall();
+    public static PropertyAccessTranslator newInstance(@NotNull JetQualifiedExpression expression,
+                                                       @NotNull TranslationContext context) {
+        return (new PropertyAccessTranslator(expression, context));
     }
 
     @NotNull
-    public static JsInvocation translateAsPropertySetterCall(@NotNull JetExpression expression,
+    public static PropertyAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression,
+                                                       @NotNull TranslationContext context) {
+        return (new PropertyAccessTranslator(expression, context));
+    }
+
+    @NotNull
+    public static JsExpression translateAsPropertyGetterCall(@NotNull JetSimpleNameExpression expression,
                                                              @NotNull TranslationContext context) {
+        return (new PropertyAccessTranslator(expression, context))
+                .translateAsGet();
+    }
+
+    @NotNull
+    public static PropertyAccessTranslator newInstance(@NotNull JetExpression expression,
+                                                       @NotNull TranslationContext context) {
         if (expression instanceof JetQualifiedExpression) {
-            return translateAsPropertySetterCall((JetQualifiedExpression) expression, context);
+            return newInstance((JetQualifiedExpression) expression, context);
         }
         if (expression instanceof JetSimpleNameExpression) {
-            return translateAsPropertySetterCall((JetSimpleNameExpression) expression, context);
-        }
-        throw new AssertionError(MESSAGE);
-    }
-
-    @NotNull
-    public static JsInvocation translateAsPropertyGetterCall(@NotNull JetQualifiedExpression expression,
-                                                             @NotNull TranslationContext context) {
-        return (new PropertyAccessTranslator(expression, context))
-                .translateAsPropertyGetterCall();
-    }
-
-    @NotNull
-    public static JsInvocation translateAsPropertyGetterCall(@NotNull JetSimpleNameExpression expression,
-                                                             @NotNull TranslationContext context) {
-        return (new PropertyAccessTranslator(expression, context))
-                .translateAsPropertyGetterCall();
-    }
-
-    @NotNull
-    public static JsInvocation translateAsPropertyGetterCall(@NotNull JetExpression expression,
-                                                             @NotNull TranslationContext context) {
-        if (expression instanceof JetQualifiedExpression) {
-            return translateAsPropertyGetterCall((JetQualifiedExpression) expression, context);
-        }
-        if (expression instanceof JetSimpleNameExpression) {
-            return translateAsPropertyGetterCall((JetSimpleNameExpression) expression, context);
+            return newInstance((JetSimpleNameExpression) expression, context);
         }
         throw new AssertionError(MESSAGE);
     }
@@ -133,12 +119,22 @@ public final class PropertyAccessTranslator extends AbstractTranslator {
         this.propertyDescriptor = getNotNullPropertyDescriptor();
     }
 
+    @Override
     @NotNull
-    public JsInvocation translateAsPropertyGetterCall() {
+    public JsExpression translateAsGet() {
         JsName getterName = getNotNullGetterName();
         return qualifiedAccessorInvocation(getterName);
     }
 
+    @Override
+    @NotNull
+    public JsExpression translateAsSet(@NotNull JsExpression toSetTo) {
+        JsName setterName = getNotNullSetterName();
+        JsInvocation setterCall = qualifiedAccessorInvocation(setterName);
+        setterCall.getArguments().add(toSetTo);
+        return setterCall;
+    }
+
     @NotNull
     private JsInvocation qualifiedAccessorInvocation(@NotNull JsName accessorName) {
         JsNameRef accessorReference = accessorName.makeRef();
@@ -146,12 +142,6 @@ public final class PropertyAccessTranslator extends AbstractTranslator {
         return AstUtil.newInvocation(accessorReference);
     }
 
-    @NotNull
-    public JsInvocation translateAsPropertySetterCall() {
-        JsName setterName = getNotNullSetterName();
-        return qualifiedAccessorInvocation(setterName);
-    }
-
     @NotNull
     private JsExpression translateQualifier() {
         if (qualifier != null) {
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java
new file mode 100644
index 00000000000..15262d97e48
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java
@@ -0,0 +1,45 @@
+package org.jetbrains.k2js.translate.reference;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsNameRef;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+
+/**
+ * @author Talanov Pavel
+ */
+public final class ReferenceAccessTranslator extends AccessTranslator {
+
+    @NotNull
+    public static ReferenceAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression,
+                                                        @NotNull TranslationContext context) {
+        return new ReferenceAccessTranslator(expression, context);
+    }
+
+
+    @NotNull
+    private final JetSimpleNameExpression expression;
+
+    private ReferenceAccessTranslator(@NotNull JetSimpleNameExpression expression,
+                                      @NotNull TranslationContext context) {
+        super(context);
+        this.expression = expression;
+    }
+
+    @Override
+    @NotNull
+    public JsExpression translateAsGet() {
+        return ReferenceTranslator.translateSimpleName(expression, context());
+    }
+
+    @Override
+    @NotNull
+    public JsExpression translateAsSet(@NotNull JsExpression toSetTo) {
+        JsExpression reference = ReferenceTranslator.translateSimpleName(expression, context());
+        assert reference instanceof JsNameRef;
+        return AstUtil.newAssignment((JsNameRef) reference, toSetTo);
+    }
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
index ecab77fc081..b421e1ab62c 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
@@ -7,8 +7,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
index 6081712fe6f..d2c2f40fae9 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
@@ -247,4 +247,18 @@ public final class BindingUtils {
         return result;
     }
 
+
+    @Nullable
+    public static FunctionDescriptor getFunctionDescriptorForOperationExpression(@NotNull BindingContext context,
+                                                                                 @NotNull JetOperationExpression expression) {
+        DeclarationDescriptor descriptorForReferenceExpression = getDescriptorForReferenceExpression
+                (context, expression.getOperation());
+
+        if (descriptorForReferenceExpression == null) return null;
+
+        assert descriptorForReferenceExpression instanceof FunctionDescriptor
+                : "Operation should resolve to function descriptor.";
+        return (FunctionDescriptor) descriptorForReferenceExpression;
+    }
+
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
new file mode 100644
index 00000000000..0263bda190f
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
@@ -0,0 +1,23 @@
+package org.jetbrains.k2js.translate.utils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+
+/**
+ * @author Talanov Pavel
+ */
+public final class DescriptorUtils {
+
+    private DescriptorUtils() {
+    }
+
+
+    private static int valueParametersCount(@NotNull FunctionDescriptor functionDescriptor) {
+        return functionDescriptor.getValueParameters().size();
+    }
+
+    public static boolean hasParameters(@NotNull FunctionDescriptor functionDescriptor) {
+        return (valueParametersCount(functionDescriptor) > 0);
+    }
+
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
index 9ad024de66f..9ad05c2f6aa 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
@@ -1,10 +1,13 @@
 package org.jetbrains.k2js.translate.utils;
 
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetExpression;
+import org.jetbrains.jet.lang.psi.JetOperationExpression;
 import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.jet.lexer.JetToken;
 
 /**
  * @author Talanov Pavel
@@ -23,4 +26,12 @@ public final class PsiUtils {
         }
         return (JetSimpleNameExpression) selectorExpression;
     }
+
+    @NotNull
+    public static JetToken getOperationToken(@NotNull JetOperationExpression expression) {
+        JetSimpleNameExpression operationExpression = expression.getOperation();
+        IElementType elementType = operationExpression.getReferencedNameElementType();
+        assert elementType instanceof JetToken : "Unary expression should have operation token of type JetToken";
+        return (JetToken) elementType;
+    }
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
index b051510d185..6efe58e0f0c 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
@@ -9,8 +9,9 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.translate.general.TranslationContext;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -214,4 +215,15 @@ public final class TranslationUtils {
         return Translation.translateAsExpression(rightExpression, context);
     }
 
+    //TODO: check function with same name
+    public static boolean isIntrinsicOperation(@NotNull TranslationContext context,
+                                               @NotNull JetOperationExpression expression) {
+        FunctionDescriptor operationDescriptor =
+                BindingUtils.getFunctionDescriptorForOperationExpression(context.bindingContext(), expression);
+
+        if (operationDescriptor == null) return true;
+        if (context.intrinsics().hasDescriptor(operationDescriptor)) return true;
+
+        return false;
+    }
 }
diff --git a/translator/testFiles/patternMatching/cases/multipleCases.kt b/translator/testFiles/patternMatching/cases/multipleCases.kt
index b75ebe8d8d3..69fdd01bc0b 100644
--- a/translator/testFiles/patternMatching/cases/multipleCases.kt
+++ b/translator/testFiles/patternMatching/cases/multipleCases.kt
@@ -6,12 +6,12 @@ fun box() : Int {
   var z = 0
   when(c) {
     is 5, is 3 => z++;
-    else => z = -1000;
+    else => {z = -1000;}
   }
 
   when(d) {
     is 5, is 3 => z++;
-    else => z = -1000;
+    else => {z = -1000;}
   }
   return z
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenNotValue.kt b/translator/testFiles/patternMatching/cases/whenNotValue.kt
index 949ef0b068d..e50902d4d87 100644
--- a/translator/testFiles/patternMatching/cases/whenNotValue.kt
+++ b/translator/testFiles/patternMatching/cases/whenNotValue.kt
@@ -3,8 +3,8 @@ namespace foo
 fun box() : Boolean {
   var a = 4
   when(a) {
-    !is 3 => a = 10;
-    !is 4 => a = 20;
+    !is 3 => {a = 10;}
+    !is 4 => {a = 20;}
   }
   return (a == 10)
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenValue.kt b/translator/testFiles/patternMatching/cases/whenValue.kt
index 52093a79b4c..ed392ef3040 100644
--- a/translator/testFiles/patternMatching/cases/whenValue.kt
+++ b/translator/testFiles/patternMatching/cases/whenValue.kt
@@ -3,8 +3,8 @@ namespace foo
 fun box() : Boolean {
   var a = 4
   when(a) {
-    is 3 => a = 10;
-    is 4 => a = 20;
+    is 3 => {a = 10;}
+    is 4 => {a = 20;}
   }
   return (a == 20)
 }
\ No newline at end of file