From 26b8424d3713c8d31521f283cd5fa342883493df Mon Sep 17 00:00:00 2001
From: Pavel Talanov <Pavel.Talanov@jetbrains.com>
Date: Wed, 2 Nov 2011 19:34:55 +0400
Subject: [PATCH] Added custom getter, setter, class support. Not complete.

---
 .idea/workspace.xml                           | 409 +++++++++++-------
 .../cfg/JetFlowInformationProvider$7.class    | Bin 3184 -> 3202 bytes
 ...rmationProvider$InitializationPoints.class | Bin 2484 -> 2484 bytes
 .../lang/cfg/JetFlowInformationProvider.class | Bin 16682 -> 16682 bytes
 .../backend/js/ast/JsObjectLiteral.class      | Bin 2600 -> 3084 bytes
 .../k2js/translate/AbstractTranslator.class   | Bin 3094 -> 2950 bytes
 ...anslator$FunctionVariableDeclaration.class | Bin 2317 -> 2317 bytes
 ...nslator$NamespacePropertyDeclaration.class | Bin 2841 -> 2841 bytes
 .../DeclarationTranslator$State.class         | Bin 724 -> 724 bytes
 .../translate/DeclarationTranslator.class     | Bin 4401 -> 4677 bytes
 .../k2js/translate/TranslationContext.class   | Bin 6632 -> 7385 bytes
 .../compiler/backend/js/ast/JsInvocation.java |  88 ++--
 .../backend/js/ast/JsObjectLiteral.java       |  92 ++--
 src/org/jetbrains/k2js/K2JSTranslator.java    |   2 +-
 .../k2js/translate/AbstractTranslator.java    |   3 +-
 .../k2js/translate/DeclarationTranslator.java |   5 +-
 .../k2js/translate/ExpressionTranslator.java  |   2 +-
 .../k2js/translate/TranslationContext.java    |  14 +
 test_files/test.kt                            |  19 +-
 19 files changed, 371 insertions(+), 263 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0209336b803..c6775eaba8f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -29,20 +29,7 @@
   </component>
   <component name="DebuggerManager">
     <line_breakpoints>
-      <breakpoint url="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/TranslationContext.java" line="70" class="org.jetbrains.k2js.translate.TranslationContext" package="org.jetbrains.k2js.translate">
-        <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$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java" line="80" class="org.jetbrains.k2js.translate.DeclarationTranslator.NamespacePropertyDeclaration" package="org.jetbrains.k2js.translate">
+      <breakpoint url="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java" line="27" class="org.jetbrains.k2js.translate.DeclarationTranslator" package="org.jetbrains.k2js.translate">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -95,31 +82,22 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.4299611">
+    <splitter split-orientation="horizontal" split-proportion="0.61738">
       <split-first>
         <leaf>
-          <file leaf-file-name="DeclarationTranslator.java" pinned="false" current="true" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java">
+          <file leaf-file-name="BindingContext.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="75" column="30" selection-start="2696" selection-end="2696" vertical-scroll-proportion="1.5930233">
+                <state line="49" column="30" selection-start="3469" selection-end="3469" vertical-scroll-proportion="-5.923077">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="FunctionTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/FunctionTranslator.java">
+          <file leaf-file-name="ClassTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="38" column="15" selection-start="1475" selection-end="1475" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="K2JsVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/K2JsVisitor.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="18" column="52" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
+                <state line="29" column="10" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.0">
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -127,64 +105,77 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="JetVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java">
+          <file leaf-file-name="MutableClassDescriptor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="39" column="35" selection-start="1120" selection-end="1120" vertical-scroll-proportion="-8.692307">
+                <state line="272" column="0" selection-start="10394" selection-end="10394" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="JetNamespaceBody.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java">
+          <file leaf-file-name="JetClass.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="11" column="13" selection-start="216" selection-end="216" vertical-scroll-proportion="0.0">
+                <state line="14" column="13" selection-start="328" selection-end="328" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="AbstractTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/AbstractTranslator.java">
+          <file leaf-file-name="ClassDescriptor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="38" column="0" selection-start="977" selection-end="1087" vertical-scroll-proportion="0.0">
+                <state line="25" column="8" selection-start="784" selection-end="784" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/TranslationContext.java">
+          <file leaf-file-name="JetType.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="6" column="36" selection-start="273" selection-end="274" vertical-scroll-proportion="-0.65384614">
+                <state line="11" column="17" selection-start="271" selection-end="271" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="JsFunction.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/ast/JsFunction.java">
+          <file leaf-file-name="DeclarationDescriptor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="78" column="45" selection-start="2249" selection-end="2249" vertical-scroll-proportion="0.0">
+                <state line="10" column="17" selection-start="294" selection-end="294" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Lists.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/util/Lists.java">
+          <file leaf-file-name="ClassBodyVisitor.java" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassBodyVisitor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="103" column="11" selection-start="3043" selection-end="3043" vertical-scroll-proportion="0.0">
-                  <folding />
+                <state line="60" column="78" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.8633441">
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="JsSourceGenerationVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/JsSourceGenerationVisitor.java">
+          <file leaf-file-name="Namer.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/Namer.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="24" column="0" selection-start="837" selection-end="837" vertical-scroll-proportion="0.0">
+                <state line="24" column="54" selection-start="641" selection-end="641" vertical-scroll-proportion="0.0">
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DeclarationTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="16" column="13" selection-start="404" selection-end="404" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -194,11 +185,14 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="ExpressionTranslator.java" pinned="false" current="false" current-in-tab="true">
+          <file leaf-file-name="ExpressionTranslator.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="29" column="5" selection-start="876" selection-end="876" vertical-scroll-proportion="0.53543305">
-                  <folding />
+                <state line="14" column="11" selection-start="460" selection-end="460" vertical-scroll-proportion="0.0">
+                  <folding>
+                    <element signature="method#ExpressionTranslator#0;class#ExpressionTranslator#0" expanded="false" />
+                    <element signature="method#translate#0;class#ExpressionTranslator#0" expanded="false" />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -217,7 +211,7 @@
           <file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/K2JSTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="86" column="89" selection-start="3329" selection-end="3329" vertical-scroll-proportion="0.0">
+                <state line="48" column="28" selection-start="1886" selection-end="1886" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -235,21 +229,32 @@
           <file leaf-file-name="NamespaceTranslator.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/NamespaceTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="38" column="69" selection-start="1402" selection-end="1402" vertical-scroll-proportion="0.0">
+                <state line="38" column="0" selection-start="1333" selection-end="1333" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="test.kt" pinned="false" current="false" current-in-tab="false">
+          <file leaf-file-name="test.kt" pinned="false" current="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/test_files/test.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="17" column="42" selection-start="269" selection-end="269" vertical-scroll-proportion="0.0">
+                <state line="13" column="6" selection-start="151" selection-end="151" vertical-scroll-proportion="0.35934958">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="K2JsVisitor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/K2JsVisitor.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="18" column="52" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
           <file leaf-file-name="ContextType.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ContextType.java">
               <provider selected="true" editor-type-id="text-editor">
@@ -262,7 +267,7 @@
           <file leaf-file-name="AstUtil.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/util/AstUtil.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="126" column="20" selection-start="4197" selection-end="4197" vertical-scroll-proportion="0.0">
+                <state line="30" column="28" selection-start="1015" selection-end="1015" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -294,22 +299,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/OperationTranslator.java" />
-        <option value="$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/ast/JsFunction.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/AbstractTranslator.java" />
-        <option value="$PROJECT_DIR$/src/com/google/dart/compiler/util/AstUtil.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ContextType.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/NamespaceTranslator.java" />
         <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/FunctionTranslator.java" />
-        <option value="$PROJECT_DIR$/test_files/test.kt" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/K2JSTranslator.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/TranslationContext.java" />
-        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionTranslator.java" />
         <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/K2JsVisitor.java" />
         <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionVisitor.java" />
         <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationVisitor.java" />
         <option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionTranslator.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/AbstractTranslator.java" />
+        <option value="$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/K2JSTranslator.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/TranslationContext.java" />
+        <option value="$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/Namer.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassTranslator.java" />
+        <option value="$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassBodyVisitor.java" />
+        <option value="$PROJECT_DIR$/test_files/test.kt" />
       </list>
     </option>
   </component>
@@ -386,6 +391,20 @@
               <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="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test_files" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -440,6 +459,70 @@
               <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="frontend" />
+              <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="frontend" />
+              <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="jet" />
+              <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="frontend" />
+              <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="jet" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lang" />
+              <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="frontend" />
+              <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>
         </subPane>
       </pane>
     </panes>
@@ -646,7 +729,7 @@
       <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.17540108" sideWeight="0.6719057" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" 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="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3280943" sideWeight="0.5" order="2" 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.3280943" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="JsTestDriver Server" 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="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" />
@@ -706,122 +789,124 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/NamespaceTranslator.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="69" selection-start="1402" selection-end="1402" vertical-scroll-proportion="0.0">
+        <state line="42" column="35" selection-start="1162" selection-end="1162" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/com/google/dart/compiler/backend/js/Test.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="13" selection-start="215" selection-end="215" vertical-scroll-proportion="0.0">
+        <state line="26" column="26" selection-start="670" selection-end="670" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="216" selection-end="216" vertical-scroll-proportion="0.0">
+        <state line="10" column="13" selection-start="232" selection-end="232" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/OperationTranslator.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclaration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="19" selection-start="414" selection-end="414" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/K2JSTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="86" column="89" selection-start="3329" selection-end="3329" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/TranslationContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="36" selection-start="273" selection-end="274" vertical-scroll-proportion="-0.65384614">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/AbstractTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="0" selection-start="977" selection-end="1087" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test_files/test.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="42" selection-start="269" selection-end="269" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/K2JsVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="52" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="25" selection-start="362" selection-end="362" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="35" selection-start="1120" selection-end="1120" vertical-scroll-proportion="-8.692307">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="665" column="0" selection-start="17342" selection-end="17342" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/FunctionTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="15" selection-start="1475" selection-end="1475" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="57" selection-start="493" selection-end="493" vertical-scroll-proportion="-10.2">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ExpressionTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="5" selection-start="876" selection-end="876" vertical-scroll-proportion="0.53543305">
+        <state line="11" column="22" selection-start="282" selection-end="282" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/DeclarationTranslator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="75" column="30" selection-start="2696" selection-end="2696" vertical-scroll-proportion="1.5930233">
+        <state line="16" column="13" selection-start="404" selection-end="404" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="17" selection-start="294" selection-end="294" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="25" column="8" selection-start="784" selection-end="784" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="17" selection-start="271" selection-end="271" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="49" column="30" selection-start="3469" selection-end="3469" vertical-scroll-proportion="-5.923077">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/Namer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="54" selection-start="641" selection-end="641" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/K2JSTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="48" column="28" selection-start="1886" selection-end="1886" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="14" column="13" selection-start="328" selection-end="328" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="272" column="0" selection-start="10394" selection-end="10394" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="10" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test_files/test.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="6" selection-start="151" selection-end="151" vertical-scroll-proportion="0.35934958">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/jetbrains/k2js/translate/ClassBodyVisitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="60" column="78" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.8633441">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider$7.class b/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider$7.class
index 34a9112f0e396644e9706d54c11eaeace3f76803..26a3ff89106cc035e4c0a79fc91e5ee22d97afea 100644
GIT binary patch
delta 300
zcmYL^%Sr-a6o9`o&NPf+v=GrnQ(>6R_^Vwu8f^kWhA^c~S7_0D1ipf=&;y8tB(!KH
zJ&cPUK*2L(m(Ah)=k|U7cfMa3&b-|hQrN&*@P@o&k8r{XYbic)J7!90;H9h2IUJA<
zS-B)HU5xZNl`FP&Gg$4jLs4IPi4yxrl9f5YBC9bVR8mE&9@ZS=Vlp~ZrKWL9%U{}7
z2vImD6O+&XjW*4%QqwNjQ_6#nbp6T4RjF$nxxtfLe7U12_cY{zwmc?sCwkLYc#My~
e8U1NS)HzHvBUYLYEsi+;(cHjV(0ILA-;*WpKPG1Y

delta 279
zcmYL^%}N3R5XXO`?wT8R2oEY~LZ+?T`qe^o2m;ybrk6|+=}m%OVUN9pR7jre)WK)*
z&;ukmyGmZ>`#<xW*TQdpw$7B^NRk3>8=uG*sdo%#ftlo+bP#5(=F4f+mw=o+U`wAH
z8E~eG#!g3tbIo)EHR?zlU1F0U$AwNgdf`f|N5~&`8dqnUwA7Zgy40?r-go9?1NVo!
z1Be@egiFf|S62JEh^ZWp7&0UyPn2bZCu4dtiFrKTQ{G>UKJx#`eA;wkGM^op!988B
P_hcs|Hh3S?<Em@{7)K*C

diff --git a/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider$InitializationPoints.class b/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider$InitializationPoints.class
index 501bfcfb86c90f56c757f858c749b3ded3cee942..0a0d5be3f3fe8202a9c170f7084fa21c50cb7e9c 100644
GIT binary patch
delta 143
zcmdlYyhV6}F&l3d0}Eq112<zfg8*aBWCylb!91u)K2W59L7K5}@;bIo#bT&v2~f0@
zL5s1B!H}_>!Hltz!G*Dk!JV;sas>O-$wnL^lNmV-8Ji{>bJR(;Gq5vu0M&Ofh%)vt
hC^7ajI5YM!xH3+he2Sx;a~e=|I)ggnjLA`)Q2-qO9$f$c

delta 143
zcmdlYyhV6}F&l3h0}Ep^12<zjg8*a3WCylb!7QjqHc%voL7Fjl@;bIo#eAq}0Z_D%
zL5s17!H}_-!Hlt#!G*Dm!JV;uas>NS#;VEh*j*;SWfz(3#*r=A%)rjr0#x6|Aj;Um
hpv2h8;LO;?;L6xL`4mSx=Om!$WCnG{DU+i(qX1X@AD#dJ

diff --git a/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.class b/out/production/frontend/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.class
index ed724665639ea2d889131019146d58b581519201..f2fb6ff00071a12eddbc0e9c66dcaeef0c8c6987 100644
GIT binary patch
delta 16
XcmZ40#JH-7al>YN#^lXg?8_JdI+g~0

delta 16
XcmZ40#JH-7al>YN#`w)!?8_JdI(`Ov

diff --git a/out/production/k2js/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.class b/out/production/k2js/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.class
index 5ccdcfef8fc7565d43f6d72ce3ba48844b007566..4dbaf9f2c2492be11d7a81e90210b81adb3c47c7 100644
GIT binary patch
literal 3084
zcmcguT~ixX7=BK&VM($Oz62^&p<;yuNh{QfP`*K-A+!xrTR)d%fu&29+1)V3TQB_u
z^bho=7qu##+8OoE8Gnbr!f~w6*=+c}AnlAdXU}=}{dnGw=j{IZ?=Qas7{GcA%@|iP
z5km;$Q8Z#wE>kL|W2nJ+95a}W<70dxmpK*lF~o5_h71<ul9kJ16gO~F#jO}}SW@w+
zKxE6Yw_JgS%!a<Lr%Rq`r8B1M4GTnb=2}trN{%6L^VsW=Oy1s1ui5sRWuyzb<E44t
zGA+YNuju)EMzN6IaMQZ$rRUunj9@t4&Ro&-Ox-fSHJss5`fu*mU6(IRyXa1vuD)U!
z1p#qapk~CR?x;Yxr*~OEnX(JSkjR)tBU{>BF`Ol-EYOs(^SZUHJElAbLd9D*nb1%b
z2p3m2jJ%gIJ;Tv0iLB>Xy2BDi>(OXCTa}1)IgdFn=vzJlmRAMUmySDm^_oc(ZEJ>i
zN=2D*Q%~=4*aEo|!dHhOP`|FbIkRBQtgf<fjLk-|Z;Biyfw3w|e@ZHBK*;PCXgQS4
zoNSF}JHsk&GrZ|e+O}or#aZ2QIS6(8f+eTKbF=AA8>@1N3~MKAd)bm@amJ5GeNnCF
z=-Y-PeV9E}z+N_8Q^KjjWXdjj#(mEpC9y3qP=#$J91ETI?pJ49i7TLTbgr94l5CJu
zaaICnNj_=Cw$zT~t$>-aoLzGA#w;n%PR+YVDAX_S5)H4TgRMBYS0)@s-;tM#h8Dc0
zp&jQ0+Wq&IUR+C0RIY;=$FUufNW*8i!;WjXi<E}X@rA&(v*JGW;?a;qO2wBNzQWfU
zzCo7;9V;sG8VX=4SI_SLNXjZ!HLM{eaQW;Wf*XeeeNZG>A9DFXP#Jxe-@l+ZcD##@
z(7K|+7O7-rmSaXT7X3#{Mbj^F88h{&Kp6}lzZKhZ>ILj-m~x~_FU1#LEUkJzZ)|zD
zO>cd!D8CuEj7@u+?W*OM#>e-+qvBP3>8zcuP>5f)#mV`ZsU?B;Uxt5)1FlS2{CKi3
z1;aHRqp(jMeu})3i_82sXy%VY2u+e}pr(InYiO6W<33Iq3Ci_6Pm>692Q(y~LL{Ff
zbmu9;KSTM!w|awXJvBhD3Oy$1`%Rv-vJKusCr{E}7b8l4-|-pZ^St!;1d#_wr2ats
zIcn%w{Vkaad@GQ?o9GopsSsr=+K8&%_upFf5%{OKAeRf&F2|OVHb#D%k_5yHnuk<$
zt9XZka>^I^`d#z{z|uU)L?g+cpgiU#<Rhr@g&l{oiUd*1PI~#CHwRal-S>RTYNVu-
zXQ&m(q@E!vu#0ot!~}jve4%d-+Abo>qlYj43O}NH*bmi;2=|@bccB{>aFJ^-@yddB
z`Z`hc;XMM25kfyCVulLf$V4@S|3OT}rH;R;MK13H>*Gmkhx~YlQ%fF7Efo0T6rQwH
zB+|o{=~FES&R{uss^#EG%M)maPPM#(515^7z&+MUHlRI~WR>f75%*iMhk9R-kYih}
zc6qc$5ycpXcY?z*>HC(IrhQNexx0!F{o1u-2p_QmveG0)BZb2l2?F=?DGRJTLBsLs
znLPwr2^`nr+CImw_?DdZW;E`h=>b&bA(Zfsh#au2Jco6D@CZV6<1*YR1BNj6A6-Q7
AoB#j-

delta 976
zcmZuvO-~b16g~6RX{Q5)emPJ}L2IQgwrUZ9q9A^vEq;KwG^6RFLW05S!o<|QZpf_q
z3v|Ik#E{^^u=aPjcIm<x@w{nMYUt+P_ujqdopaB7@2!vF^7p@AzX2%Vk%0ilbzCqY
zW88;cO!#pTlYUHLT7;sG83SHiGH@BQBFu?!#fN!Z)p1S7_07j`Hh;Z!g7QH~LeEmo
ze!5z=pD)`_)+#z~?1YuqlG9L=N*EDmU$v}0^y|23;uaQIH*p&Y6L(N@`n37@5E44d
zCKhqm#68?M@c>IYmQ6gwinFdwJKNesGWg7XW#?bks%!a$T4lqot#3%^Jv=N`U(|N|
zo`@6<jh6mDE~ZzUA^m3x=QwPDCP)Z^lH3fs5Q2|uie-#C74Jy?7`u9*F!n<wCP0M6
zoyiUmJAgrE2{9ZeKI$y`qIH4sxb;X!uh!}fvMM9aI_G7Ka{rE5aAY%IpzcAFP|EJX
zBcXu-E_4a|@RrAR;cGxsw>}*FP`22vKu|@YF%I&|7?PAxPx0n7?-n|T*%aqg!x$l}
z!P65sNj7q|^dz}9q5OfN<5cW7yCkIA%Eq`8-Lgw4yM)czk{z?jZ68h}Q71qQ)rP7<
zYbP|_6*_v9^awK76)A>2<g9nsTj&bS(1#{;l}?E_u(BB%Z8YF_Ut?Ef9+=y#H4P8)
zCjgUlb&9{DNKa<myM@=pS6gOqNe|Ar_F2dwPY;CI3MBF4&hi&FnRCoSv-%l5pO`zX
Pn(I)lwp~8&b`|~s3ASfB

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/AbstractTranslator.class b/out/production/k2js/org/jetbrains/k2js/translate/AbstractTranslator.class
index 33084bf5ad41c36b16543f8948ac10a044b9615d..3f86cfd3798983ca3f1575b96937a8fccc93b8b6 100644
GIT binary patch
delta 806
zcma))TQ6f#6vzMjoPD}aZ!@&0OJ$IeN{dF^=}<FnV_fQTN=b-_M_zn@zIpUuCmwtO
zuNqPb2~RSKZ{W=*Vb(r+lp2Yglf8G=<^Nl2?R`|eAM)QlUS0#}#2Q0f?&|Se;*NWK
z=t8##HRzGdwZ;16wyTk~%ajrI&Tj5(3nUnfJvnY9yh9jPfk}o{xvnSWy(`RrDy@_e
z*9AspOeDSIm{38JPEcNi`P6ez^w1P+TAJoJHYZ!mMspqu9;C1+=gk9V$p^EIrR5iQ
zUC%Pr833oXoYnxU5JVj+utJuvU{7Swg!*g9z)?$14VK(+M`CHR_`qnbqAx_d5_8#>
zYFmKLmOum<nR5pTd+Yu_T+9l-%c^&>78Ea2Pz%$}(TX;k+~SF3iyH6AO^ybUJ4-ZZ
z{z}8Hl+y_aMbA+g%cD2*7yc_WWCHycXudfmmkx!Y_ElJ+RCO9ac9423_8M`BX@MUl
zM7qcVahiItXQhaFjJyDUy#;<W(N>3Ii7duSF!U7ukNN$A`SUqUM-hXWHxv`I_H|nr
o0lj3^3q6{EmdDaD1U~`S&rp^lqxNbzep}Cg=1VflS+(89Kkjy4-v9sr

delta 919
zcma)4O-~b16g{t<H*Y$b##&S`mRO9YrL~TcA}STIC@NMF%GaP+YC{^4P@|38#*Iri
zFLB|Hm0KH4No=C-OzOg|3xA7v-#{tFkFa_7=6;-W?|JuS=j$$i<JZSe0Q#`RV9QP2
zuBIBAm*I?@5Hb0M>;Cg5Jm_XHip%A!{Kiw(MO-ow!63s*R95x4+~j&Xvyy+Fw^#FP
zMLS!5`e>~<xSvSxtOXO7O$=a226%yu$TIH<@Mne6lVuB671L2%lLz!1yDm$5(sz@A
zKU^&p9?S3ito*4P#w}!2(QPUkm9_}62`Wq&X;maJDPM@=Y+A019%B}BCT1`%8{!pP
zkdBe)zemd-p#^~u*-o;`(;>icpZp*+dJobYq<jaC;Sd&O-3U?t4<j<H`YozeC|mui
zOLrq(Slsew1j+SaJ02pdA&OpNU64b*le;iF{=n#NVoV9zu^r<y5-!HNFH-s694DF>
zG)Lbaj3oLM2F<iYQ!5?9bqqMM8ZOk3ipS#{7<RtGUq{#pUfIB@&+n+li<WL-HFJf6
z)QU7lY4w%_(I$0H&=<FlPoKL@ogqP731c5{xQ4ME!W->`{}MWZN=xbSJv4M4f2X;#
zLvwe3H0PSjkd9MrEXFvp?inZ{lkP5bG(k@d&Kn5rEi~_Y1gezu>=MWC;&FJa5k@^Z
HH_d+o*tUch

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$FunctionVariableDeclaration.class b/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$FunctionVariableDeclaration.class
index e3be5d547b23eceeb9b87c62e05e190a06ec7d4c..149152d0eea38b01458bc73f7f570cb9c3a8bf57 100644
GIT binary patch
delta 31
mcmeAb>J{3c!olb~S(T%Q*NuUd!JUDR!Gl49!E^FH4u1e}od&4@

delta 31
mcmeAb>J{3c!olb?S(T%Q*Oh^l!Ht2B!JR>Z!DI414u1e}S_Y&5

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$NamespacePropertyDeclaration.class b/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$NamespacePropertyDeclaration.class
index af07015463aa09fe079a4c8622962e4eab691bf5..3f5f71dea97b8507c1e55459d5f32a2d25d62ab3 100644
GIT binary patch
delta 43
zcmbO!HdAcFcTPsX$v-&vNCq;nG6XS5Fa$FwF@!RxGlVf1F+?($GDJ^4%jE+A3UUgc

delta 43
zcmbO!HdAcFcTPs%$v-&vNCq&lG6XV6Fa$9uF@!LvGlVi2F+?z!GDJ;2%jE+A3D^pk

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$State.class b/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator$State.class
index cb07e026820c7326cfb47925893d06cf53d8add7..3bd12cb1a9897ed1089d804166982069bf65e49e 100644
GIT binary patch
delta 13
Ucmcb@dWChvd?rTw$qSfF03|jAtpET3

delta 13
Ucmcb@dWChvd?rS_$qSfF03|U5tN;K2

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator.class b/out/production/k2js/org/jetbrains/k2js/translate/DeclarationTranslator.class
index 8c220809ec2eb15d75dff7ab82ae5fa88a2a55a2..6898b26059aea4d95d909249de3ec6014f15b6ed 100644
GIT binary patch
delta 990
zcmZ9L%TE(g7{$+ROQ)Totw7R7gwpVomWLo<6r&4+iH}wVEL2e(u^<R7(1NI7Rq6wu
zz(tKKV@zB_B(1Sga3Ln{Tp1JnH%wfhez$FEa54AXIrH87{qC8WrQ(mJrq93Mz6Y=!
zPZ{cYj$FUA_p8K8c%9C!>>E@=AqfW=s`#A7?i9D}qiP^DsD^{15)R97BaguxPMiMZ
z3WhFTt8-)}Z@5FMo;PGGM{rbBA7iKxd)Io@A%AFC?eR-!W5^#+$JN?FHPBbvIu;1`
z5BXardi=xT{$N1DaRwV-H`wwdbTDYQR(i9M1D}jeoZu^l0@lU98=4KL(JibqyvSI?
z&T@~jwBj86GJ4P}d>XuHWU%yXJO)DzpVbsuHoDC`Y7Dag|78rZk=H}AnJE`BA;X1B
z40V)7A%Ce@bys9e@^?y5xrzu)agCvY|BxHB5^nH7_A<M}OH8i}VT{Sp;6DFidd_C~
zh`FS2jzYJR2jrpzrKDn3hH@~>^Cj~Z(=0hZp@Wt*%D<UgA_WP!ea;y6#NlyQxmIx~
zhF0I&pErxH4`_b|Z313j0-e4%PUfD9L3PE@M-s#NIQmy;A1y>*2Wcxz7{G-jK{P`U
z#UO?R0aca5NMivc6vB=ol<_HxRJNa3TZyw973ifnIMtY;Z<7!_Ko=ZEdMxl4mb{4I
z?;w70Mw@dP#Y8jg`vg-0b-vuuIGR=#=}`(P6@@JWVk3}H8bnVDY)iJHxmUDVAV>I>
zq#97ZG>V2Zw4aXD!6I(zciB_D25SP7>DZ>KW4OMGX?NAX*3Q&|OlwEFwT4a|#ZB5+
z!e-pUZQ5GoVnr5>jpR4clO0g7lPY&7@f5Ii*d<I$h|FXl$AL`-+{HZt7LdDWtw=@h
ybj9&NkZ6+cB^81m57Xa+9*_PDA%`j-C+oBDgfyR+B=QXOLx?X-AvKYjb?h%_-NF0-

delta 775
zcmZ8eOHUJF6g?j;Go9&+cF{&#+X~gtmj;wZZ6XWf0%IwN76(NIL=ll9tuK7kDhTzp
zxhodNoyMIcq)luDU7(2zxBdX*)~zdzcS=(m7jwTm-*@gg=ia*!Txqp_`SWfKz#cpo
z=%nqo&Xw+OvWQTJ(bsZlY9yOY&89{t$H#Iqj?hn2R2(Ib;upP?P`r*l0YiHzZGi*F
zRP<wjCKRtYK?_R4JcyI}l_n5kvXDW>Df*=Zox?bz;xx|cj~r6yq8T+O#_5NeHBJb$
zQ$h99npvTF^LNuUGAbgNp^PPNoK=yfH<pa)8m@DS8x*ka7q@80x+?Nyx4kl5#*~UC
zJf!!wmtv8I?QLR-3U-eu(hIxCy2zb=g^>}!G;P=q=cU(BBOj4mhM|I#Rzbg3#&Ku5
zgrP_Y=lCdLq>RyZt}tMUqieGoZ3yxo^I#0;AyDMp2brUn<2KIy*nt4L8QFuK=tCHf
z`PBw#K*oh0{t(D35}xp-!~`Ke1)_+tfNpfKX4D;CMJt=RsC|aDf)34jsf_sgTZS|`
za@QTX+0kUpkxmTkt}1h$)>Rt>^Q^@)t0@+l(8%zBNV4A5-q<I&D#&W#5)PJ;i<NNm
z1Ll&^f70Pid|f(FlWyYnZ{rU0%GiRtxW~-;fLv(ixR>v{_$7|K8T%NTsQNQQ{Dx1)
zoQ(T*lUINi6AF01jp$Q3z_t4Nq;RB+dEH4<!&)RP)Yc;5(SJj5F!E^?-;8H`Ze>rj
H%jy0L<4T4w

diff --git a/out/production/k2js/org/jetbrains/k2js/translate/TranslationContext.class b/out/production/k2js/org/jetbrains/k2js/translate/TranslationContext.class
index 00e82e41d54ffe18ac9cd2f2526af6932d0c4069..4d58e36836ad3451d1a66a4f91f77bbd9be5dc6b 100644
GIT binary patch
literal 7385
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
E55E~fZ~y=R

literal 6632
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
VVT*g)wWB3|iJ$fHC-1-8{|AX~Uz-2`

diff --git a/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java b/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
index beb10a1eeed..6704234df29 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
@@ -12,51 +12,51 @@ import java.util.List;
  */
 public final class JsInvocation extends JsExpression implements HasArguments {
 
-  private final List<JsExpression> args = new ArrayList<JsExpression>();
-  private JsExpression qualifier;
+    private final List<JsExpression> args = new ArrayList<JsExpression>();
+    private JsExpression qualifier;
 
-  public JsInvocation() {
-  }
-
-  @Override
-  public List<JsExpression> getArguments() {
-    return args;
-  }
-
-  public JsExpression getQualifier() {
-    return qualifier;
-  }
-
-  @Override
-  public boolean hasSideEffects() {
-    return true;
-  }
-
-  @Override
-  public boolean isDefinitelyNotNull() {
-    return false;
-  }
-
-  @Override
-  public boolean isDefinitelyNull() {
-    return false;
-  }
-
-  public void setQualifier(JsExpression qualifier) {
-    this.qualifier = qualifier;
-  }
-
-  @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
-      qualifier = v.accept(qualifier);
-      v.acceptList(args);
+    public JsInvocation() {
     }
-    v.endVisit(this, ctx);
-  }
 
-  @Override
-  public NodeKind getKind() {
-    return NodeKind.INVOKE;
-  }
+    @Override
+    public List<JsExpression> getArguments() {
+        return args;
+    }
+
+    public JsExpression getQualifier() {
+        return qualifier;
+    }
+
+    @Override
+    public boolean hasSideEffects() {
+        return true;
+    }
+
+    @Override
+    public boolean isDefinitelyNotNull() {
+        return false;
+    }
+
+    @Override
+    public boolean isDefinitelyNull() {
+        return false;
+    }
+
+    public void setQualifier(JsExpression qualifier) {
+        this.qualifier = qualifier;
+    }
+
+    @Override
+    public void traverse(JsVisitor v, JsContext ctx) {
+        if (v.visit(this, ctx)) {
+            qualifier = v.accept(qualifier);
+            v.acceptList(args);
+        }
+        v.endVisit(this, ctx);
+    }
+
+    @Override
+    public NodeKind getKind() {
+        return NodeKind.INVOKE;
+    }
 }
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
index 4f70265624b..749ed473c21 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
@@ -12,55 +12,61 @@ import java.util.List;
  */
 public final class JsObjectLiteral extends JsLiteral {
 
-  private final List<JsPropertyInitializer> props = new ArrayList<JsPropertyInitializer>();
+    private final List<JsPropertyInitializer> props;
 
-  public JsObjectLiteral() {
-  }
+    public JsObjectLiteral() {
+        props = new ArrayList<JsPropertyInitializer>();
+    }
 
-  public List<JsPropertyInitializer> getPropertyInitializers() {
-    return props;
-  }
+    public JsObjectLiteral(List<JsPropertyInitializer> props) {
+        assert props != null;
+        this.props = props;
+    }
 
-  @Override
-  public boolean hasSideEffects() {
-    for (JsPropertyInitializer prop : props) {
-      if (prop.hasSideEffects()) {
+    public List<JsPropertyInitializer> getPropertyInitializers() {
+        return props;
+    }
+
+    @Override
+    public boolean hasSideEffects() {
+        for (JsPropertyInitializer prop : props) {
+            if (prop.hasSideEffects()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isBooleanFalse() {
+        return false;
+    }
+
+    @Override
+    public boolean isBooleanTrue() {
         return true;
-      }
     }
-    return false;
-  }
 
-  @Override
-  public boolean isBooleanFalse() {
-    return false;
-  }
-
-  @Override
-  public boolean isBooleanTrue() {
-    return true;
-  }
-
-  @Override
-  public boolean isDefinitelyNotNull() {
-    return true;
-  }
-
-  @Override
-  public boolean isDefinitelyNull() {
-    return false;
-  }
-
-  @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
-      v.acceptWithInsertRemove(props);
+    @Override
+    public boolean isDefinitelyNotNull() {
+        return true;
     }
-    v.endVisit(this, ctx);
-  }
 
-  @Override
-  public NodeKind getKind() {
-    return NodeKind.OBJECT;
-  }
+    @Override
+    public boolean isDefinitelyNull() {
+        return false;
+    }
+
+    @Override
+    public void traverse(JsVisitor v, JsContext ctx) {
+        if (v.visit(this, ctx)) {
+            v.acceptWithInsertRemove(props);
+        }
+        v.endVisit(this, ctx);
+    }
+
+    @Override
+    public NodeKind getKind() {
+        return NodeKind.OBJECT;
+    }
 }
diff --git a/src/org/jetbrains/k2js/K2JSTranslator.java b/src/org/jetbrains/k2js/K2JSTranslator.java
index 16d79c01347..ba42ccc61cc 100644
--- a/src/org/jetbrains/k2js/K2JSTranslator.java
+++ b/src/org/jetbrains/k2js/K2JSTranslator.java
@@ -45,7 +45,7 @@ public class K2JSTranslator {
     public static void main(String[] args) {
         System.setProperty("java.awt.headless", "true");
         Arguments arguments = new Arguments();
-        arguments.src = "C:\\Dev\\Projects\\k2js\\test_files\\test.kt";
+        arguments.src = "C:\\Dev\\Projects\\jet-contrib\\k2js\\test_files\\test.kt";
 
         Disposable root = new Disposable() {
             @Override
diff --git a/src/org/jetbrains/k2js/translate/AbstractTranslator.java b/src/org/jetbrains/k2js/translate/AbstractTranslator.java
index 366fa993276..602fbd5bbc5 100644
--- a/src/org/jetbrains/k2js/translate/AbstractTranslator.java
+++ b/src/org/jetbrains/k2js/translate/AbstractTranslator.java
@@ -36,8 +36,7 @@ public abstract class AbstractTranslator {
 
     @NotNull
     protected JsName getJSName(String jetName) {
-        //TODO dummy implemetation
-        return new JsName(program().getScope(), jetName, jetName, jetName);
+        return context.getJSName(jetName);
     }
 
     @NotNull
diff --git a/src/org/jetbrains/k2js/translate/DeclarationTranslator.java b/src/org/jetbrains/k2js/translate/DeclarationTranslator.java
index 18d87820c5b..32cfb417e87 100644
--- a/src/org/jetbrains/k2js/translate/DeclarationTranslator.java
+++ b/src/org/jetbrains/k2js/translate/DeclarationTranslator.java
@@ -32,8 +32,9 @@ public class DeclarationTranslator extends AbstractTranslator {
             return AstUtil.convertToStatement((new FunctionTranslator(translationContext()))
                     .translateFunction((JetNamedFunction) declaration));
         }
-        else if (declaration instanceof JetClassOrObject) {
-            //classCodegen.translate(context, (JetClassOrObject) declaration);
+        else if (declaration instanceof JetClass) {
+            ClassTranslator classTranslator = new ClassTranslator(translationContext());
+            return classTranslator.translateClass((JetClass)declaration);
         }
         else if (declaration instanceof JetNamespace) {
            // JetNamespace childNamespace = (JetNamespace) declaration;
diff --git a/src/org/jetbrains/k2js/translate/ExpressionTranslator.java b/src/org/jetbrains/k2js/translate/ExpressionTranslator.java
index 36f3b93d324..5e25f40885c 100644
--- a/src/org/jetbrains/k2js/translate/ExpressionTranslator.java
+++ b/src/org/jetbrains/k2js/translate/ExpressionTranslator.java
@@ -12,7 +12,7 @@ import org.jetbrains.jet.lexer.JetToken;
 import java.util.List;
 
 /**
- * Talanov Pavel
+ * @author Talanov Pavel
  */
 class ExpressionTranslator extends AbstractTranslator {
 
diff --git a/src/org/jetbrains/k2js/translate/TranslationContext.java b/src/org/jetbrains/k2js/translate/TranslationContext.java
index 1fbedc7be75..772c83b64d5 100644
--- a/src/org/jetbrains/k2js/translate/TranslationContext.java
+++ b/src/org/jetbrains/k2js/translate/TranslationContext.java
@@ -17,6 +17,8 @@ public class TranslationContext {
     private final BindingContext context;
     private final JsScope enclosingScope;
     private final ContextType type;
+    private final JsNameRef classObjectReference;
+    private final JsNameRef classCreationMethodReference;
 
 
     private TranslationContext(JsNameRef namespace, JsBlock block, JsProgram program,
@@ -32,6 +34,8 @@ public class TranslationContext {
         this.context = bindingContext;
         this.enclosingScope = enclosingScope;
         this.type = type;
+        this.classObjectReference = new JsNameRef(getJSName("Class"));
+        this.classCreationMethodReference = AstUtil.newQualifiedNameRef("Class.create");
     }
 
     @NotNull
@@ -84,6 +88,11 @@ public class TranslationContext {
         return context;
     }
 
+    @NotNull
+    public JsNameRef classObjectReference() {
+        return classObjectReference;
+    }
+
     @NotNull
     public JsProgram program() {
         return program;
@@ -104,5 +113,10 @@ public class TranslationContext {
         return type;
     }
 
+    @NotNull
+    JsNameRef classCreationMethodReference() {
+        return classCreationMethodReference;
+    }
+
 
 }
diff --git a/test_files/test.kt b/test_files/test.kt
index 94629a58670..c569674a36c 100644
--- a/test_files/test.kt
+++ b/test_files/test.kt
@@ -5,15 +5,18 @@ val b : Int = 235456
 var c : Int = 1324
 var myFavouriteName : Int = 1245
 
-fun main() : Int {
-    return 5
+
+open class B() {
+
 }
 
-fun eval(x : Int, y : String) : Int {
-    return (1456 - 34) * 5
-}
+class A() : B() {
+   var a : Int
+    get() : Int {
+        return 4
+    }
 
-fun olol(abab : Int) : Int {
-    var a : Int = 5
-    return a
+    set() {
+
+    }
 }