Final step towards loading core library scripts directly from the sources

runtime/vm/unit_test.cc

Index: runtime/vm/unit_test.cc
===================================================================
--- runtime/vm/unit_test.cc	(revision 22484)
+++ runtime/vm/unit_test.cc	(working copy)
@@ -63,11 +63,19 @@
   if (Dart_IsError(result)) {
     return Dart_Error("accessing url characters failed");
   }
+  Dart_Handle library_url = Dart_LibraryUrl(library);
+  const char* library_url_string = NULL;
+  result = Dart_StringToCString(library_url, &library_url_string);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_chars);
+  bool is_io_library = DartUtils::IsDartIOLibURL(library_url_string);
   if (tag == kCanonicalizeUrl) {
     // If this is a Dart Scheme URL then it is not modified as it will be
     // handled by the VM internally.
-    if (is_dart_scheme_url) {
+    if (is_dart_scheme_url || is_io_library) {
       return url;
     }
     Dart_Handle builtin_lib =
@@ -86,6 +94,13 @@
       return Dart_Error("Do not know how to load '%s'", url_chars);
     }
   }
+  if (is_io_library) {
+    ASSERT(tag == kSourceTag);
+    return Dart_LoadSource(library,
+                           url,
+                           Builtin::PartSource(Builtin::kIOLibrary,
+                                                 url_chars));

[Mads Ager (google), 2013/05/08 06:20:49]

indentation

[siva, 2013/05/08 16:38:17]

Done.

+  }
   return DartUtils::LoadSource(NULL,
                                library,
                                url,