Allow package: imports inside isolates

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 381 matching lines @@
     *error = strdup(Dart_GetError(result));                                    \
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
     return false;                                                              \
   }                                                                            \
 
 
 // Returns true on success, false on failure.
 static bool CreateIsolateAndSetupHelper(const char* script_uri,
                                         const char* main,
-                                        bool resolve_script,
                                         void* data,
                                         char** error) {
   Dart_Isolate isolate =
       Dart_CreateIsolate(script_uri, main, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return false;
   }
 
   Dart_EnterScope();
 
@@ skipping 46 matching lines @@
     CHECK_RESULT(uri_lib);
     Dart_Handle builtin_lib =
         Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     CHECK_RESULT(builtin_lib);
 
     // Prepare for script loading by setting up the 'print' and 'timer'
     // closures and setting up 'package root' for URI resolution.
     result = DartUtils::PrepareForScriptLoading(package_root, builtin_lib);
     CHECK_RESULT(result);
 
-    library = DartUtils::LoadScript(script_uri, resolve_script, builtin_lib);
+    library = DartUtils::LoadScript(script_uri, builtin_lib);
   }
   CHECK_RESULT(library);
   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;
   }
   Dart_ExitScope();
   return true;
 }
 
 
 static bool CreateIsolateAndSetup(const char* script_uri,
                                   const char* main,
                                   void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
-                                     false,  // script_uri already canonical.
                                      new IsolateData(),
                                      error);
 }
 
 
 static void PrintVersion() {
   fprintf(stderr, "Dart VM version: %s\n", Dart_VersionString());
 }
 
 
@@ skipping 174 matching lines @@
     ASSERT(debug_port != 0);
     DebuggerConnectionHandler::StartHandler(debug_ip, debug_port);
   }
 
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
   char* isolate_name = BuildIsolateName(script_name, "main");
   if (!CreateIsolateAndSetupHelper(script_name,
                                    "main",
-                                   true,  // Canonicalize the script name.
                                    new IsolateData(),
                                    &error)) {
     fprintf(stderr, "%s\n", error);
     free(error);
     delete [] isolate_name;
     return kErrorExitCode;  // Indicates we encountered an error.
   }
   delete [] isolate_name;
 
   Dart_Isolate isolate = Dart_CurrentIsolate();
@@ skipping 45 matching lines @@
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
   return 0;
 }