From 6edcd6e9a1ceb0d3d725af1631dd2b743692143e Mon Sep 17 00:00:00 2001
From: Pavel Talanov <Pavel.Talanov@jetbrains.com>
Date: Wed, 30 Nov 2011 18:29:08 +0400
Subject: [PATCH] Array test passes.

---
 .../k2js/declarations/DeclarationVisitor.java   | 17 +++++++++--------
 .../k2js/declarations/Declarations.java         | 10 ++++++----
 .../intrinsic/IntrinsicDeclarationVisitor.java  |  4 +++-
 .../jetbrains/k2js/intrinsic/Intrinsics.java    |  2 +-
 .../k2js/translate/general/Translation.java     |  4 +++-
 .../operation/BinaryOperationTranslator.java    |  1 +
 .../reference/ReferenceTranslator.java          |  1 +
 .../jetbrains/k2js/translate/utils/Namer.java   |  5 +++++
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java b/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
index 9735837ce7b..140defe6d3b 100644
--- a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
+++ b/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
@@ -19,14 +19,6 @@ public final class DeclarationVisitor extends DeclarationDescriptorVisitor<Void,
         this.declarations = declarations;
     }
 
-    @Override
-    public Void visitClassDescriptor(@NotNull ClassDescriptor descriptor, @NotNull DeclarationContext context) {
-        DeclarationContext classContext = declareClass(descriptor, context);
-        declareClassConstructor(descriptor, context);
-        declareClassMembers(descriptor, classContext);
-        return null;
-    }
-
     @NotNull
     private DeclarationContext declareClass(@NotNull ClassDescriptor descriptor,
                                             @NotNull DeclarationContext context) {
@@ -57,6 +49,15 @@ public final class DeclarationVisitor extends DeclarationDescriptorVisitor<Void,
         return declareName(descriptor, context, descriptor.getName());
     }
 
