Ongoing renaming of type classes:

runtime/vm/raw_object_snapshot.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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/visitor.h"
 
@@ skipping 265 matching lines @@
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, Object::kInstantiatedTypeClass);
 
   // Write out all the object pointer fields.
   visitor.VisitPointers(from(), to());
 }
 
 
+RawAbstractTypeArguments* AbstractTypeArguments::ReadFrom(
+    SnapshotReader* reader,
+    intptr_t object_id,
+    bool classes_serialized) {
+  UNREACHABLE();  // AbstractTypeArguments is an abstract class.
+  return TypeArguments::null();
+}
+
+
+void RawAbstractTypeArguments::WriteTo(SnapshotWriter* writer,
+                               intptr_t object_id,
+                               bool serialize_classes) {
+  UNREACHABLE();  // AbstractTypeArguments is an abstract class.
+}
+
+
 RawTypeArguments* TypeArguments::ReadFrom(SnapshotReader* reader,
-                                          intptr_t object_id,
-                                          bool classes_serialized) {
-  UNREACHABLE();  // TypeArguments is an abstract class.
-  return TypeArray::null();
-}
-
-
-void RawTypeArguments::WriteTo(SnapshotWriter* writer,
-                               intptr_t object_id,
-                               bool serialize_classes) {
-  UNREACHABLE();  // TypeArguments is an abstract class.
-}
-
-
-RawTypeArray* TypeArray::ReadFrom(SnapshotReader* reader,
                                   intptr_t object_id,
                                   bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
 
-  TypeArray& type_array = TypeArray::Handle(TypeArray::New(len));
+  TypeArguments& type_array = TypeArguments::Handle(TypeArguments::New(len));

[regis, 2011/12/01 22:20:16]

type_array -> type_arguments

[srdjan, 2011/12/01 22:44:08]

Done.

   reader->AddBackwardReference(object_id, &type_array);
   AbstractType& type = AbstractType::Handle();
   for (intptr_t i = 0; i < len; i++) {
     type ^= reader->ReadObject();
     type_array.SetTypeAt(i, type);
   }
   return type_array.raw();
 }
 
 
-void RawTypeArray::WriteTo(SnapshotWriter* writer,
+void RawTypeArguments::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,

[regis, 2011/12/01 22:20:16]

indentation

[srdjan, 2011/12/01 22:44:08]

Done.

                            bool serialize_classes) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
-  writer->WriteObjectHeader(kObjectId, Object::kTypeArrayClass);
+  writer->WriteObjectHeader(kObjectId, Object::kTypeArgumentsClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the individual types.
   intptr_t len = Smi::Value(ptr()->length_);
   for (intptr_t i = 0; i < len; i++) {
     writer->WriteObject(ptr()->types_[i]);
   }
 }
@@ skipping 861 matching lines @@
                                 bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
   T& result = T::Handle(T::New(len,
                                classes_serialized ? Heap::kOld : Heap::kNew));
   reader->AddBackwardReference(object_id, &result);
 
-  TypeArguments& type_arguments = TypeArguments::Handle();
+  AbstractTypeArguments& type_arguments = AbstractTypeArguments::Handle();
   type_arguments ^= reader->ReadObject();
   result.SetTypeArguments(type_arguments);
 
   Object& obj = Object::Handle();
   for (intptr_t i = 0; i < len; i++) {
     obj = reader->ReadObject();
     result.SetAt(i, obj);
   }
   return result.raw();
 }
@@ skipping 14 matching lines @@
   return reinterpret_cast<RawImmutableArray*>(
       ArrayReadFrom<ImmutableArray>(reader, object_id, classes_serialized));
 }
 
 
 static void ArrayWriteTo(SnapshotWriter* writer,
                          intptr_t object_id,
                          bool serialize_classes,
                          intptr_t kind,
                          RawSmi* length,
-                         RawTypeArguments* type_arguments,
+                         RawAbstractTypeArguments* type_arguments,
                          RawObject* data[]) {
   ASSERT(writer != NULL);
   intptr_t len = Smi::Value(length);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, kind);
 
@@ skipping 126 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->Write<intptr_t>(ptr()->type_);
   writer->Write<intptr_t>(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart