Renaming type classes as discussed:

runtime/vm/class_finalizer.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 "vm/class_finalizer.h"
 
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
@@ skipping 101 matching lines @@
 }
 
 
 #if defined (DEBUG)
 // Adds all interfaces of cls into 'collected'. Duplicate entries may occur.
 // No cycles are allowed.
 void ClassFinalizer::CollectInterfaces(const Class& cls,
                                        GrowableArray<const Class*>* collected) {
   const Array& interface_array = Array::ZoneHandle(cls.interfaces());
   for (intptr_t i = 0; i < interface_array.Length(); i++) {
-    Type& interface = Type::Handle();
+    AbstractType& interface = AbstractType::Handle();
     interface ^= interface_array.At(i);
     const Class& interface_class = Class::ZoneHandle(interface.type_class());
     collected->Add(&interface_class);
     CollectInterfaces(interface_class, collected);
   }
 }
 
 
 // Collect all interfaces of the class 'cls' and check that every function
 // defined in each interface can be found in the class.
@@ skipping 152 matching lines @@
   }
   return resolved_class.raw();
 }
 
 
 // Resolve unresolved supertype (String -> Class).
 void ClassFinalizer::ResolveSuperType(const Class& cls) {
   if (cls.is_finalized()) {
     return;
   }
-  Type& super_type = Type::Handle(cls.super_type());
+  AbstractType& super_type = AbstractType::Handle(cls.super_type());
   if (super_type.IsNull()) {
     return;
   }
   // Resolve failures lead to a longjmp.
   super_type = ResolveType(cls, super_type);
   if (super_type.IsTypeParameter()) {
     String& class_name = String::Handle(cls.Name());
     String& type_parameter_name = String::Handle(super_type.Name());
     ReportError("'%s' cannot extend or implement type parameter '%s'.\n",
                 class_name.ToCString(),
@@ skipping 93 matching lines @@
     const Script& script = Script::Handle(interface.script());
     ReportWarning(script, unresolved_factory_class.token_index(),
                   "class '%s' in factory clause of interface '%s' is "
                   "missing its type parameter list.\n",
                   factory_name.ToCString(),
                   interface_name.ToCString());
     return;
   }
   String& expected_type_name = String::Handle();
   String& actual_type_name = String::Handle();
-  Type& expected_type_extends = Type::Handle();
-  Type& actual_type_extends = Type::Handle();
+  AbstractType& expected_type_extends = AbstractType::Handle();
+  AbstractType& actual_type_extends = AbstractType::Handle();
   const Array& expected_type_names =
       Array::Handle(factory_signature_class.type_parameters());
   const Array& actual_type_names =
       Array::Handle(factory_class.type_parameters());
   const TypeArray& expected_extends_array =
       TypeArray::Handle(factory_signature_class.type_parameter_extends());
   const TypeArray& actual_extends_array =
       TypeArray::Handle(factory_class.type_parameter_extends());
   for (intptr_t i = 0; !mismatch && (i < num_type_params); i++) {
     expected_type_name ^= expected_type_names.At(i);
@@ skipping 15 matching lines @@
                 "factory clause of interface '%s' and actual factory "
                 "class '%s'.\n",
                 interface_name.ToCString(),
                 factory_name.ToCString());
   }
 }
 
 
 // TODO(regis): Now that we do not resolve type parameters anymore, we could
 // make this function void and resolve the type in place.
-RawType* ClassFinalizer::ResolveType(const Class& cls, const Type& type) {
+RawAbstractType* ClassFinalizer::ResolveType(
+    const Class& cls, const AbstractType& type) {
   if (type.IsResolved()) {
     return type.raw();
   }
   if (FLAG_trace_type_finalization) {
     OS::Print("Resolve type '%s'\n", String::Handle(type.Name()).ToCString());
   }
 
   // Resolve the type class.
   if (!type.HasResolvedTypeClass()) {
     // Type parameters are always resolved in the parser in the correct
     // non-static scope or factory scope. That resolution scope is unknown here.
     // Being able to resolve a type parameter from class cls here would indicate
     // that the type parameter appeared in a static scope. Leaving the type as
     // unresolved is the correct thing to do.
 
     // Lookup the type class.
     const UnresolvedClass& unresolved_class =
         UnresolvedClass::Handle(type.unresolved_class());
     const Class& type_class =
         Class::Handle(ResolveClass(cls, unresolved_class));
 
     // Replace unresolved class with resolved type class.
-    ASSERT(type.IsParameterizedType());
-    ParameterizedType& parameterized_type = ParameterizedType::Handle();
+    ASSERT(type.IsType());
+    Type& parameterized_type = Type::Handle();
     parameterized_type ^= type.raw();
     parameterized_type.set_type_class(Object::Handle(type_class.raw()));
   }
 
   // Resolve type arguments, if any.
   const TypeArguments& arguments = TypeArguments::Handle(type.arguments());
   if (!arguments.IsNull()) {
     intptr_t num_arguments = arguments.Length();
-    Type& type_argument = Type::Handle();
+    AbstractType& type_argument = AbstractType::Handle();
     for (intptr_t i = 0; i < num_arguments; i++) {
       type_argument = arguments.TypeAt(i);
       type_argument = ResolveType(cls, type_argument);
       arguments.SetTypeAt(i, type_argument);
     }
   }
   return type.raw();
 }
 
 
 // Finalize the type argument vector 'arguments' of the type defined by the
 // class 'cls' parameterized with the type arguments 'cls_args'.
 // The vector 'cls_args' is already initialized as a subvector at the correct
 // position in the passed in 'arguments' vector.
 // The subvector 'cls_args' has length cls.NumTypeParameters() and starts at
 // offset cls.NumTypeArguments() - cls.NumTypeParameters() of the 'arguments'
 // vector.
 // Example:
 //   Declared: class C<K, V> extends B<V> { ... }
 //             class B<T> extends Array<int> { ... }
 //   Input:    C<String, double> expressed as
 //             cls = C, arguments = [null, null, String, double],
 //             i.e. cls_args = [String, double], offset = 2, length = 2.
 //   Output:   arguments = [int, double, String, double]
 void ClassFinalizer::FinalizeTypeArguments(const Class& cls,
                                            const TypeArguments& arguments) {
   ASSERT(arguments.Length() >= cls.NumTypeArguments());
-  Type& super_type = Type::Handle(cls.super_type());
+  AbstractType& super_type = AbstractType::Handle(cls.super_type());
   if (!super_type.IsNull()) {
     super_type = FinalizeType(super_type);
     cls.set_super_type(super_type);
     const Class& super_class = Class::Handle(super_type.type_class());
     const TypeArguments& super_type_args =
         TypeArguments::Handle(super_type.arguments());
     const intptr_t num_super_type_params = super_class.NumTypeParameters();
     const intptr_t offset = super_class.NumTypeArguments();
     const intptr_t super_offset = offset - num_super_type_params;
     ASSERT(offset == (cls.NumTypeArguments() - cls.NumTypeParameters()));
-    Type& super_type_arg = Type::Handle();
+    AbstractType& super_type_arg = AbstractType::Handle();
     for (intptr_t i = 0; i < num_super_type_params; i++) {
       super_type_arg = super_type_args.TypeAt(super_offset + i);
       if (!super_type_arg.IsInstantiated()) {
         super_type_arg = super_type_arg.InstantiateFrom(arguments, offset);
       }
       super_type_arg = super_type_arg.Canonicalize();
       arguments.SetTypeAt(super_offset + i, super_type_arg);
     }
     FinalizeTypeArguments(super_class, arguments);
   }
 }
 
 
 // Verify the upper bounds of the type arguments of class cls.
 void ClassFinalizer::VerifyUpperBounds(const Class& cls,
                                        const TypeArguments& arguments) {
   ASSERT(FLAG_enable_type_checks);
   ASSERT(arguments.Length() >= cls.NumTypeArguments());
   const intptr_t num_type_params = cls.NumTypeParameters();
   const intptr_t offset = cls.NumTypeArguments() - num_type_params;
-  Type& type = Type::Handle();
-  Type& type_extends = Type::Handle();
+  AbstractType& type = AbstractType::Handle();
+  AbstractType& type_extends = AbstractType::Handle();
   const TypeArguments& extends_array =
       TypeArguments::Handle(cls.type_parameter_extends());
   ASSERT((extends_array.IsNull() && (num_type_params == 0)) ||
          (extends_array.Length() == num_type_params));
   for (intptr_t i = 0; i < num_type_params; i++) {
     type_extends = extends_array.TypeAt(i);
     if (!type_extends.IsDynamicType()) {
       type = arguments.TypeAt(offset + i);
       if (type.IsInstantiated()) {
         if (!type_extends.IsInstantiated()) {
           type_extends = type_extends.InstantiateFrom(arguments, offset);
         }
         // TODO(regis): Where do we check the constraints when the type is
         // generic?
         if (!type.IsSubtypeOf(type_extends)) {
           const String& type_argument_name = String::Handle(type.Name());
           const String& class_name = String::Handle(cls.Name());
           const String& extends_name = String::Handle(type_extends.Name());
           const Script& script = Script::Handle(cls.script());
           ReportError(script, -1,
                       "type argument '%s' of class '%s' "
                       "does not extend type '%s'\n",
                       type_argument_name.ToCString(),
                       class_name.ToCString(),
                       extends_name.ToCString());
         }
       }
     }
   }
-  Type& super_type = Type::Handle(cls.super_type());
+  AbstractType& super_type = AbstractType::Handle(cls.super_type());
   if (!super_type.IsNull()) {
     ASSERT(super_type.IsFinalized());
     const Class& super_class = Class::Handle(super_type.type_class());
     VerifyUpperBounds(super_class, arguments);
   }
 }
 
 
-RawType* ClassFinalizer::FinalizeType(const Type& type) {
+RawAbstractType* ClassFinalizer::FinalizeType(const AbstractType& type) {
   ASSERT(type.IsResolved());
   if (type.IsFinalized()) {
     return type.raw();
   }
   if (FLAG_trace_type_finalization) {
     OS::Print("Finalize type '%s'\n", String::Handle(type.Name()).ToCString());
   }
 
   // At this point, we can only have a parameterized_type.
-  ParameterizedType& parameterized_type = ParameterizedType::Handle();
+  Type& parameterized_type = Type::Handle();
   parameterized_type ^= type.raw();
 
   if (parameterized_type.IsBeingFinalized()) {
     ReportError("type '%s' illegally refers to itself\n",
                 String::Handle(parameterized_type.Name()).ToCString());
   }
 
   // Mark type as being finalized in order to detect illegal self reference.
   parameterized_type.set_is_being_finalized();
 
   // Finalize the current type arguments of the type, which are still the
   // parsed type arguments.
   TypeArguments& arguments =
       TypeArguments::Handle(parameterized_type.arguments());
   if (!arguments.IsNull()) {
     intptr_t num_arguments = arguments.Length();
     for (intptr_t i = 0; i < num_arguments; i++) {
-      Type& type_argument = Type::Handle(arguments.TypeAt(i));
+      AbstractType& type_argument = AbstractType::Handle(arguments.TypeAt(i));
       type_argument = FinalizeType(type_argument);
       arguments.SetTypeAt(i, type_argument);
     }
   }
 
   // The type class does not need to be finalized in order to finalize the type,
   // however, it must at least be resolved (this was done as part of resolving
   // the type itself, a precondition to calling FinalizeType) and the upper
   // bounds of its type parameters must be finalized (done here).
   Class& type_class = Class::Handle(parameterized_type.type_class());
@@ skipping 27 matching lines @@
   }
   // The full type argument vector consists of the type arguments of the
   // super types of type_class, which may be initialized from the parsed
   // type arguments, followed by the parsed type arguments.
   if (num_type_arguments > 0) {
     const TypeArguments& full_arguments = TypeArguments::Handle(
         TypeArguments::NewTypeArray(num_type_arguments));
     // Copy the parsed type arguments at the correct offset in the full type
     // argument vector.
     const intptr_t offset = num_type_arguments - num_type_parameters;
-    Type& type = Type::Handle(Type::DynamicType());
+    AbstractType& type = AbstractType::Handle(Type::DynamicType());
     for (intptr_t i = 0; i < num_type_parameters; i++) {
       // If no type parameters were provided, a raw type is desired, so we
       // create a vector of DynamicType.
       if (!arguments.IsNull()) {
         type = arguments.TypeAt(i);
       }
       full_arguments.SetTypeAt(offset + i, type);
     }
     if (type_class.IsSignatureClass()) {
       const Function& signature_fun =
@@ skipping 14 matching lines @@
     if (FLAG_enable_type_checks) {
       VerifyUpperBounds(type_class, full_arguments);
     }
   } else {
     parameterized_type.set_is_finalized();
   }
   return parameterized_type.Canonicalize();
 }
 
 
-RawType* ClassFinalizer::FinalizeAndCanonicalizeType(const Type& type,
-                                                     String* errmsg) {
+RawAbstractType* ClassFinalizer::FinalizeAndCanonicalizeType(
+    const AbstractType& type, String* errmsg) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
-    const Type& canonical_type = Type::Handle(FinalizeType(type));
+    const AbstractType& canonical_type =
+        AbstractType::Handle(FinalizeType(type));
     isolate->set_long_jump_base(base);
     *errmsg = String::null();
     return canonical_type.raw();
   } else {
     // Error occured: Get the error message.
     isolate->set_long_jump_base(base);
     *errmsg = isolate->object_store()->sticky_error();
     return type.raw();
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 void ClassFinalizer::ResolveAndFinalizeSignature(const Class& cls,
                                                  const Function& function) {
   // Resolve result type.
-  Type& type = Type::Handle(function.result_type());
+  AbstractType& type = AbstractType::Handle(function.result_type());
   if (!type.IsResolved()) {
     if (function.IsFactory()) {
       // The signature class of the factory for a generic class holds the type
       // parameters and their upper bounds. Copy the signature class from the
       // result before it gets resolved.
       const UnresolvedClass& unresolved_type_class =
           UnresolvedClass::Handle(type.unresolved_class());
       const Class& factory_signature_class =
           Class::Handle(unresolved_type_class.factory_signature_class());
       ASSERT(!factory_signature_class.IsNull());
@@ skipping 85 matching lines @@
     }
     super_class = super_class.SuperClass();
   }
   return Class::null();
 }
 
 
 // Resolve and finalize the upper bounds of the type parameters of class cls.
 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) {
   const intptr_t num_type_params = cls.NumTypeParameters();
-  Type& type_extends = Type::Handle();
+  AbstractType& type_extends = AbstractType::Handle();
   const TypeArguments& extends_array =
       TypeArguments::Handle(cls.type_parameter_extends());
   ASSERT((extends_array.IsNull() && (num_type_params == 0)) ||
          (extends_array.Length() == num_type_params));
   for (intptr_t i = 0; i < num_type_params; i++) {
     type_extends = extends_array.TypeAt(i);
     type_extends = ResolveType(cls, type_extends);
     extends_array.SetTypeAt(i, type_extends);
     type_extends = FinalizeType(type_extends);
     extends_array.SetTypeAt(i, type_extends);
   }
 }
 
 
 void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) {
   // Note that getters and setters are explicitly listed as such in the list of
   // functions of a class, so we do not need to consider fields as implicitly
   // generating getters and setters.
   // The only compile errors we report are therefore:
   // - a getter having the same name as a method (but not a getter) in a super
   //   class or in a subclass.
   // - a setter having the same name as a method (but not a setter) in a super
   //   class or in a subclass.
   // - a static field, instance field, or static method (but not an instance
   //   method) having the same name as an instance member in a super class.
 
   // Resolve type of fields and check for conflicts in super classes.
   Array& array = Array::Handle(cls.fields());
   Field& field = Field::Handle();
-  Type& type = Type::Handle();
+  AbstractType& type = AbstractType::Handle();
   String& name = String::Handle();
   Class& super_class = Class::Handle();
   intptr_t num_fields = array.Length();
   for (intptr_t i = 0; i < num_fields; i++) {
     field ^= array.At(i);
     type = field.type();
     type = ResolveType(cls, type);
     field.set_type(type);
     type = FinalizeType(type);
     field.set_type(type);
@@ skipping 132 matching lines @@
   ASSERT(!cls.IsSignatureClass());
   if (!IsSuperCycleFree(cls)) {
     const String& name = String::Handle(cls.Name());
     const Script& script = Script::Handle(cls.script());
     ReportError(script, -1,
                 "class '%s' has a cycle in its superclass relationship.\n",
                 name.ToCString());
   }
   GrowableArray<const Class*> visited;
   ResolveInterfaces(cls, &visited);
-  Type& super_type = Type::Handle(cls.super_type());
+  AbstractType& super_type = AbstractType::Handle(cls.super_type());
   if (!super_type.IsNull()) {
     const Class& super_class = Class::Handle(super_type.type_class());
     // Finalize super class and super type.
     FinalizeClass(super_class, generating_snapshot);
     super_type = FinalizeType(super_type);
     cls.set_super_type(super_type);
   }
   if (cls.is_interface()) {
     if (cls.HasFactoryClass()) {
       const Class& factory_class = Class::Handle(cls.FactoryClass());
       // Finalize factory class.
       if (!factory_class.is_finalized()) {
         FinalizeClass(factory_class, generating_snapshot);
         // Finalizing the factory class may indirectly finalize this interface.
         if (cls.is_finalized()) {
           return;
         }
       }
     }
   }
   // Finalize interface types (but not necessarily interface classes).
   Array& interface_types = Array::Handle(cls.interfaces());
-  Type& interface_type = Type::Handle();
+  AbstractType& interface_type = AbstractType::Handle();
   for (intptr_t i = 0; i < interface_types.Length(); i++) {
     interface_type ^= interface_types.At(i);
     interface_type = FinalizeType(interface_type);
     interface_types.SetAt(i, interface_type);
   }
   // Mark as finalized before resolving type parameter upper bounds and member
   // types in order to break cycles.
   cls.Finalize();
   ResolveAndFinalizeUpperBounds(cls);
   ResolveAndFinalizeMemberTypes(cls);
@@ skipping 33 matching lines @@
     test2 = test2.SuperClass();
     if (!test2.IsNull()) {
       test2 = test2.SuperClass();
     }
   }
   // No cycles.
   return true;
 }
 
 
-bool ClassFinalizer::AddInterfaceIfUnique(GrowableArray<Type*>* interface_list,
-                                          Type* interface,
-                                          Type* conflicting) {
+bool ClassFinalizer::AddInterfaceIfUnique(
+    GrowableArray<AbstractType*>* interface_list,
+    AbstractType* interface,
+    AbstractType* conflicting) {
   String& interface_class_name = String::Handle(interface->ClassName());
   String& existing_interface_class_name = String::Handle();
   for (intptr_t i = 0; i < interface_list->length(); i++) {
     existing_interface_class_name = (*interface_list)[i]->ClassName();
     if (interface_class_name.Equals(existing_interface_class_name)) {
       // Same interface class name, now check names of type arguments.
       const String& interface_name = String::Handle(interface->Name());
       const String& existing_interface_name =
           String::Handle((*interface_list)[i]->Name());
       // TODO(regis): Revisit depending on the outcome of issue 4905685.
@@ skipping 48 matching lines @@
   }
 
   // If cls belongs to core lib or to core lib's implementation, restrictions
   // about allowed interfaces are lifted.
   const bool cls_belongs_to_core_lib =
       (cls.library() == Library::CoreLibrary()) ||
       (cls.library() == Library::CoreImplLibrary());
 
   // Resolve and check the interfaces of cls.
   visited->Add(&cls);
-  Type& interface = Type::Handle();
+  AbstractType& interface = AbstractType::Handle();
   for (intptr_t i = 0; i < super_interfaces.Length(); i++) {
     interface ^= super_interfaces.At(i);
     interface = ResolveType(cls, interface);
     super_interfaces.SetAt(i, interface);
     if (interface.IsTypeParameter()) {
       const Script& script = Script::Handle(cls.script());
       ReportError(script, -1,
                   "Type parameter '%s' cannot be used as interface\n",
                   String::Handle(interface.Name()).ToCString());
     }
@@ skipping 69 matching lines @@
             class_name.ToCString());
   const Library& library = Library::Handle(cls.library());
   if (!library.IsNull()) {
     OS::Print(" library '%s%s':\n",
               String::Handle(library.url()).ToCString(),
               String::Handle(library.private_key()).ToCString());
   } else {
     OS::Print(" (null library):\n");
   }
   const Array& interfaces_array = Array::Handle(cls.interfaces());
-  Type& interface = Type::Handle();
+  AbstractType& interface = AbstractType::Handle();
   intptr_t len = interfaces_array.Length();
   for (intptr_t i = 0; i < len; i++) {
     interface ^= interfaces_array.At(i);
     OS::Print("  %s\n", interface.ToCString());
   }
   const Array& functions_array = Array::Handle(cls.functions());
   Function& function = Function::Handle();
   len = functions_array.Length();
   for (intptr_t i = 0; i < len; i++) {
     function ^= functions_array.At(i);
@@ skipping 52 matching lines @@
   va_end(args);
   if (FLAG_warning_as_error) {
     Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
     UNREACHABLE();
   } else {
     OS::Print(message_buffer);
   }
 }
 
 }  // namespace dart