Merged String subclasses into String.

runtime/vm/raw_object.h

 // Copyright (c) 2012, 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 "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 39 matching lines @@
     V(AbstractType)                                                            \
       V(Type)                                                                  \
       V(TypeParameter)                                                         \
     V(Number)                                                                  \
       V(Integer)                                                               \
         V(Smi)                                                                 \
         V(Mint)                                                                \
         V(Bigint)                                                              \
       V(Double)                                                                \
     V(String)                                                                  \
-      V(OneByteString)                                                         \
-      V(TwoByteString)                                                         \
-      V(ExternalOneByteString)                                                 \
-      V(ExternalTwoByteString)                                                 \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     V(GrowableObjectArray)                                                     \
     V(ByteArray)                                                               \
       V(Int8Array)                                                             \
       V(Uint8Array)                                                            \
       V(Int16Array)                                                            \
       V(Uint16Array)                                                           \
       V(Int32Array)                                                            \
@@ skipping 10 matching lines @@
       V(ExternalUint32Array)                                                   \
       V(ExternalInt64Array)                                                    \
       V(ExternalUint64Array)                                                   \
       V(ExternalFloat32Array)                                                  \
       V(ExternalFloat64Array)                                                  \
     V(Stacktrace)                                                              \
     V(JSRegExp)                                                                \
     V(WeakProperty)                                                            \
     V(DartFunction)                                                            \
 
 #define CLASS_LIST(V)                                                          \

[siva, 2012/11/02 01:15:25]

CLASS_LIST should include all classes right, now it does
not include all the string types.

Maybe it might be better if you had a
CLASS_LIST_NO_OBJECT_OR_STRING (contains all classes but strings)

CLASS_LIST_STRING (contains string and it's subtypes).

[Tom Ball, 2012/11/02 23:31:50]

Fixed CLASS_LIST and CLASS_LIST_NO_OBJECT to include all string classes, 
CLASS_LIST_NO_OBJECT_OR_STRINGS (no strings at all), CLASS_LISTS_STRINGS (just
strings), and CLASS_LIST_NO_OBJECT_WITH_STRING (just String, no String raw
types).

   V(Object)                                                                    \
   CLASS_LIST_NO_OBJECT(V)
 
+#define CLASS_LIST_STRING_SUBTYPES(V)                                          \
+  V(OneByteString)                                                             \
+  V(TwoByteString)                                                             \
+  V(ExternalOneByteString)                                                     \
+  V(ExternalTwoByteString)
+
 
 // Forward declarations.
 class Isolate;
 #define DEFINE_FORWARD_DECLARATION(clazz)                                      \
   class Raw##clazz;
 CLASS_LIST(DEFINE_FORWARD_DECLARATION)
 #undef DEFINE_FORWARD_DECLARATION
 
 
 enum ClassId {
   // Illegal class id.
   kIllegalCid = 0,
 
   // List of Ids for predefined classes.
 #define DEFINE_OBJECT_KIND(clazz)                                              \
   k##clazz##Cid,
 CLASS_LIST(DEFINE_OBJECT_KIND)
 #undef DEFINE_OBJECT_KIND
 
+  // The following entries describe the types of string subtypes.
+  kOneByteStringCid,
+  kTwoByteStringCid,
+  kExternalOneByteStringCid,
+  kExternalTwoByteStringCid,
+
   // The following entries do not describe a predefined class, but instead
   // are class indexes for pre-allocated instance (Null, dynamic and Void).
   kNullCid,
   kDynamicCid,
   kVoidCid,
 
   // The following entry does not describe a real class, but instead it is an
   // id which is used to identify free list elements in the heap.
   kFreeListElement,
 
@@ skipping 251 matching lines @@
   friend class Heap;
   friend class HeapProfiler;
   friend class HeapProfilerRootVisitor;
   friend class MarkingVisitor;
   friend class Object;
   friend class RawInstructions;
   friend class RawInstance;
   friend class Scavenger;
   friend class SnapshotReader;
   friend class SnapshotWriter;
+  friend class String;
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(RawObject);
 };
 
 
 class RawClass : public RawObject {
  public:
   enum ClassState {
     kAllocated,     // Initial state.
@@ skipping 1106 matching lines @@
   ASSERT(kSmiCid == kIntegerCid + 1 &&
          kMintCid == kIntegerCid + 2 &&
          kBigintCid == kIntegerCid + 3 &&
          kDoubleCid == kIntegerCid + 4);
   return (index >= kIntegerCid && index < kDoubleCid);
 }
 
 
 inline bool RawObject::IsStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
-  ASSERT(kOneByteStringCid == kStringCid + 1 &&
-         kTwoByteStringCid == kStringCid + 2 &&
-         kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
-  return (index >= kStringCid && index < kBoolCid);
+  ASSERT(kTwoByteStringCid == kOneByteStringCid + 1 &&
+         kExternalOneByteStringCid == kOneByteStringCid + 2 &&
+         kExternalTwoByteStringCid == kOneByteStringCid + 3);
+  return (index >= kOneByteStringCid && index <= kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsOneByteStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
-  ASSERT(kOneByteStringCid == kStringCid + 1 &&
-         kTwoByteStringCid == kStringCid + 2 &&
-         kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+  ASSERT(kTwoByteStringCid == kOneByteStringCid + 1 &&
+         kExternalOneByteStringCid == kOneByteStringCid + 2 &&
+         kExternalTwoByteStringCid == kOneByteStringCid + 3);
   return (index == kOneByteStringCid || index == kExternalOneByteStringCid);
 }
 
 
 inline bool RawObject::IsTwoByteStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
-  ASSERT(kOneByteStringCid == kStringCid + 1 &&
-         kTwoByteStringCid == kStringCid + 2 &&
-         kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+  ASSERT(kTwoByteStringCid == kOneByteStringCid + 1 &&
+         kExternalOneByteStringCid == kOneByteStringCid + 2 &&
+         kExternalTwoByteStringCid == kOneByteStringCid + 3);
   return (index == kOneByteStringCid ||
           index == kTwoByteStringCid ||
           index == kExternalOneByteStringCid ||
           index == kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsExternalStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
-  ASSERT(kOneByteStringCid == kStringCid + 1 &&
-         kTwoByteStringCid == kStringCid + 2 &&
-         kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+  ASSERT(kTwoByteStringCid == kOneByteStringCid + 1 &&
+         kExternalOneByteStringCid == kOneByteStringCid + 2 &&
+         kExternalTwoByteStringCid == kOneByteStringCid + 3);
   return (index == kExternalOneByteStringCid ||
           index == kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
   // Make sure this function is updated when new builtin List types are added.
   ASSERT(kImmutableArrayCid == kArrayCid + 1 &&
          kGrowableObjectArrayCid == kArrayCid + 2 &&
          kByteArrayCid == kArrayCid + 3);
@@ skipping 39 matching lines @@
          kExternalUint64ArrayCid == kExternalInt8ArrayCid + 7 &&
          kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 8 &&
          kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 9 &&
          kStacktraceCid == kExternalInt8ArrayCid + 10);
   return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_