Remove pseudo-node from LoadLocalNode and replace it with a proper AST node.

runtime/vm/ast.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 37 matching lines @@
   V(PrimaryNode, "primary")                                                    \
   V(LoadLocalNode, "load local")                                               \
   V(StoreLocalNode, "store local")                                             \
   V(LoadInstanceFieldNode, "load field")                                       \
   V(StoreInstanceFieldNode, "store field")                                     \
   V(LoadStaticFieldNode, "load static field")                                  \
   V(StoreStaticFieldNode, "store static field")                                \
   V(LoadIndexedNode, "load indexed")                                           \
   V(StoreIndexedNode, "store indexed")                                         \
   V(SequenceNode, "seq")                                                       \
+  V(CommaNode, "comma")                                                        \
   V(CatchClauseNode, "catch clause block")                                     \
   V(TryCatchNode, "try catch block")                                           \
   V(ThrowNode, "throw")                                                        \
   V(InlinedFinallyNode, "inlined finally")                                     \
 
 
 #define DEFINE_FORWARD_DECLARATION(type, name) class type;
 NODE_LIST(DEFINE_FORWARD_DECLARATION)
 #undef DEFINE_FORWARD_DECLARATION
 
@@ skipping 105 matching lines @@
 
  private:
   LocalScope* scope_;
   GrowableArray<AstNode*> nodes_;
   SourceLabel* label_;
 
   DISALLOW_COPY_AND_ASSIGN(SequenceNode);
 };
 
 
+// Comma node represents a pair of expressions evaluated in sequence
+// and return the value of the second expression.
+class CommaNode : public AstNode {
+ public:
+  CommaNode(intptr_t token_pos,

[Kevin Millikin (Google), 2013/05/28 09:13:26]

As discussed offline, I think that this node should allow a sequence of AstNode
children.  This is a case where the representation should allow flat sequences
(e.g., supporting cascades).

[Florian Schneider, 2013/05/28 09:22:35]

Agree. I'll do that in a separate CL.

+            AstNode* first,
+            AstNode* second)
+      : AstNode(token_pos),
+        first_(first),
+        second_(second) { }
+
+  AstNode* first() const { return first_; }
+  AstNode* second() const { return second_; }
+
+  void VisitChildren(AstNodeVisitor* visitor) const {
+    first_->Visit(visitor);
+    second_->Visit(visitor);
+  }
+
+  DECLARE_COMMON_NODE_FUNCTIONS(CommaNode);
+
+ private:
+  AstNode* first_;
+  AstNode* second_;
+
+  DISALLOW_COPY_AND_ASSIGN(CommaNode);
+};
+
+
 class CloneContextNode : public AstNode {
  public:
   explicit CloneContextNode(intptr_t token_pos)
     : AstNode(token_pos) {
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   DECLARE_COMMON_NODE_FUNCTIONS(CloneContextNode);
 
@@ skipping 762 matching lines @@
   Token::Kind kind_;
   SourceLabel* label_;
   GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(JumpNode);
 };
 
 
 class LoadLocalNode : public AstNode {
  public:
   LoadLocalNode(intptr_t token_pos, const LocalVariable* local)
-      : AstNode(token_pos), local_(*local), pseudo_(NULL) {
-    ASSERT(local != NULL);
-  }
-
-  // A local variable load can optionally be a pair of an arbitrary 'pseudo'
-  // AST node followed by the load.  The pseudo node is evaluated for its
-  // side-effects and the value of the expression is the value of the local
-  // load after evaluating the pseudo node.  Pseudo nodes are used, e.g., in
-  // the desugaring of postincrement and cascade expressions.
-  LoadLocalNode(intptr_t token_pos, const LocalVariable* local, AstNode* pseudo)
-      : AstNode(token_pos), local_(*local), pseudo_(pseudo) {
+      : AstNode(token_pos), local_(*local) {
     ASSERT(local != NULL);
   }
 
   const LocalVariable& local() const { return local_; }
-  AstNode* pseudo() const { return pseudo_; }  // Can be NULL.
-  bool HasPseudo() const { return pseudo_ != NULL; }
 
-  virtual void VisitChildren(AstNodeVisitor* visitor) const {
-    if (HasPseudo()) {
-      pseudo()->Visit(visitor);
-    }
-  }
+  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual const Instance* EvalConstExpr() const;
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   DECLARE_COMMON_NODE_FUNCTIONS(LoadLocalNode);
 
  private:
   const LocalVariable& local_;
-  AstNode* pseudo_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LoadLocalNode);
 };
 
 
 class StoreLocalNode : public AstNode {
  public:
   StoreLocalNode(intptr_t token_pos, const LocalVariable* local, AstNode* value)
       : AstNode(token_pos),  local_(*local), value_(value) {
     ASSERT(local != NULL);
@@ skipping 724 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_