Do not generate empty native classes. Fixes issue 6872.

sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart

 // Copyright (c) 2012, 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 js_backend;
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
@@ skipping 218 matching lines @@
     //    constructor.
     // For engines where we have access to the '__proto__' we can manipulate
     // the object literal directly. For other engines we have to create a new
     // object and copy over the members.
     return '''
 function(collectedClasses) {
   var hasOwnProperty = Object.prototype.hasOwnProperty;
   for (var cls in collectedClasses) {
     if (hasOwnProperty.call(collectedClasses, cls)) {
       var desc = collectedClasses[cls];
-      $isolatePropertiesName[cls] = $defineClassName(cls, desc[''], desc);
+      $isolatePropertiesName[cls] = $defineClassName(cls, desc[''] || [], desc);

[ahe, 2012/11/22 12:22:05]

I suggest that you use string juxtaposition to get some inline comments here.

[ngeoffray, 2012/11/22 13:15:18]

Done.

       if (desc['super'] !== "") $pendingClassesName[cls] = desc['super'];
     }
   }
   var pendingClasses = $pendingClassesName;
 '''/* FinishClasses can be called multiple times. This means that we need to
       clear the pendingClasses property. */'''
   $pendingClassesName = {};
   var finishedClasses = {};
   function finishClass(cls) {
 '''/* Opera does not support 'getOwnPropertyNames'. Therefore we use
@@ skipping 414 matching lines @@
     emitExtraAccessors(member, defineInstanceMember);
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [classElement] must be a declaration element.
    */
   void emitInstanceMembers(ClassElement classElement,
                            CodeBuffer buffer,
-                           bool needsLeadingComma) {
+                           {bool emitLeadingComma: true}) {

[ahe, 2012/11/22 12:22:05]

Why is this a named argument now?

[ngeoffray, 2012/11/22 13:15:18]

It was to make it consistent with the other methods.

     assert(invariant(classElement, classElement.isDeclaration));
-    bool needsComma = needsLeadingComma;
     void defineInstanceMember(String name, StringBuffer memberBuffer) {
-      if (needsComma) buffer.add(',');
-      needsComma = true;
+      if (emitLeadingComma) buffer.add(',');
+      emitLeadingComma = true;
       buffer.add('\n');
       buffer.add(' $name: ');
       buffer.add(memberBuffer);
     }
 
     JavaScriptBackend backend = compiler.backend;
     if (classElement == backend.objectInterceptorClass) {
       emitInterceptorMethods(defineInstanceMember);
       // The ObjectInterceptor does not have any instance methods.
       return;
@@ skipping 149 matching lines @@
     String setterName =
         namer.publicSetterName(new SourceString(accessorName));
     buffer.add("$setterName: function(v) { "
         "this.$fieldName = $helperName(v$additionalArgument); }");
   }
 
   void emitClassConstructor(ClassElement classElement, CodeBuffer buffer) {
     /* Do nothing. */
   }
 
-  void emitClassFields(ClassElement classElement, CodeBuffer buffer) {
-    buffer.add('"": [');
+  void emitClassFields(ClassElement classElement,
+                       CodeBuffer buffer,
+                       {bool emitEndingComma: true}) {

[ahe, 2012/11/22 12:22:05]

I think it would be better to update all the callers instead.  Ad-hoc optional
arguments doesn't really scale and have causes a lot of maintenance problems in
the compiler so far.

[ngeoffray, 2012/11/22 13:15:18]

Done.

     bool isFirstField = true;
     visitClassFields(classElement, (Element member,
                                     String name,
                                     String accessorName,
                                     bool needsGetter,
                                     bool needsSetter,
                                     bool needsCheckedSetter) {
       if (isFirstField) {
+        buffer.add('"": [');
         isFirstField = false;
       } else {
         buffer.add(", ");
       }
       buffer.add('"$accessorName');
       int flag = 0;
       if (name != accessorName) {
         buffer.add(':$name');
         assert(needsGetter || needsSetter);
         flag = RENAMING_FLAG;
       }
       if (needsGetter && needsSetter) {
         buffer.addCharCode(GETTER_SETTER_CODE + flag);
       } else if (needsGetter) {
         buffer.addCharCode(GETTER_CODE + flag);
       } else if (needsSetter) {
         buffer.addCharCode(SETTER_CODE + flag);
       }
       buffer.add('"');
     });
-    buffer.add(']');
+    if (!isFirstField) {
+      // There was at least one field.
+      buffer.add(']');
+      if (emitEndingComma) {
+        buffer.add(', ');
+      }
+    }
   }
 
   /** Each getter/setter must be prefixed with a ",\n ". */
   void emitClassGettersSetters(ClassElement classElement, CodeBuffer buffer,
-                               {bool omitLeadingComma: false}) {
+                               {bool emitLeadingComma: true}) {
     visitClassFields(classElement, (Element member,
                                     String name,
                                     String accessorName,
                                     bool needsGetter,
                                     bool needsSetter,
                                     bool needsCheckedSetter) {
       if (needsCheckedSetter) {
         assert(!needsSetter);
-        if (!omitLeadingComma) {
+        if (emitLeadingComma) {
           buffer.add(",\n ");
         } else {
-          omitLeadingComma = false;
+          emitLeadingComma = true;
         }
         generateCheckedSetter(member, name, accessorName, buffer);
       }
     });
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [classElement] must be a declaration element.
@@ skipping 17 matching lines @@
     if (superclass != null) {
       superName = namer.getName(superclass);
     }
 
     buffer.add('$classesCollector.$className = {');
     emitClassConstructor(classElement, buffer);
     emitClassFields(classElement, buffer);
     // TODO(floitsch): the emitInstanceMember should simply always emit a ',\n'.
     // That does currently not work because the native classes have a different
     // syntax.
-    buffer.add(',\n "super": "$superName"');
+    buffer.add('\n "super": "$superName"');
     emitClassGettersSetters(classElement, buffer);
-    emitInstanceMembers(classElement, buffer, true);
+    emitInstanceMembers(classElement, buffer);
     buffer.add('\n};\n\n');
   }
 
   void emitInterceptorMethods(
       void defineInstanceMember(String name, StringBuffer memberBuffer)) {
     JavaScriptBackend backend = compiler.backend;
     // Emit forwarders for the ObjectInterceptor class. We need to
     // emit all possible sends on intercepted methods.
     for (Selector selector in backend.usedInterceptors) {
       String name;
@@ skipping 787 matching lines @@
 const String HOOKS_API_USAGE = """
 // Generated by dart2js, the Dart to JavaScript compiler.
 // The code supports the following hooks:
 // dartPrint(message)   - if this function is defined it is called
 //                        instead of the Dart [print] method.
 // dartMainRunner(main) - if this function is defined, the Dart [main]
 //                        method will not be invoked directly.
 //                        Instead, a closure that will invoke [main] is
 //                        passed to [dartMainRunner].
 """;