Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

vm/class_finalizer.cc

 // 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.
 
 #include "vm/class_finalizer.h"
 
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
@@ skipping 322 matching lines @@
                 "both classes or both interfaces",
                 class_name.ToCString(),
                 super_class_name.ToCString());
   }
   // If cls belongs to core lib or to core lib's implementation, restrictions
   // about allowed interfaces are lifted.
   if ((cls.library() != Library::CoreLibrary()) &&
       (cls.library() != Library::CoreImplLibrary())) {
     // Prevent extending core implementation classes.
     switch (super_class.id()) {
-      case kInteger:
-      case kSmi:
-      case kMint:
-      case kBigint:
-      case kDouble:
-      case kOneByteString:
-      case kTwoByteString:
-      case kFourByteString:
-      case kExternalOneByteString:
-      case kExternalTwoByteString:
-      case kExternalFourByteString:
-      case kBool:
-      case kArray:
-      case kImmutableArray:
-      case kGrowableObjectArray:
-      case kInt8Array:
-      case kExternalInt8Array:
-      case kUint8Array:
-      case kExternalUint8Array:
-      case kInt16Array:
-      case kExternalInt16Array:
-      case kUint16Array:
-      case kExternalUint16Array:
-      case kInt32Array:
-      case kExternalInt32Array:
-      case kUint32Array:
-      case kExternalUint32Array:
-      case kInt64Array:
-      case kExternalInt64Array:
-      case kUint64Array:
-      case kExternalUint64Array:
-      case kFloat32Array:
-      case kExternalFloat32Array:
-      case kFloat64Array:
-      case kExternalFloat64Array: {
+      case kIntegerCid:
+      case kSmiCid:
+      case kMintCid:
+      case kBigintCid:
+      case kDoubleCid:
+      case kOneByteStringCid:
+      case kTwoByteStringCid:
+      case kFourByteStringCid:
+      case kExternalOneByteStringCid:
+      case kExternalTwoByteStringCid:
+      case kExternalFourByteStringCid:
+      case kBoolCid:
+      case kArrayCid:
+      case kImmutableArrayCid:
+      case kGrowableObjectArrayCid:
+      case kInt8ArrayCid:
+      case kExternalInt8ArrayCid:
+      case kUint8ArrayCid:
+      case kExternalUint8ArrayCid:
+      case kInt16ArrayCid:
+      case kExternalInt16ArrayCid:
+      case kUint16ArrayCid:
+      case kExternalUint16ArrayCid:
+      case kInt32ArrayCid:
+      case kExternalInt32ArrayCid:
+      case kUint32ArrayCid:
+      case kExternalUint32ArrayCid:
+      case kInt64ArrayCid:
+      case kExternalInt64ArrayCid:
+      case kUint64ArrayCid:
+      case kExternalUint64ArrayCid:
+      case kFloat32ArrayCid:
+      case kExternalFloat32ArrayCid:
+      case kFloat64ArrayCid:
+      case kExternalFloat64ArrayCid: {
         const Script& script = Script::Handle(cls.script());
         ReportError(script, cls.token_pos(),
                     "'%s' is not allowed to extend '%s'",
                     String::Handle(cls.Name()).ToCString(),
                     String::Handle(super_class.Name()).ToCString());
         break;
       }
       default: break;
     }
   }
@@ skipping 1116 matching lines @@
 void ClassFinalizer::ReportError(const char* format, ...) {
   va_list args;
   va_start(args, format);
   const Error& error = Error::Handle(
       Parser::FormatError(Script::Handle(), -1, "Error", format, args));
   va_end(args);
   ReportError(error);
 }
 
 }  // namespace dart