Simplify Unparser.unparseClassWithBody.

lib/compiler/implementation/tree/unparser.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.
 
 // Returns null if no need to rename a node.
 typedef String Renamer(Node node);
 
 String unparse(Node node) {
   Unparser unparser = new Unparser();
   unparser.unparse(node);
@@ skipping 43 matching lines @@
   }
 
   visitCascade(Cascade node) {
     visit(node.expression);
   }
 
   visitCascadeReceiver(CascadeReceiver node) {
     visit(node.expression);
   }
 
-  unparseClassWithBody(ClassNode node, void classBodyEmitter()) {
+  unparseClassWithBody(ClassNode node, Iterable<Node> members) {

[Roman, 2012/09/04 17:12:15]

thank you for specifying type :)

[Anton Muhin, 2012/09/04 18:00:40]

My pleasure

     addToken(node.beginToken);
     if (node.beginToken.stringValue == 'abstract') {
       addToken(node.beginToken.next);
     }
     visit(node.name);
     if (node.typeParameters !== null) {
       visit(node.typeParameters);
     }
     if (node.extendsKeyword !== null) {
       sb.add(' ');
       addToken(node.extendsKeyword);
       visit(node.superclass);
     }
     if (!node.interfaces.isEmpty()) {
       sb.add(' ');
       visit(node.interfaces);
     }
     if (node.defaultClause !== null) {
       sb.add(' default ');
       visit(node.defaultClause);
     }
     sb.add('{');
-    classBodyEmitter();
+    for (final member in members) {
+      visit(member);
+    }
     sb.add('}');
   }
 
   visitClassNode(ClassNode node) {
-    unparseClassWithBody(node, () {
-      NodeList body = node.body;
-      if (body !== null) {
-        sb.add('\n');
-        Link nodes = body.nodes;
-        if (!nodes.isEmpty()) {
-          sb.add('  ');
-          nodes.printOn(sb, '\n  ');
-          sb.add('\n');
-        }
-      }
-    });
-    sb.add('\n');
+    unparseClassWithBody(node, node.body.nodes);

[Roman, 2012/09/04 17:12:15]

original code performed null check on body. Are you sure that it can never be
null?

[Anton Muhin, 2012/09/04 18:00:40]

Not quite, but so far tests revealed no such cases, so let's be optimistic
here---that should be trivial to fix if need be.

On 2012/09/04 17:12:15, Roman wrote:

   }
 
   visitConditional(Conditional node) {
     visit(node.condition);
     add(node.questionToken.value);
     visit(node.thenExpression);
     add(node.colonToken.value);
     visit(node.elseExpression);
   }
 
@@ skipping 402 matching lines @@
       sb.add(' ');
     }
     visit(node.name);
     if (node.typeParameters !== null) {
       visit(node.typeParameters);
     }
     visit(node.formals);
     add(node.endToken.value);
   }
 }