| Index: tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
|
| diff --git a/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart b/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
|
| index aa2c1aca05f45ae2d7e7b86815d6d5bb0fd7c310..2b2d6ec85536b48bfefb58400255b35bb957da06 100644
|
| --- a/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
|
| +++ b/tests/compiler/dart2js/backend_dart/sexpr_unstringifier.dart
|
| @@ -145,7 +145,6 @@ class SExpressionUnstringifier {
|
| 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";
|
| @@ -190,7 +189,7 @@ class SExpressionUnstringifier {
|
| } else {
|
| kind = SelectorKind.CALL;
|
| }
|
| - return new Selector(kind, new PublicName(name),
|
| + return new Selector(kind, new PublicName(name),
|
| new CallStructure.unnamed(argumentCount));
|
| }
|
|
|
| @@ -356,7 +355,7 @@ class SExpressionUnstringifier {
|
| assert(cont != null);
|
|
|
| tokens.consumeEnd();
|
| - return new ConcatenateStrings(cont, args);
|
| + return new ConcatenateStrings(args, cont);
|
| }
|
|
|
| /// (DeclareFunction name = function in body)
|
| @@ -396,7 +395,7 @@ class SExpressionUnstringifier {
|
|
|
| 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))
|
| @@ -431,7 +430,7 @@ class SExpressionUnstringifier {
|
|
|
| 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)
|
| @@ -449,7 +448,7 @@ class SExpressionUnstringifier {
|
| 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)
|
| @@ -469,7 +468,7 @@ class SExpressionUnstringifier {
|
| 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)
|
| @@ -602,8 +601,6 @@ class SExpressionUnstringifier {
|
| return parseLiteralMap();
|
| case REIFY_TYPE_VAR:
|
| return parseReifyTypeVar();
|
| - case THIS:
|
| - return parseThis();
|
| default:
|
| assert(false);
|
| }
|
| @@ -729,11 +726,4 @@ class SExpressionUnstringifier {
|
| tokens.consumeEnd();
|
| return new ReifyTypeVar(type);
|
| }
|
| -
|
| - /// (This)
|
| - This parseThis() {
|
| - tokens.consumeStart(THIS);
|
| - tokens.consumeEnd();
|
| - return new This();
|
| - }
|
| }
|
|
|