Move print to corelib.

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 447 matching lines @@
       return file_path;
     }
     Dart_StringToCString(file_path, &url_string);
   }
   if (is_dart_extension_url) {
     if (tag != kImportTag) {
       return Dart_Error("Dart extensions must use import: '%s'", url_string);
     }
     return Extensions::LoadExtension(url_string, library);
   }
-  result = DartUtils::LoadSource(NULL,
-                                 library,
-                                 url,
-                                 tag,
-                                 url_string);
-  if (!Dart_IsError(result) && (tag == kImportTag)) {
-    Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
-  }
-  return result;
+  return DartUtils::LoadSource(NULL,
+                               library,
+                               url,
+                               tag,
+                               url_string);
 }
 
 
 static Dart_Handle ReadSource(Dart_Handle script_uri,
                               Dart_Handle builtin_lib) {
   Dart_Handle script_path = FilePathFromUri(script_uri, builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   const char* script_path_cstr;
@@ skipping 97 matching lines @@
     return false;
   }
   Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
   if (Dart_IsError(builtin_lib)) {
     *error = strdup(Dart_GetError(builtin_lib));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
 
+  // Setup the corelib 'print' function.
+  Dart_Handle print =
+      Dart_Invoke(builtin_lib, Dart_NewString("_getPrintClosure"), 0, 0);
+  Dart_Handle coreimpl = Dart_LookupLibrary(Dart_NewString("dart:coreimpl"));
+  Dart_Handle print_impl =
+      Dart_GetClass(coreimpl, Dart_NewString("PrintImplementation"));
+  Dart_SetField(print_impl, Dart_NewString("_printClosure"), print);
+
   // Setup the IO library.
   Dart_Handle io_lib = Builtin::LoadLibrary(Builtin::kIOLibrary);
   Builtin::SetupIOLibrary(io_lib);
 
   if (package_root != NULL) {
     const int kNumArgs = 1;
     Dart_Handle dart_args[kNumArgs];
 
     Dart_Handle handle = Dart_NewString(package_root);
     if (Dart_IsError(handle)) {
@@ skipping 25 matching lines @@
   if (!Dart_IsLibrary(library)) {
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
              script_uri);
     *error = strdup(errbuf);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
-  // Implicitly import builtin into app.
-  Builtin::ImportLibrary(library, Builtin::kBuiltinLibrary);
   Dart_ExitScope();
   return true;
 }
 
 
 static bool CreateIsolateAndSetup(const char* script_uri,
                                   const char* main,
                                   void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
@@ skipping 202 matching lines @@
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
   free(const_cast<char*>(original_working_directory));
 
   return 0;
 }