Fix for Issue 7224

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 199 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];
 '''/* Get the superclass and the fields in the format Super;field1,field2 from

[ngeoffray, 2012/12/09 10:41:50]

Update the comment?

       the null-string property on the descriptor. */'''
-      var s = desc[''].split(';'), supr = s[0];
-      var fields = s[1] == '' ? [] : s[1].split(',');
+      var fields = desc[''], supr = desc['super'];

[ngeoffray, 2012/12/09 10:41:50]

why not put "supr = desc['super']" in an else branch?

+      if (typeof fields=='string') {

[ngeoffray, 2012/12/09 10:41:50]

spaces between '=='

+        var s = fields.split(';'); supr = s[0];
+        fields = s[1] == '' ? [] : s[1].split(',');
+      }
       $isolatePropertiesName[cls] = $defineClassName(cls, fields, desc);
       if (supr) $pendingClassesName[cls] = supr;
     }
   }
   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) {
@@ skipping 592 matching lines @@
     }
     String setterName = namer.setterName(member.getLibrary(), member.name);
     buffer.add("$setterName: function(v) { "
         "this.$fieldName = $helperName(v$additionalArgument); }");
   }
 
   void emitClassConstructor(ClassElement classElement, CodeBuffer buffer) {
     /* Do nothing. */
   }
 
+  void emitSuper(String superName, CodeBuffer buffer) {
+    /* Do nothing. */
+  }
+
   void emitClassFields(ClassElement classElement,
                        CodeBuffer buffer,
                        bool emitEndingComma,
                        { String superClass: "",
                          bool isNative: false}) {
     bool isFirstField = true;
     bool isAnythingOutput = false;
     if (!isNative) {
       buffer.add('"":"$superClass;');
       isAnythingOutput = true;
@@ skipping 111 matching lines @@
     needsDefineClass = true;
     String className = namer.getName(classElement);
     ClassElement superclass = classElement.superclass;
     String superName = "";
     if (superclass != null) {
       superName = namer.getName(superclass);
     }
 
     buffer.add('$classesCollector.$className = {');
     emitClassConstructor(classElement, buffer);
+    emitSuper(superName, buffer);
     emitClassFields(classElement, buffer, false,
                     superClass: superName, isNative: false);
     // TODO(floitsch): the emitInstanceMember should simply always emit a ',\n'.
     // That does currently not work because the native classes have a different
     // syntax.
     emitClassGettersSetters(classElement, buffer, true);
     emitInstanceMembers(classElement, buffer, true);
     buffer.add('\n};\n\n');
   }
 
@@ skipping 894 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].
 """;