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

runtime/bin/gen_snapshot.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.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 159 matching lines @@
   if (DartUtils::IsDartSchemeURL(url_string)) {
     if (tag == kCanonicalizeUrl) {
       return url;
     }
     return Dart_Error("unsupported url encountered %s", url_string);
   }
   return Dart_Error("unexpected tag encountered %d", tag);
 }
 
 
-static Dart_Handle LoadGenericSnapshotCreationScript() {
-  Dart_Handle source = Builtin::Source();
+static Dart_Handle LoadGenericSnapshotCreationScript(
+    Builtin::BuiltinLibraryId id) {
+  Dart_Handle source = Builtin::Source(id);
   if (Dart_IsError(source)) {
     return source;  // source contains the error string.
   }
-  Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-  Dart_Handle lib = Dart_LoadScript(url, source, BuiltinLibraryTagHandler);
+  Dart_Handle lib;
+  if (id == Builtin::kBuiltinLibrary) {
+    // Load the dart:builtin library as the script.
+    Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
+    lib = Dart_LoadScript(url, source, BuiltinLibraryTagHandler);
+  } else {
+    // Load the dart:io library with dependencies as a library to make

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

ASSERT(id == Builtin::kIOLibrary);

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

Done.

+    // it available in the snapshot for importing.
+    lib = Builtin::LoadLibrary(Builtin::kIOLibrary);
+    Builtin::ImportLibrary(lib, Builtin::kNativeWrappersLibrary);
+    Builtin::ImportLibrary(lib, Builtin::kCoreImplLibrary);
+  }
   if (!Dart_IsError(lib)) {
-    Builtin::SetupLibrary(lib);
+    Builtin::SetupLibrary(lib, id);
   }
   return lib;
 }
 
 
 static void PrintUsage() {
   fprintf(stderr,
           "dart [<vm-flags>] "
           "[<dart-script-file>]\n");
 }
 
 
+static void VerifyLoaded(Dart_Handle library) {
+  if (Dart_IsError(library)) {
+    const char* err_msg = Dart_GetError(library);
+    fprintf(stderr, "Errors encountered while loading: %s\n", err_msg);
+    Dart_ExitScope();
+    Dart_ShutdownIsolate();
+    exit(255);
+  }
+  ASSERT(Dart_IsLibrary(library));
+}
+
+
 int main(int argc, char** argv) {
   CommandLineOptions vm_options(argc);
 
   // Initialize the URL mapping array.
   CommandLineOptions url_mapping_array(argc);
   url_mapping = &url_mapping_array;
 
   // Parse command line arguments.
   if (ParseArguments(argc,
                      argv,
@@ skipping 25 matching lines @@
 
   Dart_Handle result;
   Dart_Handle library;
   Dart_EnterScope();
 
   ASSERT(snapshot_filename != NULL);
   // Load up the script before a snapshot is created.
   if (app_script_name != NULL) {
     // Load the specified script.
     library = LoadSnapshotCreationScript(app_script_name);
+    VerifyLoaded(library);
   } else {
     // This is a generic dart snapshot which needs builtin library setup.
-    library = LoadGenericSnapshotCreationScript();
+    library = LoadGenericSnapshotCreationScript(Builtin::kBuiltinLibrary);
+    VerifyLoaded(library);
+    library = LoadGenericSnapshotCreationScript(Builtin::kIOLibrary);
+    VerifyLoaded(library);
   }
-  if (Dart_IsError(library)) {
-    const char* err_msg = Dart_GetError(library);
-    fprintf(stderr, "Errors encountered while loading script: %s\n", err_msg);
-    Dart_ExitScope();
-    Dart_ShutdownIsolate();
-    exit(255);
-  }
-  ASSERT(Dart_IsLibrary(library));
+
   uint8_t* buffer = NULL;
   intptr_t size = 0;
   // First create the snapshot.
   result = Dart_CreateSnapshot(&buffer, &size);
   if (Dart_IsError(result)) {
     const char* err_msg = Dart_GetError(result);
     fprintf(stderr, "Error while creating snapshot: %s\n", err_msg);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     exit(255);
   }
   // Now write the snapshot out to specified file and exit.
   WriteSnapshotFile(buffer, size);
   Dart_ExitScope();
 
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   return 0;
 }