JS backend: Migrate type of alias from JsName to JsExpression

js/js.translator/src/org/jetbrains/k2js/translate/context/AliasingContext.java

@@ -17,7 +17,6 @@
 package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsName;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,7 +34,7 @@ public class AliasingContext {
         }
 
         @Override
-        public JsName getAliasForExpression(@NotNull JetExpression element) {
+        public JsExpression getAliasForExpression(@NotNull JetExpression element) {
             return null;
         }
 
@@ -53,7 +52,7 @@ public class AliasingContext {
     private Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors;
 
     @Nullable
-    private final Map<JetExpression, JsName> aliasesForExpressions;
+    private final Map<JetExpression, JsExpression> aliasesForExpressions;
 
     @Nullable
     private final AliasingContext parent;
@@ -65,7 +64,7 @@ public class AliasingContext {
     private AliasingContext(
             @Nullable AliasingContext parent,
             @Nullable Map<DeclarationDescriptor, JsExpression> aliasesForDescriptors,
-            @Nullable Map<JetExpression, JsName> aliasesForExpressions
+            @Nullable Map<JetExpression, JsExpression> aliasesForExpressions
     ) {
         this.parent = parent;
         this.aliasesForDescriptors = aliasesForDescriptors;
@@ -92,7 +91,7 @@ public class AliasingContext {
     }
 
     @NotNull
-    public AliasingContext withExpressionsAliased(@NotNull Map<JetExpression, JsName> aliasesForExpressions) {
+    public AliasingContext withExpressionsAliased(@NotNull Map<JetExpression, JsExpression> aliasesForExpressions) {
         return new AliasingContext(this, null, aliasesForExpressions);
     }
 
@@ -115,8 +114,8 @@ public class AliasingContext {
     }
 
     @Nullable
-    public JsName getAliasForExpression(@NotNull JetExpression element) {
-        JsName alias = aliasesForExpressions == null ? null : aliasesForExpressions.get(element);
+    public JsExpression getAliasForExpression(@NotNull JetExpression element) {
+        JsExpression alias = aliasesForExpressions == null ? null : aliasesForExpressions.get(element);
         return alias != null || parent == null ? alias : parent.getAliasForExpression(element);
     }
 

js/js.translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java

@@ -134,7 +134,7 @@ public class TranslationContext {
     }
 
     @NotNull
-    public TranslationContext innerContextWithAliasesForExpressions(@NotNull Map<JetExpression, JsName> aliases) {
+    public TranslationContext innerContextWithAliasesForExpressions(@NotNull Map<JetExpression, JsExpression> aliases) {
         return new TranslationContext(this, aliasingContext.withExpressionsAliased(aliases));
     }
 

js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java

@@ -76,9 +76,9 @@ public final class Translation {
 
     @NotNull
     public static JsNode translateExpression(@NotNull JetExpression expression, @NotNull TranslationContext context) {
-        JsName aliasForExpression = context.aliasingContext().getAliasForExpression(expression);
+        JsExpression aliasForExpression = context.aliasingContext().getAliasForExpression(expression);
         if (aliasForExpression != null) {
-            return aliasForExpression.makeRef();
+            return aliasForExpression;
         }
         DangerousData data = collect(expression, context);
         if (data.shouldBeTranslated()) {

js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousTranslator.java

@@ -17,7 +17,6 @@
 package org.jetbrains.k2js.translate.utils.dangerous;
 
 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.JsNode;
 import com.google.dart.compiler.backend.js.ast.JsVars;
 import gnu.trove.THashMap;
@@ -48,21 +47,21 @@ public final class DangerousTranslator extends AbstractTranslator {
 
     @NotNull
     private JsNode translate() {
-        Map<JetExpression, JsName> aliasesForExpressions =
+        Map<JetExpression, JsExpression> aliasesForExpressions =
             translateAllExpressionsAndCreateAliasesForThem(data.getNodesToBeGeneratedBefore());
         TranslationContext contextWithAliases = context().innerContextWithAliasesForExpressions(aliasesForExpressions);
         return Translation.doTranslateExpression(data.getRootNode(), contextWithAliases);
     }
 
     @NotNull
-    private Map<JetExpression, JsName> translateAllExpressionsAndCreateAliasesForThem(@NotNull List<JetExpression> expressions) {
-        Map<JetExpression, JsName> aliasesForExpressions = new THashMap<JetExpression, JsName>(expressions.size());
+    private Map<JetExpression, JsExpression> translateAllExpressionsAndCreateAliasesForThem(@NotNull List<JetExpression> expressions) {
+        Map<JetExpression, JsExpression> aliasesForExpressions = new THashMap<JetExpression, JsExpression>(expressions.size());
         List<JsVars.JsVar> vars = new ArrayList<JsVars.JsVar>(expressions.size());
         for (JetExpression expression : expressions) {
             JsExpression translatedExpression = Translation.translateAsExpression(expression, context());
             JsVars.JsVar aliasForExpression = context().dynamicContext().createTemporaryVar(translatedExpression);
             vars.add(aliasForExpression);
-            aliasesForExpressions.put(expression, aliasForExpression.getName());
+            aliasesForExpressions.put(expression, aliasForExpression.getName().makeRef());
         }
         context().addStatementToCurrentBlock(new JsVars(vars, true));
         return aliasesForExpressions;