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

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 225 matching lines @@
       return url;
     }
     // Create a canonical path based on the including library and current url.
     return DartUtils::CanonicalizeURL(NULL, library, url_string);
   }
   if (is_dart_scheme_url) {
     return Dart_Error("Do not know how to load '%s'", url_string);
   }
   result = DartUtils::LoadSource(NULL, library, url, tag, url_string);
   if (!Dart_IsError(result) && (tag == kImportTag)) {
-    Builtin::ImportLibrary(result);
+    Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
   }
   return result;
 }
 
 
 static Dart_Handle LoadScript(const char* script_name) {
   Dart_Handle source = DartUtils::ReadStringFromFile(script_name);
   if (Dart_IsError(source)) {
     return source;
   }
@@ skipping 11 matching lines @@
     return false;
   }
 
   Dart_Handle library;
   Dart_EnterScope();
 
   // Load the specified application script into the newly created isolate.
   if (script_snapshot_buffer != NULL) {
     library = Dart_LoadScriptFromSnapshot(script_snapshot_buffer);
   } else {
+    // If we are not using snapshots make sure that the builtin IO
+    // library is loaded so the main script can import it. Since we do
+    // not have a tag handler at this point, load the libraries needed
+    // by the IO library directly instead of relying on imports.
+    if (snapshot_buffer == NULL) {
+      Dart_Handle io_lib = Builtin::LoadLibrary(Builtin::kIOLibrary);
+      Builtin::ImportLibrary(io_lib, Builtin::kNativeWrappersLibrary);
+      Builtin::ImportLibrary(io_lib, Builtin::kCoreImplLibrary);
+    }
     library = LoadScript(canonical_script_name);
   }
   if (Dart_IsError(library)) {
     *error = strdup(Dart_GetError(library));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   if (!Dart_IsLibrary(library)) {
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
              canonical_script_name);
     *error = strdup(errbuf);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   if (script_snapshot_buffer == NULL) {
-    Builtin::ImportLibrary(library);  // Implicitly import builtin into app.
+    // Implicitly import builtin into app.
+    Builtin::ImportLibrary(library, Builtin::kBuiltinLibrary);
   }
   if (snapshot_buffer != NULL) {
     // Setup the native resolver as the snapshot does not carry it.
-    Builtin::SetNativeResolver();
+    Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
+    Builtin::SetNativeResolver(Builtin::kIOLibrary);
   }
   Dart_ExitScope();
   return true;
 }
 
 
 static bool CaptureScriptSnapshot() {
   char* error = NULL;
   Dart_Handle result;
 
@@ skipping 234 matching lines @@
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate event handler.
   EventHandler::Terminate();
 
   return 0;
 }