Final step towards loading core library scripts directly from the sources

runtime/vm/unit_test.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 <stdio.h>
 
 #include "vm/unit_test.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 45 matching lines @@
     return Dart_Error("not a library");
   }
   if (!Dart_IsString(url)) {
     return Dart_Error("url is not a string");
   }
   const char* url_chars = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_chars);
   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 =
         Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     DART_CHECK_VALID(builtin_lib);
     return DartUtils::CanonicalizeURL(NULL, library, url_chars);
   }
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
     // Handle imports of other built-in libraries present in the SDK.
     if (DartUtils::IsDartIOLibURL(url_chars)) {
       return Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
     } else if (DartUtils::IsDartBuiltinLibURL(url_chars)) {
       return Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     } else {
       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,
                                tag,
                                url_chars);
 }
 
 
 Dart_Handle TestCase::LoadTestScript(const char* script,
                                      Dart_NativeEntryResolver resolver) {
@@ skipping 112 matching lines @@
 
 bool CompilerTest::TestCompileFunction(const Function& function) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ASSERT(ClassFinalizer::AllClassesFinalized());
   const Error& error = Error::Handle(Compiler::CompileFunction(function));
   return error.IsNull();
 }
 
 }  // namespace dart