Step toward eliminating increment nodes, starting with increment local. Fix a bug in evaluating sid…

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"
 #include "vm/scopes.h"
 #include "vm/object.h"
 #include "vm/native_entry.h"
 #include "vm/token.h"
 
 namespace dart {
 
 #define NODE_LIST(V)                                                           \
   V(ReturnNode, "return")                                                      \
   V(LiteralNode, "literal")                                                    \
   V(TypeNode, "type")                                                          \
   V(AssignableNode, "assignable")                                              \
   V(BinaryOpNode, "binop")                                                     \
   V(StringConcatNode, "concat")                                                \
   V(ComparisonNode, "compare")                                                 \
   V(UnaryOpNode, "unaryop")                                                    \
-  V(IncrOpLocalNode, "incr local")                                             \
   V(IncrOpInstanceFieldNode, "incr instance field")                            \
   V(IncrOpIndexedNode, "incr indexed")                                         \
   V(ConditionalExprNode, "?:")                                                 \
   V(IfNode, "if")                                                              \
   V(SwitchNode, "switch")                                                      \
   V(CaseNode, "case")                                                          \
   V(WhileNode, "while")                                                        \
   V(DoWhileNode, "dowhile")                                                    \
   V(ForNode, "for")                                                            \
   V(JumpNode, "jump")                                                          \
@@ skipping 617 matching lines @@
  private:
   const Token::Kind kind_;
   AstNode* operand_;
 
   bool IsKindValid() const;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(UnaryOpNode);
 };
 
 
-class IncrOpLocalNode : public AstNode {
- public:
-  IncrOpLocalNode(intptr_t token_index,
-                  Token::Kind kind,
-                  bool prefix,
-                  const LocalVariable& local)
-      : AstNode(token_index), kind_(kind), prefix_(prefix), local_(local) {
-    ASSERT(kind_ == Token::kINCR || kind_ == Token::kDECR);
-  }
-
-  Token::Kind kind() const { return kind_; }
-  bool prefix() const { return prefix_; }
-  const LocalVariable& local() const { return local_; }
-
-  virtual void VisitChildren(AstNodeVisitor* visitor) const {}
-
-  virtual const char* Name() const;
-
-  DECLARE_COMMON_NODE_FUNCTIONS(IncrOpLocalNode);
-
- private:
-  const Token::Kind kind_;
-  const bool prefix_;
-  const LocalVariable& local_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(IncrOpLocalNode);
-};
-
-
 class IncrOpInstanceFieldNode : public AstNode {
  public:
   IncrOpInstanceFieldNode(intptr_t token_index,
                           Token::Kind kind,
                           bool prefix,
                           AstNode* receiver,
                           const String& field_name)
       : AstNode(token_index),
         kind_(kind),
         prefix_(prefix),
@@ skipping 1183 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_