Incremental compilation of new classes with fields.

dart/pkg/compiler/lib/src/js_emitter/old_emitter/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.
 
 part of dart2js.js_emitter;
 
 
 class OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 249 matching lines @@
     // Example:
     // defineClass("A", ["x", "y"], {
     //  foo$1: function(y) {
     //   print(this.x + y);
     //  },
     //  bar$2: function(t, v) {
     //   this.x = t - v;
     //  },
     // });
 
-    var defineClass = js('''function(name, cls, fields) {
+    var defineClass = js('''function(name, fields) {
       var accessors = [];
 
-      var str = "function " + cls + "(";
+      var str = "function " + name + "(";
       var body = "";
 
       for (var i = 0; i < fields.length; i++) {
         if(i != 0) str += ", ";
 
-        var field = generateAccessor(fields[i], accessors, cls);
+        var field = generateAccessor(fields[i], accessors, name);
         var parameter = "parameter_" + field;
         str += parameter;
         body += ("this." + field + " = " + parameter + ";\\n");
       }
       str += ") {\\n" + body + "}\\n";
-      str += cls + ".builtin\$cls=\\"" + name + "\\";\\n";
-      str += "\$desc=\$collectedClasses." + cls + ";\\n";
+      str += name + ".builtin\$cls=\\"" + name + "\\";\\n";
+      str += "\$desc=\$collectedClasses." + name + ";\\n";
       str += "if(\$desc instanceof Array) \$desc = \$desc[1];\\n";
-      str += cls + ".prototype = \$desc;\\n";
+      str += name + ".prototype = \$desc;\\n";
       if (typeof defineClass.name != "string") {
-        str += cls + ".name=\\"" + cls + "\\";\\n";
+        str += name + ".name=\\"" + name + "\\";\\n";
       }
       str += accessors.join("");
 
       return str;
     }''');
     // Declare a function called "generateAccessor".  This is used in
     // defineClassFunction (it's a local declaration in init()).
+    List<jsAst.Node> saveDefineClass = [];
+    if (compiler.hasIncrementalSupport) {
+      saveDefineClass.add(
+          js(r'self.$dart_unsafe_eval.defineClass = defineClass'));
+    }
     return [
         generateAccessorFunction,
         js('$generateAccessorHolder = generateAccessor'),
         new jsAst.FunctionDeclaration(
-            new jsAst.VariableDeclaration('defineClass'), defineClass) ];
+            new jsAst.VariableDeclaration('defineClass'), defineClass) ]
+        ..addAll(saveDefineClass);
   }
 
   /** Needs defineClass to be defined. */
   jsAst.Expression buildInheritFrom() {
     jsAst.Expression result = js(r'''
         function() {
           var hasOwnProperty = Object.prototype.hasOwnProperty;
           return function (constructor, superConstructor) {
             var object = Object.create(superConstructor.prototype);
             var properties = constructor.prototype;
@@ skipping 98 matching lines @@
           var constructorsList = [];
         }
 
         for (var cls in collectedClasses) {
           var desc = collectedClasses[cls];
           if (desc instanceof Array) desc = desc[1];
 
           /* The 'fields' are either a constructor function or a
            * string encoding fields, constructor and superclass. Gets the
            * superclass and fields in the format
-           *   '[name/]Super;field1,field2'
+           *   'Super;field1,field2'
            * from the CLASS_DESCRIPTOR_PROPERTY property on the descriptor.
-           * The 'name/' is optional and contains the name that should be used
-           * when printing the runtime type string.  It is used, for example,
-           * to print the runtime type JSInt as 'int'.
            */
           var classData = desc["${namer.classDescriptorProperty}"],
-              supr, name = cls, fields = classData;
+              supr, fields = classData;
           if (#hasRetainedMetadata)
             if (typeof classData == "object" &&
                 classData instanceof Array) {
               classData = fields = classData[0];
             }
-          if (typeof classData == "string") {
-            var split = classData.split("/");
-            if (split.length == 2) {
-              name = split[0];
-              fields = split[1];
-            }
-          }
-
           var s = fields.split(";");
           fields = s[1] == "" ? [] : s[1].split(",");
           supr = s[0];
           split = supr.split(":");
           if (split.length == 2) {
             supr = split[0];
             var functionSignature = split[1];
             if (functionSignature)
               desc.\$signature = (function(s) {
                   return function(){ return #metadata[s]; };
                 })(functionSignature);
           }
 
           if (#needsMixinSupport)
             if (supr && supr.indexOf("+") > 0) {
               s = supr.split("+");
               supr = s[0];
               var mixin = collectedClasses[s[1]];
               if (mixin instanceof Array) mixin = mixin[1];
               for (var d in mixin) {
                 if (hasOwnProperty.call(mixin, d) &&
                     !hasOwnProperty.call(desc, d))
                   desc[d] = mixin[d];
               }
             }
 
           if (typeof dart_precompiled != "function") {
-            combinedConstructorFunction += defineClass(name, cls, fields);
+            combinedConstructorFunction += defineClass(cls, fields);
             constructorsList.push(cls);
           }
           if (supr) pendingClasses[cls] = supr;
         }
 
         if (typeof dart_precompiled != "function") {
           combinedConstructorFunction +=
              "return [\\n  " + constructorsList.join(",\\n  ") + "\\n]";
            var constructors =
             new Function("\$collectedClasses", combinedConstructorFunction)
@@ skipping 1527 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }