isolates refactor: this change introduces 'dart:isolate' as a library. This is a

runtime/bin/builtin.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 <stdio.h>
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 
-static void SetupCorelibImports(Dart_Handle builtin_lib) {
-  // Lookup the core libraries and import the builtin library into them.
-  Dart_Handle url = Dart_NewString(DartUtils::kCoreLibURL);
-  Dart_Handle core_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(core_lib);
-  DART_CHECK_VALID(Dart_LibraryImportLibrary(core_lib, builtin_lib));
-
-  url = Dart_NewString(DartUtils::kCoreImplLibURL);
-  Dart_Handle coreimpl_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(coreimpl_lib);
-  DART_CHECK_VALID(Dart_LibraryImportLibrary(coreimpl_lib, builtin_lib));
+static void ImportBuiltinLibIntoLib(
+    const char* liburl, Dart_Handle builtin_lib) {
+  Dart_Handle url = Dart_NewString(liburl);
+  Dart_Handle lib = Dart_LookupLibrary(url);
+  DART_CHECK_VALID(lib);
+  DART_CHECK_VALID(Dart_LibraryImportLibrary(lib, builtin_lib));
 }
 

[Ivan Posva, 2012/02/25 00:14:38]

Two lines between C++ methods.

[Siggi Cherem (dart-lang), 2012/02/25 02:10:38]

Done.

-
 Dart_Handle Builtin::Source(BuiltinLibraryId id) {
   Dart_Handle source;
   switch (id) {
     case kBuiltinLibrary:
       source = Dart_NewString(Builtin::builtin_source_);
       break;
     case kIOLibrary:
       source = Dart_NewString(Builtin::io_source_);
       break;
     case kJsonLibrary:
@@ skipping 10 matching lines @@
   }
   return source;
 }
 
 
 void Builtin::SetupLibrary(Dart_Handle library, BuiltinLibraryId id) {
   if ((id == kJsonLibrary) || (id == kUriLibrary) || (id == kUtf8Library)) {
     // No native resolver for these pure Dart libraries.
     return;
   } else if (id == kBuiltinLibrary) {
-    // Setup core lib, builtin import structure.
-    SetupCorelibImports(library);
+    // Import the builtin library into the core and isolate libraries.
+    ImportBuiltinLibIntoLib(DartUtils::kCoreLibURL, library);
+    ImportBuiltinLibIntoLib(DartUtils::kCoreImplLibURL, library);
+    ImportBuiltinLibIntoLib(DartUtils::kIsolateLibURL, library);
   }
   // Setup the native resolver for built in library functions.
   DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
 }
 
 
 Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) {
   Dart_Handle url;
   switch (id) {
     case kBuiltinLibrary:
@@ skipping 25 matching lines @@
   DART_CHECK_VALID(library);
   return library;
 }
 
 
 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) {
   Dart_Handle imported_library = LoadLibrary(id);
   // Import the library into current library.
   DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library));
 }