Support for map literals in cps js emitter

pkg/compiler/lib/src/js_backend/codegen/codegen.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library code_generator;
 
 import 'glue.dart';
 
 import '../../tree_ir/tree_ir_nodes.dart' as tree_ir;
 import '../../js/js.dart' as js;
@@ skipping 150 matching lines @@
     return giveup(node);
     // TODO: implement visitFunctionExpression
   }
 
   js.Expression compileConstant(ParameterElement parameter) {
     return buildConstant(glue.getConstantForVariable(parameter).value);
   }
 
   js.Expression buildStaticInvoke(Selector selector,
                                   Element target,
-                                  List<tree_ir.Expression> arguments) {
+                                  List<js.Expression> arguments) {
     registry.registerStaticInvocation(target.declaration);
 
     js.Expression elementAccess = glue.elementAccess(target);
     List<js.Expression> compiledArguments =
-        selector.makeArgumentsList(arguments, target.implementation,
-            visitExpression,
+        selector.makeArgumentsList(target.implementation,
+            arguments,
             compileConstant);
     return new js.Call(elementAccess, compiledArguments);
   }
 
   @override
   js.Expression visitInvokeConstructor(tree_ir.InvokeConstructor node) {
     if (node.constant != null) return giveup(node);
-    return buildStaticInvoke(node.selector, node.target, node.arguments);
+    return buildStaticInvoke(node.selector,
+                             node.target,
+                             visitArguments(node.arguments));
   }
 
   void registerMethodInvoke(tree_ir.InvokeMethod node) {
     Selector selector = node.selector;
     // TODO(sigurdm): We should find a better place to register the call.
     Selector call = new Selector.callClosureFrom(selector);
     registry.registerDynamicInvocation(call);
     registry.registerDynamicInvocation(selector);
   }
 
   @override
   js.Expression visitInvokeMethod(tree_ir.InvokeMethod node) {
     // TODO(sigurdm): Handle intercepted invocations.
     if (glue.isIntercepted(node.selector)) giveup(node);
     js.Expression receiver = visitExpression(node.receiver);
 
     List<js.Expression> arguments = visitArguments(node.arguments);
 
     String methodName = glue.invocationName(node.selector);
     registerMethodInvoke(node);
 
     return js.propertyCall(receiver, methodName, arguments);
   }
 
   @override
   js.Expression visitInvokeStatic(tree_ir.InvokeStatic node) {
-    return buildStaticInvoke(node.selector, node.target, node.arguments);
+    return buildStaticInvoke(node.selector,
+                             node.target,
+                             visitArguments(node.arguments));
   }
 
   @override
   js.Expression visitInvokeSuperMethod(tree_ir.InvokeSuperMethod node) {
     return giveup(node);
     // TODO: implement visitInvokeSuperMethod
   }
 
   @override
   js.Expression visitLiteralList(tree_ir.LiteralList node) {
     registry.registerInstantiatedClass(glue.listClass);
     int length = node.values.length;
     List<js.ArrayElement> entries = new List<js.ArrayElement>.generate(length,
         (int i) => new js.ArrayElement(i, visitExpression(node.values[i])));
     return new js.ArrayInitializer(length, entries);
   }
 
   @override
   js.Expression visitLiteralMap(tree_ir.LiteralMap node) {
-    return giveup(node);
-    // TODO: implement visitLiteralMap
+    ConstructorElement constructor;
+    if (node.entries.isEmpty) {
+      constructor = glue.mapLiteralConstructorEmpty;
+    } else {
+      constructor = glue.mapLiteralConstructor;
+    }
+    List<js.ArrayElement> entries = new List<js.ArrayElement>();

[floitsch, 2014/11/27 15:57:27]

I prefer to allocate the right size and to use a for loop:

int length = node.entries.length;
entries = new List<..>(length);
for (int i = 0; i < length; i++) {
  LiteralMapEntry entry = node.entries[i];
  entries[2*i] = new js.ArrayElement(i, visitExpression(entry.key));
  entries[2*i + 1] = ...
}

[sigurdm, 2014/11/28 09:24:24]

Done.

+    int i = 0;
+    for (tree_ir.LiteralMapEntry entry in node.entries) {
+      entries.add(new js.ArrayElement(i, visitExpression(entry.key)));
+      ++i;
+      entries.add(new js.ArrayElement(i, visitExpression(entry.value)));
+      ++i;
+    }
+    List<js.Expression> args =
+        <js.Expression>[new js.ArrayInitializer(i, entries)];
+    return buildStaticInvoke(
+        new Selector.call(constructor.name, constructor.library, 2),
+        constructor,
+        args);
   }
 
   @override
   js.Expression visitLogicalOperator(tree_ir.LogicalOperator node) {
     return new js.Binary(node.operator, visit(node.left), visit(node.right));
   }
 
   @override
   js.Expression visitNot(tree_ir.Not node) {
     return new js.Prefix("!", visitExpression(node.operand));
@@ skipping 147 matching lines @@
     accumulator.add(
         buildWhile(new js.LiteralBool(true), node.body, node.label, node));
   }
 
   @override
   void visitReturn(tree_ir.Return node) {
     accumulator.add(new js.Return(visitExpression(node.value)));
   }
 
 }