Move json, uri, utf and crypto libraries into the VM.

runtime/vm/object.cc

Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc	(revision 18843)
+++ runtime/vm/object.cc	(working copy)
@@ -631,7 +631,17 @@
   lib.AddClass(cls);
 }
 
+#define INIT_LIBRARY(name, raw_script, raw_lib)                                \
+  script ^= raw_script;                                                        \
+  Library::Init##name##Library(isolate);                                       \
+  lib ^= raw_lib;                                                              \
+  ASSERT(!lib.IsNull());                                                       \
+  error = Bootstrap::Compile(lib, script);                                     \
+  if (!error.IsNull()) {                                                       \
+    return error.raw();                                                        \
+  }                                                                            \
 
+
 RawError* Object::Init(Isolate* isolate) {
   TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
@@ -761,7 +771,7 @@
   pending_classes.Add(cls, Heap::kOld);
 
   // Initialize the base interfaces used by the core VM classes.
-  const Script& script = Script::Handle(Bootstrap::LoadCoreScript(false));
+  Script& script = Script::Handle(Bootstrap::LoadCoreScript(false));
 
   // Allocate and initialize the pre-allocated classes in the core library.
   cls = Class::New<Instance>(kInstanceCid);
@@ -1084,6 +1094,19 @@
   if (!error.IsNull()) {
     return error.raw();
   }
+  Library& lib = Library::Handle();
+  INIT_LIBRARY(Crypto,

[Ivan Posva, 2013/02/22 00:39:38]

Why are you not using INIT_LIBRARY to initialize the above libraries?

[siva, 2013/02/22 01:01:19]

Will make that change in a new CL as I did not want this CL to have too many
unrelated changes.

On 2013/02/22 00:39:38, Ivan Posva wrote:

+               Bootstrap::LoadCryptoScript(false),
+               Library::CryptoLibrary());
+  INIT_LIBRARY(Json,
+               Bootstrap::LoadJsonScript(false),
+               Library::JsonLibrary());
+  INIT_LIBRARY(Utf,
+               Bootstrap::LoadUtfScript(false),
+               Library::UtfLibrary());
+  INIT_LIBRARY(Uri,
+               Bootstrap::LoadUriScript(false),
+               Library::UriLibrary());
   Bootstrap::SetupNativeResolver();
 
   // Remove the Object superclass cycle by setting the super type to null (not
@@ -6373,11 +6396,15 @@
 }
 
 
-void Library::InitMathLibrary(Isolate* isolate) {
-  const String& url = Symbols::DartMath();
+void Library::InitCryptoLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartCrypto();
   const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
   lib.Register();
-  isolate->object_store()->set_math_library(lib);
+  const Library& math_lib = Library::Handle(Library::MathLibrary());
+  const Namespace& math_ns = Namespace::Handle(
+      Namespace::New(math_lib, Array::Handle(), Array::Handle()));
+  lib.AddImport(math_ns);
+  isolate->object_store()->set_crypto_library(lib);
 }
 
 
@@ -6393,6 +6420,22 @@
 }
 
 
+void Library::InitJsonLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartJson();
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  isolate->object_store()->set_json_library(lib);
+}
+
+
+void Library::InitMathLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartMath();
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  isolate->object_store()->set_math_library(lib);
+}
+
+
 void Library::InitMirrorsLibrary(Isolate* isolate) {
   const String& url = Symbols::DartMirrors();
   const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
@@ -6414,19 +6457,6 @@
 }
 
 
-void Library::InitScalarlistLibrary(Isolate* isolate) {
-  const String& url = Symbols::DartScalarlist();
-  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
-  lib.Register();
-  const Library& collection_lib =
-      Library::Handle(Library::CollectionLibrary());
-  const Namespace& collection_ns = Namespace::Handle(
-      Namespace::New(collection_lib, Array::Handle(), Array::Handle()));
-  lib.AddImport(collection_ns);
-  isolate->object_store()->set_scalarlist_library(lib);
-}
-
-
 void Library::InitNativeWrappersLibrary(Isolate* isolate) {
   static const int kNumNativeWrappersClasses = 4;
   ASSERT(kNumNativeWrappersClasses > 0 && kNumNativeWrappersClasses < 10);
@@ -6452,6 +6482,47 @@
 }
 
 
+void Library::InitScalarlistLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartScalarlist();
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  const Library& collection_lib =
+      Library::Handle(Library::CollectionLibrary());
+  const Namespace& collection_ns = Namespace::Handle(
+      Namespace::New(collection_lib, Array::Handle(), Array::Handle()));
+  lib.AddImport(collection_ns);
+  isolate->object_store()->set_scalarlist_library(lib);
+}
+
+
+void Library::InitUriLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartUri();
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  const Library& math_lib = Library::Handle(Library::MathLibrary());
+  const Namespace& math_ns = Namespace::Handle(
+      Namespace::New(math_lib, Array::Handle(), Array::Handle()));
+  const Library& utf_lib = Library::Handle(Library::UtfLibrary());
+  const Namespace& utf_ns = Namespace::Handle(
+      Namespace::New(utf_lib, Array::Handle(), Array::Handle()));
+  lib.AddImport(math_ns);
+  lib.AddImport(utf_ns);
+  isolate->object_store()->set_uri_library(lib);
+}
+
+
+void Library::InitUtfLibrary(Isolate* isolate) {
+  const String& url = Symbols::DartUtf();
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  const Library& async_lib = Library::Handle(Library::ASyncLibrary());
+  const Namespace& async_ns = Namespace::Handle(
+      Namespace::New(async_lib, Array::Handle(), Array::Handle()));
+  lib.AddImport(async_ns);
+  isolate->object_store()->set_utf_library(lib);
+}
+
+
 RawLibrary* Library::LookupLibrary(const String &url) {
   Isolate* isolate = Isolate::Current();
   Library& lib = Library::Handle(isolate, Library::null());
@@ -6565,8 +6636,8 @@
 }
 
 
-RawLibrary* Library::MathLibrary() {
-  return Isolate::Current()->object_store()->math_library();
+RawLibrary* Library::CryptoLibrary() {
+  return Isolate::Current()->object_store()->crypto_library();
 }
 
 
@@ -6575,21 +6646,41 @@
 }
 
 
+RawLibrary* Library::JsonLibrary() {
+  return Isolate::Current()->object_store()->json_library();
+}
+
+
+RawLibrary* Library::MathLibrary() {
+  return Isolate::Current()->object_store()->math_library();
+}
+
+
 RawLibrary* Library::MirrorsLibrary() {
   return Isolate::Current()->object_store()->mirrors_library();
 }
 
 
+RawLibrary* Library::NativeWrappersLibrary() {
+  return Isolate::Current()->object_store()->native_wrappers_library();
+}
+
+
 RawLibrary* Library::ScalarlistLibrary() {
   return Isolate::Current()->object_store()->scalarlist_library();
 }
 
 
-RawLibrary* Library::NativeWrappersLibrary() {
-  return Isolate::Current()->object_store()->native_wrappers_library();
+RawLibrary* Library::UriLibrary() {
+  return Isolate::Current()->object_store()->uri_library();
 }
 
 
+RawLibrary* Library::UtfLibrary() {
+  return Isolate::Current()->object_store()->utf_library();
+}
+
+
 const char* Library::ToCString() const {
   const char* kFormat = "Library:'%s'";
   const String& name = String::Handle(url());