dart2js cps: Refactor CallExpressions into 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/call_structure.dart' show
@@ skipping 90 matching lines @@
   }
 
   String visitLetMutable(LetMutable node) {
     String name = visit(node.variable);
     String value = access(node.value);
     String body = indentBlock(() => visit(node.body));
     return '$indentation(LetMutable ($name $value)\n$body)';
   }
 
   String formatArguments(CallStructure call,
-                         List<Reference<Primitive>> arguments,
-                         {bool isIntercepted: false}) {
+        List<Reference<Primitive>> arguments,
+        [CallingConvention callingConvention = CallingConvention.Normal]) {
     int positionalArgumentCount = call.positionalArgumentCount;
-    if (isIntercepted) ++positionalArgumentCount;
+    if (callingConvention == CallingConvention.Intercepted) {
+      ++positionalArgumentCount;
+    }
     List<String> args =
         arguments.getRange(0, positionalArgumentCount).map(access).toList();
     List<String> argumentNames = call.getOrderedNamedArguments();
     for (int i = 0; i < argumentNames.length; ++i) {
       String name = argumentNames[i];
       String arg = access(arguments[positionalArgumentCount + i]);
       args.add("($name: $arg)");
     }
     return '(${args.join(' ')})';
   }
 
   String visitInvokeStatic(InvokeStatic node) {
     String name = node.target.name;
-    String cont = access(node.continuation);
     String args = formatArguments(node.selector.callStructure, node.arguments);
-    return '$indentation(InvokeStatic $name $args $cont)';
+    return '(InvokeStatic $name $args)';
   }
 
   String visitInvokeMethod(InvokeMethod node) {
     String name = node.selector.name;
     String rcv = access(node.receiver);
-    String cont = access(node.continuation);
     String args = formatArguments(node.selector.callStructure, node.arguments,
-        isIntercepted: node.receiverIsIntercepted);
-    return '$indentation(InvokeMethod $rcv $name $args $cont)';
+        node.callingConvention);
+    return '(InvokeMethod $rcv $name $args)';
   }
 
   String visitInvokeMethodDirectly(InvokeMethodDirectly node) {
     String receiver = access(node.receiver);
     String name = node.selector.name;
-    String cont = access(node.continuation);
-    String args = formatArguments(node.selector.callStructure, node.arguments);
-    return '$indentation(InvokeMethodDirectly $receiver $name $args $cont)';
+    String args = formatArguments(node.selector.callStructure, node.arguments,
+        node.callingConvention);
+    return '(InvokeMethodDirectly $receiver $name $args)';
   }
 
   String visitInvokeConstructor(InvokeConstructor node) {
     String className;
     // TODO(karlklose): for illegal nodes constructed for tests or unresolved
     // constructor calls in the DartBackend, we get an element with no enclosing
     // class.  Clean this up by introducing a name field to the node and
     // removing [ErroneousElement]s from the IR.
     if (node.dartType != null) {
       className = node.dartType.toString();
     } else {
       className = node.target.enclosingClass.name;
     }
     String callName;
     if (node.target.name.isEmpty) {
       callName = '${className}';
     } else {
       callName = '${className}.${node.target.name}';
     }
-    String cont = access(node.continuation);
     String args = formatArguments(node.selector.callStructure, node.arguments);
-    return '$indentation(InvokeConstructor $callName $args $cont)';
+    return '(InvokeConstructor $callName $args)';
   }
 
   String visitInvokeContinuation(InvokeContinuation node) {
     String name = access(node.continuation);
     if (node.isRecursive) name = 'rec $name';
     String args = node.arguments.map(access).join(' ');
     return '$indentation(InvokeContinuation $name ($args))';
   }
 
   String visitThrow(Throw node) {
@@ skipping 45 matching lines @@
     return '(GetMutable ${access(node.variable)})';
   }
 
   String visitSetMutable(SetMutable node) {
     String value = access(node.value);
     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.dartType}'
-                         ' ($typeArguments) $cont)';
+    return '(TypeCast $value ${node.dartType} ($typeArguments))';
   }
 
   String visitTypeTest(TypeTest node) {
     String value = access(node.value);
     String typeArguments = node.typeArguments.map(access).join(' ');
     String interceptor = node.interceptor == null
         ? ''
         : access(node.interceptor);
     return '(TypeTest $value ${node.dartType} ($typeArguments) ($interceptor))';
   }
@@ skipping 33 matching lines @@
   }
 
   String visitSetStatic(SetStatic node) {
     String element = node.element.name;
     String value = access(node.value);
     return '(SetStatic $element $value)';
   }
 
   String visitGetLazyStatic(GetLazyStatic node) {
     String element = node.element.name;
-    String cont = access(node.continuation);
-    return '$indentation(GetLazyStatic $element $cont)';
+    return '(GetLazyStatic $element)';
   }
 
   String visitCreateBox(CreateBox node) {
     return '(CreateBox)';
   }
 
   String visitCreateInstance(CreateInstance node) {
     String className = node.classElement.name;
     String arguments = node.arguments.map(access).join(' ');
     String typeInformation = node.typeInformation.map(access).join(' ');
@@ skipping 31 matching lines @@
 
   String visitApplyBuiltinMethod(ApplyBuiltinMethod node) {
     String method = node.method.toString();
     String receiver = access(node.receiver);
     String args = node.arguments.map(access).join(' ');
     return '(ApplyBuiltinMethod $method $receiver ($args))';
   }
 
   String visitForeignCode(ForeignCode node) {
     String arguments = node.arguments.map(access).join(' ');
-    String continuation = node.continuation == null ? ''
-        : ' ${access(node.continuation)}';
-    return '$indentation(JS "${node.codeTemplate.source}"'
-        ' ($arguments)$continuation)';
+    return '(JS "${node.codeTemplate.source}" ($arguments))';
   }
 
   String visitGetLength(GetLength node) {
     String object = access(node.object);
     return '(GetLength $object)';
   }
 
   String visitGetIndex(GetIndex node) {
     String object = access(node.object);
     String index = access(node.index);
     return '(GetIndex $object $index)';
   }
 
   String visitSetIndex(SetIndex node) {
     String object = access(node.object);
     String index = access(node.index);
     String value = access(node.value);
     return '(SetIndex $object $index $value)';
   }
 
   @override
   String visitAwait(Await node) {
     String value = access(node.input);
-    String continuation = access(node.continuation);
-    return '(Await $value $continuation)';
+    return '(Await $value)';
   }
 
   @override
   String visitYield(Yield node) {
     String value = access(node.input);
-    String continuation = access(node.continuation);
-    return '(Yield $value $continuation)';
+    return '(Yield $value)';
   }
 
   String visitRefinement(Refinement node) {
     String value = access(node.value);
     return '(Refinement $value ${node.type})';
   }
 }
 
 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];
   }
 }