Move member-iterating code into ClassElement.

frog/leg/elements/elements.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.
 
 #library('elements');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
 #import('../leg.dart');  // TODO(karlklose): we only need type.
 #import('../util/util.dart');
@@ skipping 761 matching lines @@
   /**
    * Returns the super class, if any.
    *
    * The returned element may not be resolved yet.
    */
   ClassElement get superclass() {
     assert(isResolved);
     return supertype === null ? null : supertype.element;
   }
 
+  /**
+   * Runs through all members of this class.
+   *
+   * The enclosing class is passed to the callback. This is useful when
+   * [includeSuperMembers] is [:true:].
+   */
+  void forEachMember([void f(ClassElement enclosingClass, Element member),
+                      includeBackendMembers = false,
+                      includeSuperMembers = false]) {
+    ClassElement classElement = this;
+    do {
+      for (Element element in classElement.members) {
+        f(classElement, element);
+      }
+      if (includeBackendMembers) {
+        for (Element element in classElement.backendMembers) {
+          f(classElement, element);
+        }
+      }
+

[karlklose, 2012/03/29 10:48:04]

I would remove this line, the structure of the loop is clear enough.

[floitsch, 2012/03/29 22:44:50]

Done.

+      classElement = includeSuperMembers ? classElement.superclass : null;
+    } while(classElement !== null);    
+  }
+
+  /**
+   * Runs through all instance-field members of this class.
+   *
+   * The enclosing class is passed to the callback. This is useful when
+   * [includeSuperMembers] is [:true:].
+   *
+   * When [includeBackendMembers] and [includeSuperMembers] are both [:true:]
+   * then the fields are visited in the same order as they need to be given
+   * to the JavaScript constructor.
+   */
+  void forEachInstanceField([void f(ClassElement enclosingClass, Element field),
+                             includeBackendMembers = false,
+                             includeSuperMembers = false]) {
+    forEachMember((ClassElement enclosingClass, Element member) {
+      if (member.isInstanceMember() && member.kind == ElementKind.FIELD) {
+        f(enclosingClass, member);
+      }
+    }, includeBackendMembers,
+       includeSuperMembers);

[karlklose, 2012/03/29 10:48:04]

This indentation looks strange. Use the parameter names, or something like this:

forEachMember(
  (ClassElement enclosingClass, Element member) {
    if (member.isInstanceMember() &&
        member.kind == ElementKind.FIELD) {
      f(enclosingClass, member);
    }
  }, includeBackendMembers, includeSuperMembers);

[floitsch, 2012/03/29 22:44:50]

Moved function out of the call.
If you disagree with the name (fieldFilter) I can change it in another CL.

+  }
+
   bool isInterface() => false;
   bool isNative() => nativeName != null;
   SourceString nativeName;
 }
 
 class Elements {
   static bool isLocal(Element element) {
     return ((element !== null)
             && !element.isInstanceMember()
             && !isStaticOrTopLevelField(element)
@@ skipping 168 matching lines @@
   final Node node;
   Type bound;
   Type type;
   TypeVariableElement(name, Element enclosing, this.node, this.type,
                       [this.bound])
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
   Type computeType(compiler) => type;
   Node parseNode(compiler) => node;
   toString() => "${enclosingElement.toString()}.${name.slowToString()}";
 }