Split dart:builtin into dart:builtin and dart:io.

runtime/bin/builtin.cc

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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));
 }
 
 
-Dart_Handle Builtin::Source() {
-  Dart_Handle source = Dart_NewString(Builtin::Builtin_source_);
+Dart_Handle Builtin::Source(BuiltinLibraryId id) {
+  Dart_Handle source;
+  if (id == kBuiltinLibrary) {
+    source = Dart_NewString(Builtin::builtin_source_);
+  } else {
+    ASSERT(id == kIOLibrary);
+    source = Dart_NewString(Builtin::io_source_);
+  }
   return source;
 }
 
 
-void Builtin::SetupLibrary(Dart_Handle builtin_lib) {
-  // Setup core lib, builtin import structure.
-  SetupCorelibImports(builtin_lib);
+void Builtin::SetupLibrary(Dart_Handle library, BuiltinLibraryId id) {
+  if (id == kBuiltinLibrary) {
+    // Setup core lib, builtin import structure.
+    SetupCorelibImports(library);
+  }
   // Setup the native resolver for built in library functions.
-  DART_CHECK_VALID(Dart_SetNativeResolver(builtin_lib, NativeLookup));
+  DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
 }
 
 
-void Builtin::ImportLibrary(Dart_Handle library) {
-  Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-  Dart_Handle builtin_lib = Dart_LookupLibrary(url);
-  if (Dart_IsError(builtin_lib)) {
-    builtin_lib = Dart_LoadLibrary(url, Source());
-    if (!Dart_IsError(builtin_lib)) {
-      SetupLibrary(builtin_lib);
+Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) {
+  Dart_Handle url;
+  switch (id) {
+    case kBuiltinLibrary:
+      url = Dart_NewString(DartUtils::kBuiltinLibURL);
+      break;
+    case kIOLibrary:
+      url = Dart_NewString(DartUtils::kIOLibURL);
+      break;
+    case kNativeWrappersLibrary:
+      url = Dart_NewString(DartUtils::kNativeWrappersLibURL);
+      break;
+    case kCoreImplLibrary:

[Ivan Posva, 2012/01/21 20:24:55]

Why are the native wrappers and the coreimpl library handled here? They should
be handled directly by the VM. If this is indeed needed here, we have to
reevaluate how the standalone binary is loading the builtin libraries.

[Mads Ager (google), 2012/01/23 11:35:38]

You are absolutely right. Thanks.

This was a result of me not having wrapped my head completely around the
structure. I ran into issues when handling dart:io in the tag handled. I have
resolved those issues and deal only with builtin and io here.

+      url = Dart_NewString(DartUtils::kCoreImplLibURL);
+      break;
+    default:
+      url = Dart_Error("unknown builtin library id: %d", id);
+      break;
+  }
+  DART_CHECK_VALID(url);
+  Dart_Handle library = Dart_LookupLibrary(url);
+  if (Dart_IsError(library)) {
+    library = Dart_LoadLibrary(url, Source(id));
+    if (!Dart_IsError(library)) {
+      SetupLibrary(library, id);
     }
   }
-  // Import the builtin library into current library.
-  DART_CHECK_VALID(builtin_lib);
-  DART_CHECK_VALID(Dart_LibraryImportLibrary(library, builtin_lib));
+  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));
+}