Merge the 3 different closure nodes into a single node.

runtime/vm/ast.h

 // Copyright (c) 2011, 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 "vm/allocation.h"
 #include "vm/assert.h"
 #include "vm/growable_array.h"
@@ skipping 20 matching lines @@
   V(IfNode, "if")                                                              \
   V(SwitchNode, "switch")                                                      \
   V(CaseNode, "case")                                                          \
   V(WhileNode, "while")                                                        \
   V(DoWhileNode, "dowhile")                                                    \
   V(ForNode, "for")                                                            \
   V(JumpNode, "jump")                                                          \
   V(ArgumentListNode, "args")                                                  \
   V(ArrayNode, "array")                                                        \
   V(ClosureNode, "closure")                                                    \
-  V(ImplicitInstanceClosureNode, "implicit instance closure")                  \
-  V(ImplicitStaticClosureNode, "implicit static closure")                      \
   V(InstanceCallNode, "instance call")                                         \
   V(StaticCallNode, "static call")                                             \
   V(ClosureCallNode, "closure call")                                           \
   V(ConstructorCallNode, "constructor call")                                   \
   V(InstanceGetterNode, "instance getter call")                                \
   V(InstanceSetterNode, "instance setter call")                                \
   V(StaticGetterNode, "static getter")                                         \
   V(StaticSetterNode, "static setter")                                         \
   V(NativeBodyNode, "native body")                                             \
   V(PrimaryNode, "primary")                                                    \
@@ skipping 303 matching lines @@
 
  private:
   const Type& type_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TypeNode);
 };
 
 
 class ClosureNode : public AstNode {
  public:
-  ClosureNode(intptr_t token_index, const Function& function, LocalScope* scope)
-      : AstNode(token_index), function_(function), scope_(scope) {
+  ClosureNode(intptr_t token_index,
+              const Function& function,
+              AstNode* receiver,  // Non-null for implicit instance closures.
+              LocalScope* scope)  // Null for implicit closures.
+      : AstNode(token_index),
+        function_(function),
+        receiver_(receiver),
+        scope_(scope) {
     ASSERT(function.IsZoneHandle());
-    ASSERT(function.IsNonImplicitClosureFunction());
-    ASSERT(scope_ != NULL);
-  }
-
-  const Function& function() const { return function_; }
-  LocalScope* scope() const { return scope_; }
-
-  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
-
-  DECLARE_COMMON_NODE_FUNCTIONS(ClosureNode);
-
- private:
-  const Function& function_;
-  LocalScope* scope_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ClosureNode);
-};
-
-
-class ImplicitStaticClosureNode : public AstNode {
- public:
-  ImplicitStaticClosureNode(intptr_t token_index, const Function& function)
-      : AstNode(token_index), function_(function) {
-    ASSERT(function.IsZoneHandle());
-    ASSERT(function.IsImplicitStaticClosureFunction());
-  }
-
-  const Function& function() const { return function_; }
-
-  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
-
-  DECLARE_COMMON_NODE_FUNCTIONS(ImplicitStaticClosureNode);
-
- private:
-  const Function& function_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ImplicitStaticClosureNode);
-};
-
-
-class ImplicitInstanceClosureNode : public AstNode {
- public:
-  ImplicitInstanceClosureNode(intptr_t token_index,
-                             const Function& function,
-                             AstNode* receiver)
-      : AstNode(token_index), function_(function), receiver_(receiver) {
-    ASSERT(function.IsZoneHandle());
-    ASSERT(function.IsImplicitInstanceClosureFunction());
+    ASSERT((function.IsNonImplicitClosureFunction() &&
+            (receiver_ == NULL) && (scope_ != NULL)) ||
+           (function.IsImplicitInstanceClosureFunction() &&
+            (receiver_ != NULL) && (scope_ == NULL)) ||
+           (function.IsImplicitStaticClosureFunction() &&
+            (receiver_ == NULL) && (scope_ == NULL)));
   }
 
   const Function& function() const { return function_; }
   AstNode* receiver() const { return receiver_; }
+  LocalScope* scope() const { return scope_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     if (receiver() != NULL) {
       receiver()->Visit(visitor);
     }
   }
 
-  DECLARE_COMMON_NODE_FUNCTIONS(ImplicitInstanceClosureNode);
+  DECLARE_COMMON_NODE_FUNCTIONS(ClosureNode);
 
  private:
   const Function& function_;
   AstNode* receiver_;
+  LocalScope* scope_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ImplicitInstanceClosureNode);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(ClosureNode);
 };
 
 
 // Primary nodes hold identifiers or values (library, class or function)
 // resolved from an identifier. Primary nodes should not ever make it to the
 // code generation phase as they will be transformed into the correct call or
 // field access nodes.
 class PrimaryNode : public AstNode {
  public:
   PrimaryNode(intptr_t token_index, const Object& primary)
@@ skipping 1467 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_