Streamline the CPS IR Visitor interface.

pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart

 // Copyright (c) 2014, 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 dart2js.ir_nodes_sexpr;
 
 import '../constants/values.dart';
 import '../util/util.dart';
 import 'cps_ir_nodes.dart';
 
 /// A [Decorator] is a function used by [SExpressionStringifier] to augment the
 /// output produced for a node.  It can be provided to the constructor.
 typedef String Decorator(Node node, String s);
 
 /// Generate a Lisp-like S-expression representation of an IR node as a string.
-class SExpressionStringifier extends Visitor<String> with Indentation {
+class SExpressionStringifier extends Indentation implements Visitor<String> {
   final _Namer namer = new _Namer();
 
   String newValueName(Primitive node) => namer.nameValue(node);
   String newContinuationName(Continuation node) => namer.nameContinuation(node);
   Decorator decorator;
 
   SExpressionStringifier([this.decorator]) {
     if (this.decorator == null) {
       this.decorator = (Node node, String s) => s;
     }
   }
 
   String access(Reference<Definition> r) {
     return decorator(r.definition, namer.getName(r.definition));
   }
 
   String visitParameter(Parameter node) {
     return namer.nameParameter(node);
   }
 
   String visitMutableVariable(MutableVariable node) {
     return namer.nameMutableVariable(node);
   }
 
   /// Main entry point for creating a [String] from a [Node].  All recursive
   /// calls must go through this method.
   String visit(Node node) {
-    String s = super.visit(node);
+    String s = node.accept(this);
     return decorator(node, s);
   }
 
   String visitFunctionDefinition(FunctionDefinition node) {
     String name = node.element.name;
-    namer.setReturnContinuation(node.body.returnContinuation);
     String parameters = node.parameters.map(visit).join(' ');
-    String body = indentBlock(() => visit(node.body.body));
+    String body = visit(node.body);
     return '$indentation(FunctionDefinition $name ($parameters) return\n'
         '$body)';
   }
 
   String visitFieldDefinition(FieldDefinition node) {
     String name = node.element.name;
     if (node.hasInitializer) {
-      namer.setReturnContinuation(node.body.returnContinuation);
-      String body = indentBlock(() => visit(node.body.body));
+      String body = visit(node.body);
       return '$indentation(FieldDefinition $name () return\n'
              '$body)';
     } else {
       return '$indentation(FieldDefinition $name)';
     }
   }
 
+  String visitConstructorDefinition(ConstructorDefinition node) {
+    String name = node.element.name;
+    if (name != '') name = '$name ';
+    String parameters = node.parameters.map(visit).join(' ');
+    if (node.body != null) {
+      String initializers = indentBlock(() {
+        return indentBlock(() {
+          if (node.initializers.isEmpty) {
+            return '$indentation';
+          } else {
+            return node.initializers.map(visit).join('\n');
+          }
+        });
+      });
+      String body = visit(node.body);
+      return '$indentation(ConstructorDefinition $name($parameters) return'
+          ' (\n$initializers)\n$body)';
+    } else {
+      return '$indentation(ConstructorDefinition $name($parameters) return)';
+    }
+  }
+
+  String visitFieldInitializer(FieldInitializer node) {
+    String name = node.element.name;
+    String body = visit(node.body);
+    return '$indentation(FieldInitializer $name\$body)';
+  }
+
+  String visitSuperInitializer(SuperInitializer node) {
+    String target = node.target.name;
+    String selector = node.selector.name;
+    String arguments =
+        indentBlock(() =>
+          indentBlock(() => node.arguments.map(visit).join('\n')));
+    return '$indentation(SuperInitializer $target $selector (\n$arguments)';
+  }
+
+  String visitRunnableBody(RunnableBody node) {
+    namer.setReturnContinuation(node.returnContinuation);
+    return indentBlock(() => visit(node.body));
+  }
+
   String visitLetPrim(LetPrim node) {
     String name = newValueName(node.primitive);
     String value = visit(node.primitive);
     String body = indentBlock(() => visit(node.body));
     return '$indentation(LetPrim ($name $value)\n$body)';
   }
 
   String visitLetCont(LetCont node) {
     String conts;
     bool first = true;
@@ skipping 312 matching lines @@
   void setReturnContinuation(Continuation node) {
     assert(!_names.containsKey(node) || _names[node] == 'return');
     _names[node] = 'return';
   }
 
   String getName(Node node) {
     assert(_names.containsKey(node));
     return _names[node];
   }
 }