Big merge from experimental to bleeding edge.

runtime/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 906 matching lines @@
   Error& error = Error::Handle();
   error = Bootstrap::Compile(core_lib, script);
   if (!error.IsNull()) {
     return error.raw();
   }
   Script& patch_script = Script::Handle(Bootstrap::LoadCoreScript(true));
   error = core_lib.Patch(patch_script);
   if (!error.IsNull()) {
     return error.raw();
   }
+  Library::InitASyncLibrary(isolate);
+  const Script& async_script =
+      Script::Handle(Bootstrap::LoadASyncScript(false));
+  const Library& async_lib = Library::Handle(Library::ASyncLibrary());
+  ASSERT(!async_lib.IsNull());
+  error = Bootstrap::Compile(async_lib, async_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
+  patch_script = Bootstrap::LoadASyncScript(true);
+  error = async_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
   const Script& collection_script =
       Script::Handle(Bootstrap::LoadCollectionScript(false));
   const Library& collection_lib =
       Library::Handle(Library::CollectionLibrary());
   ASSERT(!collection_lib.IsNull());
   error = Bootstrap::Compile(collection_lib, collection_script);
   if (!error.IsNull()) {
     return error.raw();
   }
   const Script& math_script = Script::Handle(Bootstrap::LoadMathScript(false));
@@ skipping 5028 matching lines @@
   }
   return result.raw();
 }
 
 
 RawLibrary* Library::New(const String& url) {
   return NewLibraryHelper(url, false);
 }
 
 
+void Library::InitASyncLibrary(Isolate* isolate) {
+  const String& url = String::Handle(Symbols::New("dart:async"));
+  const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
+  lib.Register();
+  isolate->object_store()->set_async_library(lib);
+}
+
+
 void Library::InitCoreLibrary(Isolate* isolate) {
   const String& core_lib_url = String::Handle(Symbols::New("dart:core"));
   const Library& core_lib =
       Library::Handle(Library::NewLibraryHelper(core_lib_url, false));
   core_lib.Register();
   isolate->object_store()->set_core_library(core_lib);
   Library::InitMathLibrary(isolate);
   const Library& math_lib = Library::Handle(Library::MathLibrary());
   const Namespace& math_ns = Namespace::Handle(
       Namespace::New(math_lib, Array::Handle(), Array::Handle()));
@@ skipping 31 matching lines @@
   const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
   lib.Register();
   isolate->object_store()->set_math_library(lib);
 }
 
 
 void Library::InitIsolateLibrary(Isolate* isolate) {
   const String& url = String::Handle(Symbols::New("dart:isolate"));
   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_isolate_library(lib);
 }
 
 
 void Library::InitMirrorsLibrary(Isolate* isolate) {
   const String& url = String::Handle(Symbols::New("dart:mirrors"));
   const Library& lib = Library::Handle(Library::NewLibraryHelper(url, true));
   lib.Register();
   const Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
   const Namespace& isolate_ns = Namespace::Handle(
       Namespace::New(isolate_lib, Array::Handle(), Array::Handle()));
   lib.AddImport(isolate_ns);
+  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);
   const Library& wrappers_lib =
       Library::Handle(Library::NativeWrappersLibrary());
   const Namespace& wrappers_ns = Namespace::Handle(
       Namespace::New(wrappers_lib, Array::Handle(), Array::Handle()));
   lib.AddImport(wrappers_ns);
   isolate->object_store()->set_mirrors_library(lib);
 }
 
 
 void Library::InitScalarlistLibrary(Isolate* isolate) {
@@ skipping 105 matching lines @@
   ASSERT(Library::LookupLibrary(String::Handle(url())) == Library::null());
   ObjectStore* object_store = Isolate::Current()->object_store();
   GrowableObjectArray& libs =
       GrowableObjectArray::Handle(object_store->libraries());
   ASSERT(!libs.IsNull());
   set_index(libs.Length());
   libs.Add(*this);
 }
 
 
+RawLibrary* Library::ASyncLibrary() {
+  return Isolate::Current()->object_store()->async_library();
+}
+
+
 RawLibrary* Library::CoreLibrary() {
   return Isolate::Current()->object_store()->core_library();
 }
 
 
 RawLibrary* Library::CollectionLibrary() {
   return Isolate::Current()->object_store()->collection_library();
 }
 
 
@@ skipping 6211 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart