Renaming type classes as discussed:

runtime/lib/error.cc

 // 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.
 
 #include "lib/error.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
 #include "vm/runtime_entry.h"
@@ skipping 196 matching lines @@
 // Arg0: index of the token of the assignment (source location).
 // Arg1: instance being assigned.
 // Arg2: type being assigned to.
 // Arg3: type arguments of the instantiator of the type being assigned to.
 // Arg4: name of instance being assigned to.
 // Return value: instance if assignable, otherwise throw a TypeError.
 DEFINE_RUNTIME_ENTRY(TypeCheck, 5) {
   ASSERT(arguments.Count() == kTypeCheckRuntimeEntry.argument_count());
   intptr_t location = Smi::CheckedHandle(arguments.At(0)).Value();
   const Instance& src_instance = Instance::CheckedHandle(arguments.At(1));
-  const Type& dst_type = Type::CheckedHandle(arguments.At(2));
+  const AbstractType& dst_type = AbstractType::CheckedHandle(arguments.At(2));
   const TypeArguments& dst_type_instantiator =
       TypeArguments::CheckedHandle(arguments.At(3));
   const String& dst_name = String::CheckedHandle(arguments.At(4));
   ASSERT(!dst_type.IsDynamicType());  // No need to check assignment.
   ASSERT(!src_instance.IsNull());  // Already checked in inlined code.
 
   const bool is_assignable =
       src_instance.IsAssignableTo(dst_type, dst_type_instantiator);
 
   if (FLAG_trace_type_checks) {
     const Type& src_type = Type::Handle(src_instance.GetType());
-    Type& instantiated_dst_type = Type::Handle(dst_type.raw());
+    AbstractType& instantiated_dst_type = AbstractType::Handle(dst_type.raw());
     if (!dst_type.IsInstantiated()) {
       // Instantiate dst_type before printing.
       instantiated_dst_type =
           dst_type.InstantiateFrom(dst_type_instantiator, 0);
     }
     OS::Print("TypeCheck: '%s' %s assignable to '%s'.\n",
               String::Handle(src_type.Name()).ToCString(),
               is_assignable ? "is" : "is not",
               String::Handle(dst_type.Name()).ToCString());
   }
   if (!is_assignable) {
     const Type& src_type = Type::Handle(src_instance.GetType());
     const String& src_type_name = String::Handle(src_type.Name());
     String& dst_type_name = String::Handle();
     if (!dst_type.IsInstantiated()) {
       // Instantiate dst_type before reporting the error.
-      const Type& instantiated_dst_type = Type::Handle(
+      const AbstractType& instantiated_dst_type = AbstractType::Handle(
           dst_type.InstantiateFrom(dst_type_instantiator, 0));
       dst_type_name = instantiated_dst_type.Name();
     } else {
       dst_type_name = dst_type.Name();
     }
     ThrowTypeError(location, src_type_name, dst_type_name, dst_name);
     UNREACHABLE();
   }
   arguments.SetReturn(src_instance);
 }
@@ skipping 26 matching lines @@
 // Arg1: rest argument array.
 // Arg2: element declaration type.
 // Arg3: type arguments of the instantiator of the element declaration type.
 // Arg4: name of object being assigned to, i.e. name of rest argument.
 // Return value: null if assignable, otherwise allocate and throw a TypeError.
 DEFINE_RUNTIME_ENTRY(RestArgumentTypeCheck, 5) {
   ASSERT(arguments.Count() ==
       kRestArgumentTypeCheckRuntimeEntry.argument_count());
   intptr_t location = Smi::CheckedHandle(arguments.At(0)).Value();
   const Array& rest_array = Array::CheckedHandle(arguments.At(1));
-  const Type& element_type = Type::CheckedHandle(arguments.At(2));
+  const AbstractType& element_type =
+      AbstractType::CheckedHandle(arguments.At(2));
   const TypeArguments& element_type_instantiator =
       TypeArguments::CheckedHandle(arguments.At(3));
   const String& rest_name = String::CheckedHandle(arguments.At(4));
   ASSERT(!element_type.IsDynamicType());  // No need to check assignment.
   ASSERT(!rest_array.IsNull());
 
   Instance& elem = Instance::Handle();
   for (intptr_t i = 0; i < rest_array.Length(); i++) {
     elem ^= rest_array.At(i);
     if (!elem.IsNull() &&
         !elem.IsAssignableTo(element_type, element_type_instantiator)) {
       // Allocate and throw a new instance of TypeError.
       char buf[256];
       OS::SNPrint(buf, sizeof(buf), "%s[%d]",
                   rest_name.ToCString(), static_cast<int>(i));
       const String& src_type_name =
           String::Handle(Type::Handle(elem.GetType()).Name());
       String& dst_type_name = String::Handle();
       if (!element_type.IsInstantiated()) {
         // Instantiate element_type before reporting the error.
-        const Type& instantiated_element_type = Type::Handle(
+        const AbstractType& instantiated_element_type = AbstractType::Handle(
             element_type.InstantiateFrom(element_type_instantiator, 0));
         dst_type_name = instantiated_element_type.Name();
       } else {
         dst_type_name = element_type.Name();
       }
       const String& dst_name = String::Handle(String::New(buf));
       ThrowTypeError(location, src_type_name, dst_type_name, dst_name);
       UNREACHABLE();
     }
   }
 }
 
 }  // namespace dart