- Move double and int implementations into dart:core and make them private.

vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 551 matching lines @@
   Context& context = Context::Handle(Context::New(0, Heap::kOld));
   object_store->set_empty_context(context);
 
   // Now that the symbol table is initialized and that the core dictionary as
   // well as the core implementation dictionary have been setup, preallocate
   // remaining classes and register them by name in the dictionaries.
   const Script& impl_script = Script::Handle(
       Bootstrap::LoadCoreImplScript(false));
 
   String& name = String::Handle();
-  cls = Class::New<Integer>();
-  object_store->set_integer_implementation_class(cls);
-  name = Symbols::IntegerImplementation();
-  RegisterClass(cls, name, core_impl_lib);
-  pending_classes.Add(cls, Heap::kOld);
-
-  cls = Class::New<Smi>();
-  object_store->set_smi_class(cls);
-  name = Symbols::Smi();
-  RegisterClass(cls, name, core_impl_lib);
-  pending_classes.Add(cls, Heap::kOld);
-
-  cls = Class::New<Mint>();
-  object_store->set_mint_class(cls);
-  name = Symbols::Mint();
-  RegisterClass(cls, name, core_impl_lib);
-  pending_classes.Add(cls, Heap::kOld);
-
-  cls = Class::New<Bigint>();
-  object_store->set_bigint_class(cls);
-  name = Symbols::Bigint();
-  RegisterClass(cls, name, core_impl_lib);
-  pending_classes.Add(cls, Heap::kOld);
-
-  cls = Class::New<Double>();
-  object_store->set_double_class(cls);
-  name = Symbols::Double();
-  RegisterClass(cls, name, core_impl_lib);
-  pending_classes.Add(cls, Heap::kOld);
-
   cls = Class::New<Bool>();
   object_store->set_bool_class(cls);
   name = Symbols::Bool();
   RegisterClass(cls, name, core_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->array_class();  // Was allocated above.
   name = Symbols::ObjectArray();
   RegisterClass(cls, name, core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
@@ skipping 55 matching lines @@
 
   cls = Class::New<JSRegExp>();
   object_store->set_jsregexp_class(cls);
   name = Symbols::JSSyntaxRegExp();
   RegisterClass(cls, name, core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   // Initialize the base interfaces used by the core VM classes.
   const Script& script = Script::Handle(Bootstrap::LoadCoreScript(false));
 
-  // Allocate and initialize the Object class and type.  The Object
-  // class and ByteArray subclasses are the only pre-allocated,
-  // non-interface classes in the core library.
+  // Allocate and initialize the pre-allocated classes in the core library.
   cls = Class::New<Instance>(kInstanceCid);
   object_store->set_object_class(cls);
   name = Symbols::Object();
   cls.set_name(name);
   cls.set_script(script);
   cls.set_is_prefinalized();
   core_lib.AddClass(cls);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
   object_store->set_object_type(type);
 
+  cls = Class::New<Integer>();
+  object_store->set_integer_implementation_class(cls);
+  name = Symbols::IntegerImplementation();
+  RegisterPrivateClass(cls, name, core_lib);
+  pending_classes.Add(cls, Heap::kOld);
+
+  cls = Class::New<Smi>();
+  object_store->set_smi_class(cls);
+  name = Symbols::Smi();
+  RegisterPrivateClass(cls, name, core_lib);
+  pending_classes.Add(cls, Heap::kOld);
+
+  cls = Class::New<Mint>();
+  object_store->set_mint_class(cls);
+  name = Symbols::Mint();
+  RegisterPrivateClass(cls, name, core_lib);
+  pending_classes.Add(cls, Heap::kOld);
+
+  cls = Class::New<Bigint>();
+  object_store->set_bigint_class(cls);
+  name = Symbols::Bigint();
+  RegisterPrivateClass(cls, name, core_lib);
+  pending_classes.Add(cls, Heap::kOld);
+
+  cls = Class::New<Double>();
+  object_store->set_double_class(cls);
+  name = Symbols::Double();
+  RegisterPrivateClass(cls, name, core_lib);
+  pending_classes.Add(cls, Heap::kOld);
+
   cls = Class::New<Int8Array>();
   object_store->set_int8_array_class(cls);
   name = Symbols::_Int8Array();
   RegisterPrivateClass(cls, name, core_lib);
 
   cls = Class::New<Uint8Array>();
   object_store->set_uint8_array_class(cls);
   name = Symbols::_Uint8Array();
   RegisterPrivateClass(cls, name, core_lib);
 
@@ skipping 10914 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart