Renaming type classes as discussed:

runtime/vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "vm/assert.h"
 #include "vm/globals.h"
 #include "vm/snapshot.h"
 
 #include "include/dart_api.h"
 
 namespace dart {
 
 // Macrobatics to define the Object hierarchy of VM implementation classes.
 #define CLASS_LIST_NO_OBJECT(V)                                                \
   V(Class)                                                                     \
   V(UnresolvedClass)                                                           \
-  V(Type)                                                                      \
-    V(ParameterizedType)                                                       \
+  V(AbstractType)                                                              \
+    V(Type)                                                       \
     V(TypeParameter)                                                           \
     V(InstantiatedType)                                                        \
   V(TypeArguments)                                                             \
     V(TypeArray)                                                               \
     V(InstantiatedTypeArguments)                                               \
   V(Function)                                                                  \
   V(Field)                                                                     \
   V(TokenStream)                                                               \
   V(Script)                                                                    \
   V(Library)                                                                   \
   V(LibraryPrefix)                                                             \
   V(Code)                                                                      \
   V(Instructions)                                                              \
   V(PcDescriptors)                                                             \
   V(ExceptionHandlers)                                                         \
   V(Context)                                                                   \
   V(ContextScope)                                                              \
   V(UnhandledException)                                                        \
-  V(ApiError)                                                                \
+  V(ApiError)                                                                  \
   V(Instance)                                                                  \
     V(Number)                                                                  \
       V(Integer)                                                               \
         V(Smi)                                                                 \
         V(Mint)                                                                \
         V(Bigint)                                                              \
       V(Double)                                                                \
     V(String)                                                                  \
       V(OneByteString)                                                         \
       V(TwoByteString)                                                         \
@@ skipping 164 matching lines @@
     kFinalized,     // All checks completed, class ready for use.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Class);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawArray* functions_;
   RawArray* fields_;
-  RawArray* interfaces_;  // Array of Type.
+  RawArray* interfaces_;  // Array of AbstractType.

[regis, 2011/12/01 04:24:07]

Could be RawTypeArguments*.

   RawScript* script_;
   RawLibrary* library_;
   RawArray* type_parameters_;  // Array of String.
   RawTypeArray* type_parameter_extends_;  // DynamicType if no extends clause.
-  RawType* super_type_;
+  RawAbstractType* super_type_;

[regis, 2011/12/01 04:24:07]

Could be RawType*.

[srdjan, 2011/12/01 17:48:42]

Done in next CL.

   RawObject* factory_class_;  // UnresolvedClass (until finalization) or Class.
   RawFunction* signature_function_;  // Associated function for signature class.
   RawArray* functions_cache_;  // See class FunctionsCache.
   RawArray* constants_;  // Canonicalized values of this class.
   RawArray* canonical_types_;  // Canonicalized types of this class.
   RawCode* allocation_stub_;  // Stub code for allocation of instances.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->allocation_stub_);
   }
 
@@ skipping 21 matching lines @@
   RawString* qualifier_;  // Qualifier for the identifier.
   RawString* ident_;  // Name of the unresolved identifier.
   RawClass* factory_signature_class_;  // Expected type parameters for factory.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->factory_signature_class_);
   }
   intptr_t token_index_;
 };
 
 
-class RawType : public RawObject {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Type);
+class RawAbstractType : public RawObject {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(AbstractType);
 
   friend class ObjectStore;
 };
 
 
-class RawParameterizedType : public RawType {
+class RawType : public RawAbstractType {
  private:
   enum TypeState {
     kAllocated,  // Initial state.
     kBeingFinalized,  // In the process of being finalized.
     kFinalized,  // Type ready for use.
   };
 
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ParameterizedType);
+  RAW_HEAP_OBJECT_IMPLEMENTATION(Type);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_class_);
   }
   RawObject* type_class_;  // Either resolved class or unresolved class.
   RawTypeArguments* arguments_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->arguments_); }
   int8_t type_state_;
 };
 
 
-class RawTypeParameter : public RawType {
+class RawTypeParameter : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   intptr_t index_;
 };
 
 
-class RawInstantiatedType : public RawType {
+class RawInstantiatedType : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(InstantiatedType);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->uninstantiated_type_);
   }
-  RawType* uninstantiated_type_;
+  RawAbstractType* uninstantiated_type_;
   RawTypeArguments* instantiator_type_arguments_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
   }
 };
 
 
 class RawTypeArguments : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
 };
 
 
 class RawTypeArray : public RawTypeArguments {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArray);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->length_);
   }
   RawSmi* length_;
 
   // Variable length data follows here.
-  RawType* types_[0];
+  RawAbstractType* types_[0];
   RawObject** to(intptr_t length) {
     return reinterpret_cast<RawObject**>(&ptr()->types_[length - 1]);
   }
 };
 
 
 class RawInstantiatedTypeArguments : public RawTypeArguments {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(InstantiatedTypeArguments);
 
@@ skipping 23 matching lines @@
     kImplicitSetter,  // represents an implicit setter for fields.
     kConstImplicitGetter,  // represents an implicit const getter for fields.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Function);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawClass* owner_;
-  RawType* result_type_;
+  RawAbstractType* result_type_;
   RawArray* parameter_types_;
   RawArray* parameter_names_;
   RawCode* code_;  // Compiled code for the function.
   RawCode* unoptimized_code_;  // Unoptimized code, keep it after optimization.
   RawContextScope* context_scope_;
   RawFunction* parent_function_;  // Enclosing function of this local function.
   RawClass* signature_class_;  // Only for closure or signature function.
   RawCode* closure_allocation_stub_;  // Stub code for allocation of closures.
   RawFunction* implicit_closure_function_;  // Implicit closure function.
   RawObject** to() {
@@ skipping 11 matching lines @@
   bool is_optimizable_;
 };
 
 
 class RawField : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Field);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawClass* owner_;
-  RawType* type_;
+  RawAbstractType* type_;
   RawInstance* value_;  // Offset for instance and value for static fields.
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->value_); }
 
   intptr_t token_index_;
   bool is_static_;
   bool is_final_;
   bool has_initializer_;
 };
 
 
@@ skipping 165 matching lines @@
 
 class RawContextScope : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ContextScope);
 
   // TODO(iposva): Switch to convential enum offset based structure to avoid
   // alignment mishaps.
   struct VariableDesc {
     RawSmi* token_index;
     RawString* name;
     RawBool* is_final;
-    RawType* type;
+    RawAbstractType* type;
     RawSmi* context_index;
     RawSmi* context_level;
   };
 
   intptr_t num_variables_;
 
   // Variable length data follows here.
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->data_[0]); }
   RawObject* data_[0];
   RawObject** to(intptr_t num_vars) {
@@ skipping 239 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_