When URL mapping was specified, library loads where not being called for the URLs that were mapped.

bin/process_script.cc

Index: bin/process_script.cc
===================================================================
--- bin/process_script.cc	(revision 1596)
+++ bin/process_script.cc	(working copy)
@@ -49,19 +49,6 @@
 }
 
 
-static const char* CanonicalizeUrl(const char* reference_dir,
-                                   const char* filename) {
-  static const char* kDartScheme = "dart:";
-  static const intptr_t kDartSchemeLen = strlen(kDartScheme);
-  // If the URL starts with "dart:" then it is not modified as it will be
-  // handled by the VM internally.
-  if (strncmp(filename, kDartScheme, kDartSchemeLen) == 0) {
-    return strdup(filename);
-  }
-  return GetCanonicalPath(reference_dir, filename);
-}
-
-
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,

[Anton Muhin, 2011/11/17 18:15:36]

I believe this code is subject for refactoring, correct.

[siva, 2011/11/17 19:09:46]

Yes. I would like to remove including the file process_script.cc in
gen_snapshot.cc as this handler is
repeated.

On 2011/11/17 18:15:36, antonmuhin wrote:

                                      Dart_Handle library,
                                      Dart_Handle url) {
@@ -77,10 +64,20 @@
     return Dart_Error("accessing url characters failed");
   }
 
+  static const char* kDartScheme = "dart:";
+  static const intptr_t kDartSchemeLen = strlen(kDartScheme);
+  // If the URL starts with "dart:" then it is not modified as it will be
+  // handled by the VM internally.
+  if (strncmp(url_chars, kDartScheme, kDartSchemeLen) == 0) {
+    if (tag == kCanonicalizeUrl) {
+      return url;
+    }
+    return Dart_Error("Do not know how to load '%s'", url_chars);
+  }
   if (tag == kCanonicalizeUrl) {
-    // Create the full path based on the including library and the current url.
+    // Create a canonical path based on the including library and current url.
 
-    // Get the url of the calling library.
+    // Get the url of the including library.
     Dart_Handle library_url = Dart_LibraryUrl(library);
     if (Dart_IsError(library_url)) {
       return Dart_Error("accessing library url failed");
@@ -94,8 +91,9 @@
       return Dart_Error("accessing library url characters failed");
     }
 
-    // Calculate the path.
-    const char* canon_url_chars = CanonicalizeUrl(library_url_chars, url_chars);
+    // Calculate the canonical path.
+    const char* canon_url_chars = GetCanonicalPath(library_url_chars,
+                                                   url_chars);
     Dart_Handle canon_url = Dart_NewString(canon_url_chars);
     free(const_cast<char*>(canon_url_chars));