Incremental compilation of new classes with fields.

dart/pkg/dart2js_incremental/lib/library_updater.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_incremental.library_updater;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 26 matching lines @@
     ClassNode,
     FunctionExpression,
     NodeList;
 
 import 'package:compiler/src/js/js.dart' show
     js;
 
 import 'package:compiler/src/js/js.dart' as jsAst;
 
 import 'package:compiler/src/js_emitter/js_emitter.dart' show
+    ClassBuilder,
+    ClassEmitter,
     CodeEmitterTask,
-    MemberInfo;
+    MemberInfo,
+    computeMixinClass;
 
 import 'package:_internal/compiler/js_lib/shared/embedded_names.dart'
     as embeddedNames;
 
 import 'package:compiler/src/js_backend/js_backend.dart' show
     JavaScriptBackend,
     Namer;
 
 import 'package:compiler/src/util/util.dart' show
     Link,
@@ skipping 344 matching lines @@
       compiler.enqueuer.codegen.addToWorkList(element);
     }
     compiler.processQueue(compiler.enqueuer.codegen, null);
 
     List<jsAst.Statement> updates = <jsAst.Statement>[];
 
     Set newClasses =
         new Set.from(compiler.codegenWorld.directlyInstantiatedClasses);
     newClasses.removeAll(existingClasses);
 
+    List<jsAst.Statement> inherits = <jsAst.Statement>[];
+
     for (ClassElementX cls in newClasses) {
-      jsAst.Node access = namer.elementAccess(cls);
+      jsAst.Node classAccess = namer.elementAccess(cls);
       String name = namer.getNameOfClass(cls);
 
-      // TODO(ahe): Compute arguments.
-      List<jsAst.Node> arguments = <jsAst.Node>[];
+      var descriptor = js('Object.create(null)');
 
-      // TODO(ahe): Compute statements, that is initializers.
-      List<jsAst.Statement> statements = <jsAst.Statement>[];
+      jsAst.Statement defineClass = js.statement(
+          r'''
+# = (new Function(
+    "$collectedClasses", "$desc",
+    self.$dart_unsafe_eval.defineClass(#, #) +"\n;return " + #))({#: #})
+''',
+          [classAccess,
+           js.string(name), js.stringArray(computeFields(cls)),
+           js.string(name),
+           js.string(name), descriptor]);
 
-      updates.add(
-          js.statement(
-              '# = function $name(#) {#}', [access, arguments, statements]));
+      updates.add(defineClass);
+
+      ClassElement superclass = cls.superclass;
+      if (superclass != null) {
+        jsAst.Node superAccess = namer.elementAccess(superclass);
+        inherits.add(
+            js.statement(
+                r'self.$dart_unsafe_eval.inheritFrom(#, #)',
+                [classAccess, superAccess]));
+      }
     }
 
-    for (ClassElementX cls in newClasses) {
-      if (cls.isObject) continue;
-      jsAst.Node classAccess = namer.elementAccess(cls);
-      jsAst.Node superAccess = namer.elementAccess(cls.superclass);
-
-      updates.add(
-          js.statement(
-              r'self.$dart_unsafe_eval.inheritFrom(#, #)',
-              [classAccess, superAccess]));
-    }
+    updates.addAll(inherits);
 
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (!element.isField) {
         updates.add(computeMemberUpdateJs(element));
       }
     }
     for (RemovedFunctionUpdate update in removals) {
       update.writeUpdateJsOn(updates);
     }
 
@@ skipping 51 matching lines @@
     printer.blockOutWithoutBraces(node);
     return printer.outBuffer.getText();
   }
 
   String callNameFor(FunctionElement element) {
     // TODO(ahe): Call a method in the compiler to obtain this name.
     String callPrefix = namer.callPrefix;
     int parameterCount = element.functionSignature.parameterCount;
     return '$callPrefix\$$parameterCount';
   }
+
+  List<String> computeFields(ClassElement cls) {
+    return new EmitterHelper(compiler).computeFields(cls);
+  }
 }
 
 /// Represents an update (aka patch) of [before] to [after]. We use the word
 /// "update" to avoid confusion with the compiler feature of "patch" methods.
 abstract class Update {
   final Compiler compiler;
 
   PartialElement get before;
 
   PartialElement get after;
@@ skipping 228 matching lines @@
 
 abstract class JsFeatures {
   Compiler get compiler;
 
   JavaScriptBackend get backend => compiler.backend;
 
   Namer get namer => backend.namer;
 
   CodeEmitterTask get emitter => backend.emitter;
 }
+
+class EmitterHelper extends JsFeatures {
+  final Compiler compiler;
+
+  EmitterHelper(this.compiler);
+
+  ClassEmitter get classEmitter => backend.emitter.oldEmitter.classEmitter;
+
+  List<String> computeFields(ClassElement cls) {
+    // TODO(ahe): Rewrite for new emitter.
+    ClassBuilder builder = new ClassBuilder(cls, namer);
+    classEmitter.emitFields(cls, builder, "");
+    return builder.fields;
+  }
+}