Renaming type classes as discussed:

runtime/vm/object_store.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/object_store.h"
 
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 ObjectStore::ObjectStore()
   : object_class_(Class::null()),
-    function_interface_(ParameterizedType::null()),
-    number_interface_(ParameterizedType::null()),
-    int_interface_(ParameterizedType::null()),
+    function_interface_(Type::null()),
+    number_interface_(Type::null()),
+    int_interface_(Type::null()),
     smi_class_(Class::null()),
     mint_class_(Class::null()),
     bigint_class_(Class::null()),
-    double_interface_(ParameterizedType::null()),
+    double_interface_(Type::null()),
     double_class_(Class::null()),
-    string_interface_(ParameterizedType::null()),
+    string_interface_(Type::null()),
     one_byte_string_class_(Class::null()),
     two_byte_string_class_(Class::null()),
     four_byte_string_class_(Class::null()),
     external_one_byte_string_class_(Class::null()),
     external_two_byte_string_class_(Class::null()),
     external_four_byte_string_class_(Class::null()),
-    bool_interface_(ParameterizedType::null()),
+    bool_interface_(Type::null()),
     bool_class_(Class::null()),
-    list_interface_(ParameterizedType::null()),
+    list_interface_(Type::null()),
     array_class_(Class::null()),
     immutable_array_class_(Class::null()),
     byte_buffer_class_(Class::null()),
     unhandled_exception_class_(Class::null()),
     stacktrace_class_(Class::null()),
     jsregexp_class_(Class::null()),
     true_value_(Bool::null()),
     false_value_(Bool::null()),
     empty_array_(Array::null()),
     symbol_table_(Array::null()),
@@ skipping 88 matching lines @@
     return kUnhandledExceptionClass;
   } else if (raw_class == stacktrace_class_) {
     return kStacktraceClass;
   } else if (raw_class == jsregexp_class_) {
     return kJSRegExpClass;
   }
   return kInvalidIndex;
 }
 
 
-RawParameterizedType* ObjectStore::GetType(int index) {
+RawType* ObjectStore::GetType(int index) {
   switch (index) {
     case kObjectType: return object_type();
     case kNullType: return null_type();
     case kDynamicType: return dynamic_type();
     case kVoidType: return void_type();
     case kFunctionInterface: return function_interface();
     case kNumberInterface: return number_interface();
     case kDoubleInterface: return double_interface();
     case kIntInterface: return int_interface();
     case kBoolInterface: return bool_interface();
     case kStringInterface: return string_interface();
     case kListInterface: return list_interface();
     default: break;
   }
   UNREACHABLE();
-  return ParameterizedType::null();
+  return Type::null();
 }
 
 
-int ObjectStore::GetTypeIndex(const RawParameterizedType* raw_type) {
+int ObjectStore::GetTypeIndex(const RawType* raw_type) {
   ASSERT(raw_type->IsHeapObject());
   if (raw_type == object_type()) {
     return kObjectType;
   } else if (raw_type == null_type()) {
     return kNullType;
   } else if (raw_type == dynamic_type()) {
     return kDynamicType;
   } else if (raw_type == void_type()) {
     return kVoidType;
   } else if (raw_type == function_interface()) {
     return kFunctionInterface;
   } else if (raw_type == number_interface()) {
     return kNumberInterface;
   } else if (raw_type == double_interface()) {
     return kDoubleInterface;
   } else if (raw_type == int_interface()) {
     return kIntInterface;
   } else if (raw_type == bool_interface()) {
     return kBoolInterface;
   } else if (raw_type == string_interface()) {
     return kStringInterface;
   } else if (raw_type == list_interface()) {
     return kListInterface;
   }
   return kInvalidIndex;
 }
 
 }  // namespace dart