Move member-iterating code into ClassElement.

frog/leg/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.
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
 class ClosureInvocationElement extends FunctionElement {
   ClosureInvocationElement(SourceString name,
@@ skipping 217 matching lines @@
       compiler.internalError('unexpected kind: "${member.kind}"',
                              element: member);
     }
     emitExtraAccessors(member, attachTo, buffer);
   }
 
   bool generateFieldInits(ClassElement classElement,
                           StringBuffer argumentsBuffer,
                           StringBuffer bodyBuffer) {
     bool isFirst = true;
-    do {
+    void generateFieldInit(ClassElement enclosingClass, Element member) {
       // TODO(floitsch): make sure there are no name clashes.
-      String className = namer.getName(classElement);
+      String className = namer.getName(enclosingClass);
+      if (!isFirst) argumentsBuffer.add(', ');
+      isFirst = false;
+      String memberName = namer.instanceFieldName(member.getLibrary(),
+                                                  member.name);
+      argumentsBuffer.add('${className}_$memberName');
+      bodyBuffer.add('  this.$memberName = ${className}_$memberName;\n');
+    }
 
-      void generateFieldInit(Element member) {
-        if (member.isInstanceMember() && member.kind == ElementKind.FIELD) {
-          if (!isFirst) argumentsBuffer.add(', ');
-          isFirst = false;
-          String memberName = namer.instanceFieldName(member.getLibrary(),
-                                                      member.name);
-          argumentsBuffer.add('${className}_$memberName');
-          bodyBuffer.add('  this.$memberName = ${className}_$memberName;\n');
-        }
-      }
-
-      for (Element element in classElement.members) {
-        generateFieldInit(element);
-      }
-      for (Element element in classElement.backendMembers) {
-        generateFieldInit(element);
-      }
-
-      classElement = classElement.superclass;
-    } while(classElement !== null);
+    classElement.forEachInstanceField(generateFieldInit,
+                                      includeBackendMembers: true,
+                                      includeSuperMembers: true);
   }
 
   void emitInherits(ClassElement cls, StringBuffer buffer) {
     ClassElement superclass = cls.superclass;
     if (superclass !== null) {
       addInheritFunctionIfNecessary();
       String className = namer.isolatePropertyAccess(cls);
       String superName = namer.isolatePropertyAccess(superclass);
       buffer.add('${inheritsName}($className, $superName);\n');
     }
@@ skipping 28 matching lines @@
     if (compiler.universe.instantiatedClasses.contains(classElement)) {
       generateFieldInits(classElement, buffer, bodyBuffer);
     }
     buffer.add(') {\n');
     buffer.add(bodyBuffer);
     buffer.add('};\n');
 
     emitInherits(classElement, buffer);
 
     String attachTo(String name) => '$className.prototype.$name';
-    for (Element member in classElement.members) {
+    
+    classElement.forEachMember(includeBackendMembers: true,
+                               f: (ClassElement enclosing, Element member) {
       if (member.isInstanceMember()) {
         addInstanceMember(member, attachTo, buffer);
       }
-    }
-    for (Element member in classElement.backendMembers) {
-      if (member.isInstanceMember()) {
-        addInstanceMember(member, attachTo, buffer);
-      }
-    }
+    });
+
     generateTypeTests(classElement, (Element other) {
       buffer.add('${attachTo(namer.operatorIs(other))} = ');
       if (nativeEmitter.requiresNativeIsCheck(other)) {
         buffer.add('function() { return true; }');
       } else {
         buffer.add('true');
       }
       buffer.add(';\n');
     });
 
@@ skipping 385 matching lines @@
       nativeEmitter.emitDynamicDispatchMetadata();
       mainBuffer.add(
           'var ${namer.CURRENT_ISOLATE} = new ${namer.ISOLATE}();\n');
       nativeEmitter.assembleCode(mainBuffer);
       emitMain(mainBuffer);
       compiler.assembledCode = mainBuffer.toString();
     });
     return compiler.assembledCode;
   }
 }