Clean up FunctionDefinition in the IR S-expression representation.

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 '../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 {
   final _Namer namer = new _Namer();
 
-  String newValueName(Node node) => namer.defineValueName(node);
-  String newContinuationName(Node node) => namer.defineContinuationName(node);
+  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.useElementName(node);
+    return namer.nameParameter(node);
   }
 
   String visitClosureVariable(ClosureVariable node) {
     return namer.getName(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);
-    return (decorator == null) ? s : decorator(node, s);
+    return decorator(node, s);
   }
 
   String visitFunctionDefinition(FunctionDefinition node) {
     String name = node.element.name;
-    namer.useReturnName(node.returnContinuation);
-    String closureVariables = node.closureVariables.isEmpty
-        ? ''
-        : '{${node.closureVariables.map(namer.defineClosureName).join(' ')}} ';
+    namer.setReturnContinuation(node.returnContinuation);
+    String closureVariables =
+        node.closureVariables.map(namer.nameClosureVariable).join(' ');
     String parameters = node.parameters.map(visit).join(' ');
     String body = indentBlock(() => visit(node.body));
-    return '$indentation(FunctionDefinition $name $closureVariables'
-           '($parameters return)\n$body)';
+    return '$indentation(FunctionDefinition $name ($parameters) return'
+        ' ($closureVariables)\n$body)';
   }
 
   String visitFieldDefinition(FieldDefinition node) {
     String name = node.element.name;
     if (node.hasInitializer) {
-      namer.useReturnName(node.returnContinuation);
+      namer.setReturnContinuation(node.returnContinuation);
       String body = indentBlock(() => visit(node.body));
       return '$indentation(FieldDefinition $name (return)\n'
              '$body)';
     } else {
       return '$indentation(FieldDefinition $name)';
     }
   }
 
   String visitLetPrim(LetPrim node) {
     String name = newValueName(node.primitive);
@@ skipping 156 matching lines @@
     String right = access(node.right);
     return '(Identical $left $right)';
   }
 }
 
 class _Namer {
   final Map<Node, String> _names = <Node, String>{};
   int _valueCounter = 0;
   int _continuationCounter = 0;
 
-  String useElementName(Parameter parameter) {
+  String nameParameter(Parameter parameter) {
     assert(!_names.containsKey(parameter));
     return _names[parameter] = parameter.hint.name;
   }
 
-  String defineClosureName(ClosureVariable variable) {
+  String nameClosureVariable(ClosureVariable variable) {
     assert(!_names.containsKey(variable));
     return _names[variable] = variable.hint.name;
   }
 
-  String defineContinuationName(Node node) {
+  String nameContinuation(Continuation node) {
     assert(!_names.containsKey(node));
     return _names[node] = 'k${_continuationCounter++}';
   }
 
-  String defineValueName(Node node) {
+  String nameValue(Primitive node) {
     assert(!_names.containsKey(node));
     return _names[node] = 'v${_valueCounter++}';
   }
 
-  String useReturnName(Continuation node) {
+  void setReturnContinuation(Continuation node) {
     assert(!_names.containsKey(node) || _names[node] == 'return');
-    return _names[node] = 'return';
+    _names[node] = 'return';
   }
 
   String getName(Node node) {
     assert(_names.containsKey(node));
     return _names[node];
   }
 }