dart2js cps: Streamline expressions and primitives.

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';
 import '../universe/universe.dart' show Selector, CallStructure;
@@ skipping 200 matching lines @@
     String function =
         indentBlock(() => indentBlock(() => visit(node.definition)));
     return '(CreateFunction\n$function)';
   }
 
   String visitContinuation(Continuation node) {
     // Continuations are visited directly in visitLetCont.
     return '(Unexpected Continuation)';
   }
 
-  String visitGetMutableVariable(GetMutableVariable node) {
-    return '(GetMutableVariable ${access(node.variable)})';
+  String visitGetMutable(GetMutable node) {
+    return '(GetMutable ${access(node.variable)})';
   }
 
-  String visitSetMutableVariable(SetMutableVariable node) {
+  String visitSetMutable(SetMutable node) {
     String value = access(node.value);
-    String body = indentBlock(() => visit(node.body));
-    return '$indentation(SetMutableVariable ${access(node.variable)} '
-           '$value\n$body)';
+    return '(SetMutable ${access(node.variable)} $value)';
   }
 
   String visitTypeCast(TypeCast node) {
     String value = access(node.value);
     String cont = access(node.continuation);
     String typeArguments = node.typeArguments.map(access).join(' ');
     return '$indentation(TypeCast $value ${node.type} ($typeArguments) $cont)';
   }
 
   String visitTypeTest(TypeTest node) {
@@ skipping 15 matching lines @@
 
   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));
-    return '$indentation(SetField $object $field $value)\n$body';
+    return '(SetField $object $field $value)';
   }
 
   String visitGetField(GetField node) {
     String object = access(node.object);
     String field = node.field.name;
     return '(GetField $object $field)';
   }
 
   String visitGetStatic(GetStatic node) {
     String element = node.element.name;
     return '(GetStatic $element)';
   }
 
   String visitSetStatic(SetStatic node) {
     String element = node.element.name;
     String value = access(node.value);
-    String body = indentBlock(() => visit(node.body));
-    return '$indentation(SetStatic $element $value\n$body)';
+    return '(SetStatic $element $value)';
   }
 
   String visitGetLazyStatic(GetLazyStatic node) {
     String element = node.element.name;
     String cont = access(node.continuation);
     return '$indentation(GetLazyStatic $element $cont)';
   }
 
   String visitCreateBox(CreateBox node) {
     return '(CreateBox)';
@@ skipping 33 matching lines @@
     String args = node.arguments.map(access).join(' ');
     return '(CreateInvocationMirror $selector ($args))';
   }
 
   String visitApplyBuiltinOperator(ApplyBuiltinOperator node) {
     String operator = node.operator.toString();
     String args = node.arguments.map(access).join(' ');
     return '(ApplyBuiltinOperator $operator ($args))';
   }
 
-  @override
   String visitForeignCode(ForeignCode node) {
     String arguments = node.arguments.map(access).join(' ');
     String continuation = node.continuation == null ? ''
         : ' ${access(node.continuation)}';
     return '(JS ${node.type} ${node.codeTemplate} ($arguments)$continuation)';
   }
 
-  @override
   String visitGetLength(GetLength node) {
     String object = access(node.object);
     return '(GetLength $object)';
   }
 
-  @override
   String visitGetIndex(GetIndex node) {
     String object = access(node.object);
     String index = access(node.index);
     return '(GetIndex $object $index)';
   }
 
-  @override
   String visitSetIndex(SetIndex node) {
     String object = access(node.object);
     String index = access(node.index);
     String value = access(node.value);
     return '(SetIndex $object $index $value)';
   }
 }
 
 class ConstantStringifier extends ConstantValueVisitor<String, Null> {
   // Some of these methods are unimplemented because we haven't had a need
@@ skipping 100 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];
   }
 }