Renaming type classes as discussed:

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 335 matching lines @@
 
  private:
   const Instance& literal_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LiteralNode);
 };
 
 
 class TypeNode : public AstNode {
  public:
-  TypeNode(intptr_t token_index, const Type& type)
+  TypeNode(intptr_t token_index, const AbstractType& type)
       : AstNode(token_index), type_(type) {
     ASSERT(type.IsZoneHandle());
     ASSERT(!type.IsNull());
     ASSERT(type.IsFinalized());
   }
 
-  const Type& type() const { return type_; }
+  const AbstractType& type() const { return type_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   DECLARE_COMMON_NODE_FUNCTIONS(TypeNode);
 
  private:
-  const Type& type_;
+  const AbstractType& type_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TypeNode);
 };
 
 
 class AssignableNode : public AstNode {
  public:
   AssignableNode(intptr_t token_index,
                  AstNode* expr,
-                 const Type& type,
+                 const AbstractType& type,
                  const String& dst_name)
       : AstNode(token_index), expr_(expr), type_(type), dst_name_(dst_name) {
     ASSERT(expr_ != NULL);
     ASSERT(type_.IsZoneHandle());
     ASSERT(!type_.IsNull());
     ASSERT(type_.IsFinalized());
     ASSERT(dst_name_.IsZoneHandle());
   }
 
   AstNode* expr() const { return expr_; }
-  const Type& type() const { return type_; }
+  const AbstractType& type() const { return type_; }
   const String& dst_name() const { return dst_name_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     expr()->Visit(visitor);
   }
 
   DECLARE_COMMON_NODE_FUNCTIONS(AssignableNode);
 
  private:
   AstNode* expr_;
-  const Type& type_;
+  const AbstractType& type_;
   const String& dst_name_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AssignableNode);
 };
 
 
 class ClosureNode : public AstNode {
  public:
   ClosureNode(intptr_t token_index,
               const Function& function,
@@ skipping 1500 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_