- Proper URI resolution when loading scripts from the standalone binary.

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 164 matching lines @@
   const char* url_string = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_string);
   if (Dart_IsError(result)) {
     return Dart_Error("accessing url characters failed");
   }
   // We only support canonicalization of "dart:".
   if (DartUtils::IsDartSchemeURL(url_string)) {
     if (tag == kCanonicalizeUrl) {
       return url;
     }
-    return Dart_Error("unsupported url encountered %s", url_string);
+    // TODO(iposva): Make sure only the known libraries are being added.
+    return Dart_True();
   }
   return Dart_Error("unexpected tag encountered %d", tag);
 }
 
 
 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 lib;
-  if (id == Builtin::kBuiltinLibrary) {
-    // Load the dart:builtin library as the script.
-    Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-    Dart_Handle import_map = Dart_NewList(0);
-    lib = Dart_LoadScript(url,
-                          source,
-                          BuiltinLibraryTagHandler,
-                          import_map);
-  } else {
-    // Load the builtin library to make it available in the snapshot
-    // for importing.
-    lib = Builtin::LoadLibrary(id);
-  }
+  // Load the builtin library to make it available in the snapshot
+  // for importing.
+  lib = Builtin::LoadLibrary(id);
   if (!Dart_IsError(lib)) {
     Builtin::SetupLibrary(lib, id);
   }
   return lib;
 }
 
 
 static void PrintUsage() {
   fprintf(stderr,
           "dart [<vm-flags>] "
@@ skipping 53 matching lines @@
   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 {
+    // Load a dummy script as the script to setup the tag handler.
+    Dart_Handle empty_string = Dart_NewString("");
+    Dart_Handle import_map = Dart_NewList(0);

[siva, 2012/03/07 18:32:17]

import_map = Dart_Null();

[Ivan Posva, 2012/03/08 00:49:33]

Done.

+    Dart_Handle lib = Dart_LoadScript(empty_string,
+                                      empty_string,
+                                      BuiltinLibraryTagHandler,
+                                      import_map);
     // This is a generic dart snapshot which needs builtin library setup.
     library = LoadGenericSnapshotCreationScript(Builtin::kBuiltinLibrary);
     VerifyLoaded(library);
     library = LoadGenericSnapshotCreationScript(Builtin::kIOLibrary);
     VerifyLoaded(library);
     library = LoadGenericSnapshotCreationScript(Builtin::kJsonLibrary);
     VerifyLoaded(library);
     library = LoadGenericSnapshotCreationScript(Builtin::kUriLibrary);
     VerifyLoaded(library);
     library = LoadGenericSnapshotCreationScript(Builtin::kUtf8Library);
@@ skipping 12 matching lines @@
     exit(255);
   }
   // Now write the snapshot out to specified file and exit.
   WriteSnapshotFile(buffer, size);
   Dart_ExitScope();
 
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   return 0;
 }