Make continuations last in CPS IR constructors.

tests/compiler/dart2js/backend_dart/sexpr_unstringifier.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.
 
 // SExpressionUnstringifier implements the inverse operation to
 // [SExpressionStringifier].
 
 library sexpr_unstringifier;
 
 import 'package:compiler/src/constants/expressions.dart'
@@ skipping 127 matching lines @@
   static const String SET_MUTABLE_VARIABLE = "SetMutableVariable";
   static const String TYPE_OPERATOR = "TypeOperator";
 
   // Primitives
   static const String CONSTANT = "Constant";
   static const String CREATE_FUNCTION = "CreateFunction";
   static const String GET_MUTABLE_VARIABLE = "GetMutableVariable";
   static const String LITERAL_LIST = "LiteralList";
   static const String LITERAL_MAP = "LiteralMap";
   static const String REIFY_TYPE_VAR = "ReifyTypeVar";
-  static const String THIS = "This";
 
   // Other
   static const String FUNCTION_DEFINITION = "FunctionDefinition";
   static const String IS_TRUE = "IsTrue";
 
   // Constants
   static const String BOOL = "Bool";
   static const String DOUBLE = "Double";
   static const String INT = "Int";
   static const String NULL = "Null";
@@ skipping 24 matching lines @@
   /// Returns a new named dummy selector with a roughly appropriate kind.
   Selector dummySelector(String name, int argumentCount) {
     SelectorKind kind;
     if (name == "[]") {
       kind = SelectorKind.INDEX;
     } else if (Elements.isOperatorName(name)) {
       kind = SelectorKind.OPERATOR;
     } else {
       kind = SelectorKind.CALL;
     }
-    return new Selector(kind, new PublicName(name), 
+    return new Selector(kind, new PublicName(name),
         new CallStructure.unnamed(argumentCount));
   }
 
   /// Returns the tokens in s. Note that string literals are not necessarily
   /// preserved; for instance, "(literalString)" is transformed to
   /// " ( literalString ) ".
   Tokens tokenize(String s) =>
       new Tokens(
           s.replaceAll("(", " ( ")
            .replaceAll(")", " ) ")
@@ skipping 145 matching lines @@
   /// (ConcatenateStrings (args) cont)
   ConcatenateStrings parseConcatenateStrings() {
     tokens.consumeStart(CONCATENATE_STRINGS);
 
     List<Primitive> args = parsePrimitiveList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
-    return new ConcatenateStrings(cont, args);
+    return new ConcatenateStrings(args, cont);
   }
 
   /// (DeclareFunction name = function in body)
   DeclareFunction parseDeclareFunction() {
     tokens.consumeStart(DECLARE_FUNCTION);
 
     // name =
     MutableVariable local = addMutableVariable(tokens.read());
     tokens.read("=");
 
@@ skipping 19 matching lines @@
     dart_types.DartType type = new DummyNamedType(split[0]);
     Element element = new DummyElement((split.length == 1) ? "" : split[1]);
 
     List<Primitive> args = parsePrimitiveList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     Selector selector = dummySelector(constructorName, args.length);
-    return new InvokeConstructor(type, element, selector, cont, args);
+    return new InvokeConstructor(type, element, selector, args, cont);
   }
 
   /// (InvokeContinuation rec? name (args))
   InvokeContinuation parseInvokeContinuation() {
     tokens.consumeStart(INVOKE_CONTINUATION);
     String name = tokens.read();
     bool isRecursive = name == "rec";
     if (isRecursive) name = tokens.read();
 
     Continuation cont = name2variable[name];
@@ skipping 14 matching lines @@
 
     String methodName = tokens.read();
 
     List<Primitive> args = parsePrimitiveList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     Selector selector = dummySelector(methodName, args.length);
-    return new InvokeMethod(receiver, selector, cont, args);
+    return new InvokeMethod(receiver, selector, args, cont);
   }
 
   /// (InvokeStatic method (args) cont)
   InvokeStatic parseInvokeStatic() {
     tokens.consumeStart(INVOKE_STATIC);
 
     String methodName = tokens.read();
 
     List<Primitive> args = parsePrimitiveList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     Entity entity = new DummyEntity(methodName);
     Selector selector = dummySelector(methodName, args.length);
 
     tokens.consumeEnd();
-    return new InvokeStatic(entity, selector, cont, args, null);
+    return new InvokeStatic(entity, selector, args, cont, null);
   }
 
   /// (InvokeMethodDirectly receiver method (args) cont)
   InvokeMethodDirectly parseInvokeMethodDirectly() {
     tokens.consumeStart(INVOKE_METHOD_DIRECTLY);
 
     Definition receiver = name2variable[tokens.read()];
     assert(receiver != null);
 
     String methodName = tokens.read();
 
     List<Primitive> args = parsePrimitiveList();
 
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
     tokens.consumeEnd();
     Element element = new DummyElement(methodName);
     Selector selector = dummySelector(methodName, args.length);
-    return new InvokeMethodDirectly(receiver, element, selector, cont, args);
+    return new InvokeMethodDirectly(receiver, element, selector, args, cont);
   }
 
   // (rec? name (args) body)
   Continuation parseContinuation() {
     // (rec? name
     tokens.consumeStart();
     String name = tokens.read();
     bool isRecursive = name == "rec";
     if (isRecursive) name = tokens.read();
 
@@ skipping 112 matching lines @@
       case CREATE_FUNCTION:
         return parseCreateFunction();
       case GET_MUTABLE_VARIABLE:
         return parseGetMutableVariable();
       case LITERAL_LIST:
         return parseLiteralList();
       case LITERAL_MAP:
         return parseLiteralMap();
       case REIFY_TYPE_VAR:
         return parseReifyTypeVar();
-      case THIS:
-        return parseThis();
       default:
         assert(false);
     }
 
     return null;
   }
 
   /// (Constant (constant))
   Constant parseConstant() {
     tokens.consumeStart(CONSTANT);
@@ skipping 105 matching lines @@
 
   /// (ReifyTypeVar type)
   ReifyTypeVar parseReifyTypeVar() {
     tokens.consumeStart(REIFY_TYPE_VAR);
 
     TypeVariableElement type = new DummyElement(tokens.read());
 
     tokens.consumeEnd();
     return new ReifyTypeVar(type);
   }
-
-  /// (This)
-  This parseThis() {
-    tokens.consumeStart(THIS);
-    tokens.consumeEnd();
-    return new This();
-  }
 }