Remove js.ArrayElement.

pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.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 dart2js.new_js_emitter.model_emitter;
 
 import '../../dart2jslib.dart' show Compiler;
 import '../../js/js.dart' as js;
 import '../../js_backend/js_backend.dart' show
     JavaScriptBackend,
@@ skipping 57 matching lines @@
     var suffix = '';
     if (compiler.hasBuildId) suffix = ' version: ${compiler.buildId}';
     return '// Generated by dart2js, the Dart to JavaScript compiler$suffix.\n';
   }
 
   js.Statement emitMainUnit(Program program) {
     MainOutput unit = program.outputs.first;
     List<js.Expression> elements = unit.libraries.map(emitLibrary).toList();
     elements.add(
         emitLazilyInitializedStatics(unit.staticLazilyInitializedFields));
-    js.Expression code = new js.ArrayInitializer.from(elements);
+    js.Expression code = new js.ArrayInitializer(elements);
     return js.js.statement(
         boilerplate,
         {'deferredInitializer': emitDeferredInitializerGlobal(program.loadMap),
          'holders': emitHolders(unit.holders),
          'cyclicThrow': namer.elementAccess(backend.getCyclicThrowHelper()),
          'outputContainsConstantList': program.outputContainsConstantList,
          'embeddedGlobals': emitEmbeddedGlobals(program.loadMap),
          'constants': emitConstants(unit.constants),
          'staticNonFinals': emitStaticNonFinalFields(unit.staticNonFinalFields),
          'eagerClasses': emitEagerClassInitializations(unit.libraries),
@@ skipping 11 matching lines @@
     //
     // and it is inserted at the top of the top-level function expression
     // that covers the entire program.
 
     List<js.Statement> statements = [
         new js.ExpressionStatement(
             new js.VariableDeclarationList(holders.map((e) =>
                 new js.VariableInitialization(
                     new js.VariableDeclaration(e.name, allowRename: false),
                     new js.ObjectInitializer(const []))).toList())),
-        js.js.statement('var holders = #', new js.ArrayInitializer.from(
-            holders.map((e) => new js.VariableUse(e.name))))
+        js.js.statement('var holders = #', new js.ArrayInitializer(
+            holders.map((e) => new js.VariableUse(e.name)).toList()))

[floitsch, 2014/11/28 12:42:50]

growable: false ?
but probably not enough space...

[sigurdm, 2014/11/28 14:52:12]

Done.

     ];
     return new js.Block(statements);
   }
 
   static js.Template get makeConstantListTemplate {
     // TODO(floitsch): remove hard-coded name.
     // TODO(floitsch): there is no harm in caching the template.
     return js.js.uncachedExpressionTemplate('makeConstList(#)');
   }
 
@@ skipping 69 matching lines @@
   }
 
   js.Expression emitDeferredUnit(DeferredOutput unit, List<Holder> holders) {
     // TODO(floitsch): initialize eager classes.
     // TODO(floitsch): the hash must depend on the output.
     int hash = this.hashCode;
     if (unit.constants.isNotEmpty) {
       throw new UnimplementedError("constants in deferred units");
     }
     js.ArrayInitializer content =
-        new js.ArrayInitializer.from(unit.libraries.map(emitLibrary));
+        new js.ArrayInitializer(unit.libraries.map(emitLibrary).toList());

[floitsch, 2014/11/28 12:42:50]

ditto.
May create a new local:
List<Expression> entries = unit.libraries.map(emitLibrary).toList();
js.ArrayInitializer content = new js.ArrayInitializer(entries);

[sigurdm, 2014/11/28 14:52:12]

Done.

     return js.js("$deferredInitializersGlobal[$hash] = #", content);
   }
 
   js.Block emitConstants(List<Constant> constants) {
     Iterable<js.Statement> statements = constants.map((Constant constant) {
       js.Expression code =
           constantEmitter.initializationExpression(constant.value);
       return js.js.statement("#.# = #;",
                              [constant.holder.name, constant.name, code]);
     });
     return new js.Block(statements.toList());
   }
 
   js.Block emitStaticNonFinalFields(List<StaticField> fields) {
     Iterable<js.Statement> statements = fields.map((StaticField field) {
       return js.js.statement("#.# = #;",
                              [field.holder.name, field.name, field.code]);
     });
     return new js.Block(statements.toList());
   }
 
   js.Expression emitLazilyInitializedStatics(List<StaticField> fields) {
     Iterable fieldDescriptors = fields.expand((field) =>
         [ js.string(field.name),
           js.string("${namer.getterPrefix}${field.name}"),
           js.number(field.holder.index),
           emitLazyInitializer(field) ]);
-    return new js.ArrayInitializer.from(fieldDescriptors);
+    return new js.ArrayInitializer(fieldDescriptors.toList());

[floitsch, 2014/11/28 12:42:50]

ditto.

[sigurdm, 2014/11/28 14:52:12]

Done.

   }
 
   js.Block emitEagerClassInitializations(List<Library> libraries) {
     js.Statement createInstantiation(Class cls) {
       return js.js.statement('new #.#()', [cls.holder.name, cls.name]);
     }
 
     List<js.Statement> instantiations =
         libraries.expand((Library library) => library.classes)
                  .where((Class cls) => cls.isEager)
                  .map(createInstantiation)
                  .toList(growable: false);
     return new js.Block(instantiations);
   }
 
   js.Expression emitLibrary(Library library) {
     Iterable staticDescriptors = library.statics.expand((e) =>
         [ js.string(e.name), js.number(e.holder.index), emitStaticMethod(e) ]);
     Iterable classDescriptors = library.classes.expand((e) =>
         [ js.string(e.name), js.number(e.holder.index), emitClass(e) ]);
 
-    js.Expression staticArray = new js.ArrayInitializer.from(staticDescriptors);
-    js.Expression classArray = new js.ArrayInitializer.from(classDescriptors);
+    js.Expression staticArray =
+        new js.ArrayInitializer(staticDescriptors.toList());

[floitsch, 2014/11/28 12:42:50]

ditto.

[sigurdm, 2014/11/28 14:52:12]

Done.

+    js.Expression classArray =
+        new js.ArrayInitializer(classDescriptors.toList());

[floitsch, 2014/11/28 12:42:50]

ditto.

[sigurdm, 2014/11/28 14:52:12]

Done.

 
-    return new js.ArrayInitializer.from([staticArray, classArray]);
+    return new js.ArrayInitializer([staticArray, classArray]);
   }
 
   js.Expression _generateConstructor(Class cls) {
     List<String> allFieldNames = <String>[];
 
     // If the class is not directly instantiated we only need it for inheritance
     // or RTI. In either case we don't need its fields.
     if (cls.isDirectlyInstantiated) {
       Class currentClass = cls;
       while (currentClass != null) {
@@ skipping 62 matching lines @@
   js.Expression emitClass(Class cls) {
     if (cls.isMixinApplication) return emitMixinApplication(cls);
 
     List elements = [js.string(cls.superclassName),
                      js.number(cls.superclassHolderIndex),
                      _generateConstructor(cls)];
     Iterable<Method> methods = cls.methods;
     Iterable<Method> gettersSetters = _generateGettersSetters(cls);
     Iterable<Method> allMethods = [methods, gettersSetters].expand((x) => x);
     elements.addAll(allMethods.expand((e) => [js.string(e.name), e.code]));
-    return unparse(compiler, new js.ArrayInitializer.from(elements));
+    return unparse(compiler, new js.ArrayInitializer(elements));
   }
 
   // This string should be referenced wherever JavaScript code makes assumptions
   // on the mixin format.
   static final String mixinFormatDescription =
       "Mixins have no constructor, but a reference to their mixin class.";
 
   js.Expression emitMixinApplication(MixinApplication cls) {
     List elements = [js.string(cls.superclassName),
                      js.number(cls.superclassHolderIndex),
                      js.string(cls.mixinClass.name),
                      js.number(cls.mixinClass.holder.index)];
-    return unparse(compiler, new js.ArrayInitializer.from(elements));
+    return unparse(compiler, new js.ArrayInitializer(elements));
   }
 
   js.Expression emitLazyInitializer(StaticField field) {
     assert(field.isLazy);
     return unparse(compiler, field.code);
   }
 
   js.Expression emitStaticMethod(StaticMethod method) {
     return unparse(compiler, method.code);
   }
@@ skipping 178 matching lines @@
 
   var end = Date.now();
   print('Setup: ' + (end - start) + ' ms.');
 
   #main();  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }