From 3455f6adcd6a20776afacd3a0bf470ec430dfdd5 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Fri, 7 Mar 2014 15:21:43 +0400
Subject: [PATCH] JS backend: minor -- dropped some no longer necessary code.

---
 .../k2js/translate/callTranslator/CallTranslator.kt  |  4 ----
 .../org/jetbrains/k2js/translate/context/Namer.java  | 12 ++++++++----
 js/js.translator/testData/kotlin_lib.js              |  5 -----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallTranslator.kt
index f1289074e03..d9e06099de4 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallTranslator.kt
@@ -124,10 +124,6 @@ trait CallCase<I : CallInfo> {
                 callInfo.receiverArgument()
         } else {
             if (callInfo.receiverObject == null) {
-                // TODO remake UsageTracker and drop this hack
-                // this call need for usage tracker -- without it, capture this not worked
-                val alias = callInfo.context.getAliasForDescriptor(callInfo.callableDescriptor)
-                assert(alias == null, "Failed hack for usageTracker")
                 callInfo.thisObject()
             } else
                 callInfo.bothReceivers()
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
index 211dacac432..eef688f3fa4 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
@@ -34,29 +34,32 @@ public final class Namer {
     public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
 
     public static final String CALLEE_NAME = "$fun";
-    public static final String OUTER_CLASS_NAME = "$outer";
 
     private static final String CALL_FUNCTION = "call";
     private static final String APPLY_FUNCTION = "apply";
+
     private static final String CLASS_OBJECT_NAME = "createClass";
     private static final String TRAIT_OBJECT_NAME = "createTrait";
     private static final String OBJECT_OBJECT_NAME = "createObject";
     private static final String ENUM_ENTRIES_NAME = "createEnumEntries";
+
     private static final String SETTER_PREFIX = "set_";
     private static final String GETTER_PREFIX = "get_";
     private static final String BACKING_FIELD_PREFIX = "$";
+    private static final String DELEGATE_POSTFIX = "$delegate";
+
     private static final String SUPER_METHOD_NAME = "baseInitializer";
+
     private static final String ROOT_PACKAGE = "_";
+
     private static final String RECEIVER_PARAMETER_NAME = "$receiver";
+
     private static final String THROW_NPE_FUN_NAME = "throwNPE";
     private static final String CLASS_OBJECT_GETTER = "object";
     private static final String CLASS_OBJECT_INITIALIZER = "object_initializer$";
     private static final String PROTOTYPE_NAME = "prototype";
     public static final String CAPTURED_VAR_FIELD = "v";
 
-
-    private static final String DELEGATE_POSTFIX = "$delegate";
-
     @NotNull
     public static String getReceiverParameterName() {
         return RECEIVER_PARAMETER_NAME;
@@ -140,6 +143,7 @@ public final class Namer {
     public static JsNameRef getFunctionCallRef(@NotNull JsExpression functionExpression) {
         return new JsNameRef(CALL_FUNCTION, functionExpression);
     }
+
     @NotNull
     public static JsNameRef getFunctionApplyRef(@NotNull JsExpression functionExpression) {
         return new JsNameRef(APPLY_FUNCTION, functionExpression);
diff --git a/js/js.translator/testData/kotlin_lib.js b/js/js.translator/testData/kotlin_lib.js
index 5c26e732d91..b36ac397c5b 100644
--- a/js/js.translator/testData/kotlin_lib.js
+++ b/js/js.translator/testData/kotlin_lib.js
@@ -622,8 +622,3 @@ String.prototype.contains = function (s) {
         return obj1;
     };
 })();
-
-Kotlin.assignOwner = function (f, o) {
-    f.o = o;
-    return f;
-};