dart2js cps: Streamline expressions and primitives.

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 135 matching lines @@
   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 GET_STATIC = "GetStatic";
   static const String TYPE_TEST = "TypeTest";
   static const String APPLY_BUILTIN_OPERATOR = "ApplyBuiltinOperator";
   static const String GET_LENGTH = "GetLength";
   static const String GET_INDEX = "GetIndex";
   static const String SET_INDEX = "SetIndex";
+  static const String GET_FIELD = "GetField";
+  static const String SET_FIELD = "SetField";
 
   // 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 78 matching lines @@
       case INVOKE_STATIC:
         return parseInvokeStatic();
       case INVOKE_METHOD_DIRECTLY:
         return parseInvokeMethodDirectly();
       case LET_PRIM:
         return parseLetPrim();
       case LET_CONT:
         return parseLetCont();
       case LET_MUTABLE:
         return parseLetMutable();
-      case SET_MUTABLE_VARIABLE:
-        return parseSetMutableVariable();
       case TYPE_CAST:
         return parseTypeCast();
-      case SET_STATIC:
-        return parseSetStatic();
       case GET_LAZY_STATIC:
         return parseGetLazyStatic();
       case UNREACHABLE:
         return parseUnreachable();
       default:
         assert(false);
     }
 
     return null;
   }
@@ skipping 269 matching lines @@
     String name = tokens.read();
     MutableVariable local = addMutableVariable(name);
     Primitive value = name2variable[tokens.read()];
     tokens.consumeEnd();
 
     Expression body = parseExpression();
     tokens.consumeEnd();
     return new LetMutable(local, value)..plug(body);
   }
 
-  /// (SetMutableVariable name value body)
+  /// (SetMutableVariable name value)
   SetMutableVariable parseSetMutableVariable() {
     tokens.consumeStart(SET_MUTABLE_VARIABLE);
 
     MutableVariable local = name2variable[tokens.read()];
     Primitive value = name2variable[tokens.read()];
     assert(value != null);
 
-    Expression body = parseExpression();
-
     tokens.consumeEnd();
-    return new SetMutableVariable(local, value)
-                  ..plug(body);
+    return new SetMutableVariable(local, value);
   }
 
   /// (TypeCast value type args cont)
   TypeCast parseTypeCast() {
     tokens.consumeStart(TYPE_CAST);
 
     Primitive value = name2variable[tokens.read()];
     assert(value != null);
 
     dart_types.DartType type = new DummyNamedType(tokens.read());
@@ skipping 61 matching lines @@
   /// (SetIndex object index value)
   SetIndex parseSetIndex() {
     tokens.consumeStart(SET_INDEX);
     Primitive object = name2variable[tokens.read()];
     Primitive index = name2variable[tokens.read()];
     Primitive value = name2variable[tokens.read()];
     tokens.consumeEnd();
     return new SetIndex(object, index, value);
   }
 
-  /// (SetStatic field value body)
+  /// (SetStatic field value)
   SetStatic parseSetStatic() {
     tokens.consumeStart(SET_STATIC);
 
     Element fieldElement = new DummyElement(tokens.read());
     Primitive value = name2variable[tokens.read()];
     assert(value != null);
-    Expression body = parseExpression();
 
     tokens.consumeEnd();
-    return new SetStatic(fieldElement, value, null)..plug(body);
+    return new SetStatic(fieldElement, value, null);
   }
 
   /// (GetLazyStatic field cont)
   GetLazyStatic parseGetLazyStatic() {
     tokens.consumeStart(GET_LAZY_STATIC);
 
     Element fieldElement = new DummyElement(tokens.read());
     Continuation cont = name2variable[tokens.read()];
     assert(cont != null);
 
@@ skipping 49 matching lines @@
       case TYPE_TEST:
         return parseTypeTest();
       case APPLY_BUILTIN_OPERATOR:
         return parseApplyBuiltinOperator();
       case GET_LENGTH:
         return parseGetLength();
       case GET_INDEX:
         return parseGetIndex();
       case SET_INDEX:
         return parseSetIndex();
+      case SET_MUTABLE_VARIABLE:
+        return parseSetMutableVariable();
+      case SET_STATIC:
+        return parseSetStatic();
+      case GET_FIELD:
+        return parseGetField();
+      case SET_FIELD:
+        return parseSetField();
       default:
         assert(false);
     }
 
     return null;
   }
 
   /// (Constant (constant))
   Constant parseConstant() {
     tokens.consumeStart(CONSTANT);
@@ skipping 115 matching lines @@
 
   /// (GetStatic field)
   GetStatic parseGetStatic() {
     tokens.consumeStart(GET_STATIC);
 
     Element field = new DummyElement(tokens.read());
 
     tokens.consumeEnd();
     return new GetStatic(field, null);
   }
+
+  /// (GetField object field)
+  GetField parseGetField() {
+    tokens.consumeStart(GET_FIELD);
+
+    Primitive object = name2variable[tokens.read()];
+    Element field = new DummyElement(tokens.read());
+
+    tokens.consumeEnd();
+    return new GetField(object, field);
+  }
+
+  /// (SetField object field value)
+  SetField parseSetField() {
+    tokens.consumeStart(SET_FIELD);
+
+    Primitive object = name2variable[tokens.read()];
+    Element field = new DummyElement(tokens.read());
+    Primitive value = name2variable[tokens.read()];
+
+    tokens.consumeEnd();
+    return new SetField(object, field, value);
+  }

[asgerf, 2015/07/20 13:35:23]

These cases we simply missing from the parser before. They are not really
related to the change.

 }