Get rid of duplication of class node unparsing.

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);
 
 class Unparser implements Visitor {
   Renamer rename;
   StringBuffer sb;
@@ skipping 39 matching lines @@
   }
 
   visitCascade(Cascade node) {
     visit(node.expression);
   }
 
   visitCascadeReceiver(CascadeReceiver node) {
     visit(node.expression);
   }
 
-  visitClassNode(ClassNode node) {
+  emitClassWithBody(ClassNode node, classBodyEmitter) {

[Roman, 2012/08/31 13:52:15]

Can you please specify the full signature for 'classBodyEmitter'? Without
comments and without any hints like return type and parameters it is really
difficult to understand how it is used.

'classBodyEmitter' method should actually have StringBuffer parameter, that will
solve the problem in Emitter.

Also for consistency this method should be called 'unparseClassWithBody'

[Anton Muhin, 2012/08/31 14:01:09]

If emitClassWithBody(ClassNode node, void classBodyEmitter()) is more readable
for you, I'll do it.

And no, I don't think classBodyEmitter should have StringBuffer parameter as it
introduces a tension if I should use goodies like addToken or my manual
emission.

Renaming to unparseClassWithBody

On 2012/08/31 13:52:15, Roman wrote:

     addToken(node.beginToken);
+    if (node.beginToken.stringValue == 'abstract') {
+      addToken(node.beginToken.next);
+    }
     visit(node.name);
     if (node.typeParameters !== null) {
       visit(node.typeParameters);
     }
-    sb.add(' ');
     if (node.extendsKeyword !== null) {
+      sb.add(' ');
       addToken(node.extendsKeyword);
       visit(node.superclass);
+    }
+    if (!node.interfaces.isEmpty()) {
       sb.add(' ');
+      visit(node.interfaces);
     }
-    visit(node.interfaces);
     if (node.defaultClause !== null) {
+      sb.add(' default ');
       visit(node.defaultClause);
-      sb.add(' ');
     }
-    sb.add('{\n');
-    NodeList body = node.body;
-    if (body !== null) {
-      Link nodes = body.nodes;
-      if (!nodes.isEmpty()) {
-        sb.add('  ');
-        nodes.printOn(sb, '\n  ');
+    sb.add('{');
+    classBodyEmitter();
+    sb.add('}');
+  }
+
+  visitClassNode(ClassNode node) {
+    emitClassWithBody(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');
+    });
+    sb.add('\n');
   }
 
   visitConditional(Conditional node) {
     visit(node.condition);
     add(node.questionToken.value);
     visit(node.thenExpression);
     add(node.colonToken.value);
     visit(node.elseExpression);
   }
 
@@ skipping 397 matching lines @@
       sb.add(' ');
     }
     visit(node.name);
     if (node.typeParameters !== null) {
       visit(node.typeParameters);
     }
     visit(node.formals);
     add(node.endToken.value);
   }
 }