dart2js cps: Remove dart2dart from cps pipeline and clean up.

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';
 
@@ skipping 36 matching lines @@
   }
 
   String formatThisParameter(Parameter thisParameter) {
     return thisParameter == null ? '()' : '(${visit(thisParameter)})';
   }
 
   String visitFunctionDefinition(FunctionDefinition node) {
     String name = node.element.name;
     String thisParameter = formatThisParameter(node.thisParameter);
     String parameters = node.parameters.map(visit).join(' ');
-    String body = visit(node.body);
+    namer.setReturnContinuation(node.returnContinuation);
+    String body = indentBlock(() => visit(node.body));
     return '$indentation'
         '(FunctionDefinition $name $thisParameter ($parameters) return\n'
         '$body)';
   }
 
-  String visitFieldDefinition(FieldDefinition node) {
-    String name = node.element.name;
-    if (node.body != null) {
-      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 thisParameter = formatThisParameter(node.thisParameter);
-    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$thisParameter ($parameters) return'
-          ' (\n$initializers)\n$body)';
-    } else {
-      return '$indentation'
-          '(ConstructorDefinition $name$thisParameter ($parameters) return)';
-    }
-  }
-
-  String visitFieldInitializer(FieldInitializer node) {
-    String name = node.element.name;
-    String body = visit(node.body);
-    return '$indentation(FieldInitializer $name\n$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 visitBody(Body 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 127 matching lines @@
     String falseCont = access(node.falseContinuation);
     return '$indentation(Branch $condition $trueCont $falseCont)';
   }
 
   String visitConstant(Constant node) {
     String value =
         node.expression.value.accept(new ConstantStringifier(), null);
     return '(Constant $value)';
   }
 
-  String visitReifyTypeVar(ReifyTypeVar node) {
-    return '$indentation(ReifyTypeVar ${node.typeVariable.name})';
-  }
-
   String visitCreateFunction(CreateFunction node) {
     String function =
         indentBlock(() => indentBlock(() => visit(node.definition)));
     return '(CreateFunction\n$function)';
   }
 
   String visitContinuation(Continuation node) {
     // Continuations are visited directly in visitLetCont.
     return '(Unexpected Continuation)';
   }
@@ skipping 22 matching lines @@
     String values = node.values.map(access).join(' ');
     return '(LiteralList ($values))';
   }
 
   String visitLiteralMap(LiteralMap node) {
     String keys = node.entries.map((e) => access(e.key)).join(' ');
     String values = node.entries.map((e) => access(e.value)).join(' ');
     return '(LiteralMap ($keys) ($values))';
   }
 
-  String visitDeclareFunction(DeclareFunction node) {
-    String name = visit(node.variable);
-    String function = indentBlock(() => visit(node.definition));
-    String body = indentBlock(() => visit(node.body));
-    return '$indentation(DeclareFunction $name =\n'
-           '$function in\n'
-           '$body)';
-  }
-
   String visitIsTrue(IsTrue node) {
     String value = access(node.value);
     return '(IsTrue $value)';
   }
 
   String visitSetField(SetField node) {
     String object = access(node.object);
     String field = node.field.name;
     String value = access(node.value);
     String body = indentBlock(() => visit(node.body));
@@ skipping 175 matching lines @@
   void setReturnContinuation(Continuation node) {
     assert(!_names.containsKey(node) || _names[node] == 'return');
     _names[node] = 'return';
   }
 
   String getName(Node node) {
     if (!_names.containsKey(node)) return 'MISSING_NAME';
     return _names[node];
   }
 }