+
+    @Override
+    public Void visitClassDescriptor(@NotNull ClassDescriptor descriptor, @NotNull DeclarationContext context) {
+        DeclarationContext classContext = declareClass(descriptor, context);
+        declareClassConstructor(descriptor, context);
+        declareClassMembers(descriptor, classContext);
+        return null;
+    }
+
     private void declareClassMembers(@NotNull ClassDescriptor descriptor, @NotNull DeclarationContext context) {
         for (DeclarationDescriptor memberDescriptor :
                 descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
diff --git a/translator/src/org/jetbrains/k2js/declarations/Declarations.java b/translator/src/org/jetbrains/k2js/declarations/Declarations.java
index e688362c7ba..9ec819b75b5 100644
--- a/translator/src/org/jetbrains/k2js/declarations/Declarations.java
+++ b/translator/src/org/jetbrains/k2js/declarations/Declarations.java
@@ -39,11 +39,13 @@ public final class Declarations {
     }
 
     //TODO: provide a mechanism to do intrinsics
-    public void extractStandardLibrary(@NotNull JetStandardLibrary standardLibrary) {
+    public void extractStandardLibrary(@NotNull JetStandardLibrary standardLibrary,
+                                       @NotNull JsNameRef standardLibraryObjectName) {
         DeclarationVisitor visitor = new DeclarationVisitor(this);
         for (DeclarationDescriptor descriptor :
                 standardLibrary.getLibraryScope().getAllDescriptors()) {
-            descriptor.accept(visitor, DeclarationContext.rootContext(rootScope, null));
+            descriptor.accept(visitor, DeclarationContext.rootContext(rootScope,
+                    standardLibraryObjectName));
         }
     }
 
@@ -66,12 +68,12 @@ public final class Declarations {
     }
 
     public boolean hasQualifier(@NotNull DeclarationDescriptor descriptor) {
-        return (descriptorToQualifierMap.get(descriptor) != null);
+        return (descriptorToQualifierMap.get(descriptor.getOriginal()) != null);
     }
 
     @NotNull
     public JsNameRef getQualifier(@NotNull DeclarationDescriptor descriptor) {
-        JsNameRef qualifier = descriptorToQualifierMap.get(descriptor);
+        JsNameRef qualifier = descriptorToQualifierMap.get(descriptor.getOriginal());
         assert qualifier != null : "Cannot be null. Use hasQualifier to check.";
         return qualifier;
     }
diff --git a/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java b/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java
index c0a20fd12fa..a28d7df2148 100644
--- a/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java
+++ b/translator/src/org/jetbrains/k2js/intrinsic/IntrinsicDeclarationVisitor.java
@@ -30,7 +30,9 @@ public final class IntrinsicDeclarationVisitor extends DeclarationDescriptorVisi
 
     @Override
     public Void visitFunctionDescriptor(@NotNull FunctionDescriptor descriptor, @Nullable Void nothing) {
-        intrinsics.declareIntrinsic(descriptor);
+        if (!intrinsics.isIntrinsic(descriptor)) {
+            intrinsics.declareIntrinsic(descriptor);
+        }
         return null;
     }
 }
diff --git a/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java b/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java
index ca89b74c42d..5a33ac776a6 100644
--- a/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java
+++ b/translator/src/org/jetbrains/k2js/intrinsic/Intrinsics.java
@@ -73,7 +73,7 @@ public final class Intrinsics {
 
     public boolean isIntrinsic(@NotNull DeclarationDescriptor descriptor) {
         if (descriptor instanceof FunctionDescriptor) {
-            FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
+            FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor.getOriginal();
             return descriptorToIntrinsicMap.containsKey(functionDescriptor);
         }
         return false;
diff --git a/translator/src/org/jetbrains/k2js/translate/general/Translation.java b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
index cbd681a2ef9..87845208460 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/Translation.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
@@ -86,10 +86,12 @@ public final class Translation {
 
     public static JsProgram generateAst(@NotNull BindingContext bindingContext,
                                         @NotNull JetNamespace namespace, @NotNull Project project) {
+        //TODO: move some of the code somewhere
         JetStandardLibrary standardLibrary = JetStandardLibrary.getJetStandardLibrary(project);
         NamespaceDescriptor descriptor = BindingUtils.getNamespaceDescriptor(bindingContext, namespace);
         StaticContext staticContext = StaticContext.generateStaticContext(standardLibrary, bindingContext);
-        staticContext.getDeclarations().extractStandardLibrary(standardLibrary);
+        staticContext.getDeclarations().
+                extractStandardLibrary(standardLibrary, staticContext.getNamer().kotlinObject());
         staticContext.getDeclarations().extractDeclarations(descriptor);
         JsBlock block = staticContext.getProgram().getFragmentBlock(0);
         TranslationContext context = TranslationContext.rootContext(staticContext);
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
index d1ca016c8e9..ce5d47b9208 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java
@@ -104,6 +104,7 @@ public final class BinaryOperationTranslator extends OperationTranslator {
         }
     }
 
+    //TODO: refactor
     @NotNull
     private JsExpression asBinaryOperation() {
         if (isPropertyOnTheLeft && OperatorTable.isAssignment(getOperationToken())) {
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
index 007be8dbf50..9e0ecc8ca21 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
@@ -36,6 +36,7 @@ public class ReferenceTranslator extends AbstractTranslator {
     }
 
     @NotNull
+    //TODO: make this process simpler and clearer
     public JsExpression translateSimpleName() {
         tryResolveAsPropertyAccess();
         tryResolveAsThisQualifiedExpression();
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/Namer.java b/translator/src/org/jetbrains/k2js/translate/utils/Namer.java
index da8a6eeebef..c542172c4fc 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/Namer.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/Namer.java
@@ -120,6 +120,11 @@ public final class Namer {
         return reference;
     }
 
+    @NotNull
+    public JsNameRef kotlinObject() {
+        return kotlinName.makeRef();
+    }
+
     @NotNull
     public JsName declareStandardClass(@NotNull String name) {
         return kotlinScope.declareName(name);