Revert my last change.

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"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/dbg_connection.h"
 #include "bin/directory.h"
 #include "bin/eventhandler.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
 #include "bin/platform.h"
 #include "bin/process.h"
 #include "platform/globals.h"
 
 // snapshot_buffer points to a snapshot if we link in a snapshot otherwise
 // it is initialized to NULL.
 extern const uint8_t* snapshot_buffer;
 
 
-// Global state that stores the original working directory..
+// Global state that stores a pointer to the application script file.
+static const char* original_script_name = NULL;
 static const char* original_working_directory = NULL;
+static const char* original_script_url = NULL;
 
 
 // Global state that stores the import URL map specified on the
 // command line.
 static CommandLineOptions* import_map_options = NULL;
 
 
 // Global state that indicates whether pprof symbol information is
 // to be generated or not.
 static const char* generate_pprof_symbols_filename = NULL;
@@ skipping 18 matching lines @@
 // (This pointer points into an argv buffer and does not need to be
 // free'd.)
 static const char* package_root = NULL;
 
 
 // Global flag that is used to indicate that we want to compile all the
 // dart functions and not run anything.
 static bool has_compile_all = false;
 
 
-static bool IsWindowsHost() {
-#if defined(TARGET_OS_WINDOWS)
-  return true;
-#else  // defined(TARGET_OS_WINDOWS)
-  return false;
-#endif  // defined(TARGET_OS_WINDOWS)
-}
-
-
 static bool IsValidFlag(const char* name,
                         const char* prefix,
                         intptr_t prefix_length) {
   intptr_t name_length = strlen(name);
   return ((name_length > prefix_length) &&
           (strncmp(name, prefix, prefix_length) == 0));
 }
 
 
 static void ProcessBreakpointOption(const char* funcname) {
@@ skipping 210 matching lines @@
     if (buffer_size > 0) {
       ASSERT(buffer != NULL);
       pprof_file->WriteFully(buffer, buffer_size);
     }
     delete pprof_file;  // Closes the file.
     Dart_ExitScope();
   }
 }
 
 
-
-static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
-                                    Dart_Handle builtin_lib) {
-  const int kNumArgs = 3;
-  Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = Dart_NewString(original_working_directory);
-  dart_args[1] = script_uri;
-  dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
-  return Dart_Invoke(
-      builtin_lib, Dart_NewString("_resolveScriptUri"), kNumArgs, dart_args);
-}
-
-
-static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
-                                   Dart_Handle builtin_lib) {
-  const int kNumArgs = 2;
-  Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = script_uri;
-  dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
-  Dart_Handle script_path = Dart_Invoke(
-      builtin_lib, Dart_NewString("_filePathFromUri"), kNumArgs, dart_args);
-  return script_path;
-}
-
-
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                      Dart_Handle library,
-                                     Dart_Handle url) {
+                                     Dart_Handle url,
+                                     Dart_Handle import_map) {
   if (!Dart_IsLibrary(library)) {
     return Dart_Error("not a library");
   }
   if (!Dart_IsString8(url)) {
     return Dart_Error("url is not a string");
   }
   const char* url_string = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_string);
   if (Dart_IsError(result)) {
     return result;
   }
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_string);
   bool is_dart_extension_url = DartUtils::IsDartExtensionSchemeURL(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) {
       return url;
     }
     // Resolve the url within the context of the library's URL.
     Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
     Dart_Handle library_url = Dart_LibraryUrl(library);
     if (Dart_IsError(library_url)) {
       return library_url;
     }
-    const int kNumArgs = 2;
-    Dart_Handle dart_args[kNumArgs];
+    Dart_Handle dart_args[2];
     dart_args[0] = library_url;
     dart_args[1] = url;
     return Dart_Invoke(
-        builtin_lib, Dart_NewString("_resolveUri"), kNumArgs, dart_args);
+        builtin_lib, Dart_NewString("_resolveUri"), 2, dart_args);
   }
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
     // Handle imports of other built-in libraries present in the SDK.
     if (DartUtils::IsDartCryptoLibURL(url_string)) {
       return Builtin::LoadLibrary(Builtin::kCryptoLibrary);
     } else if (DartUtils::IsDartIOLibURL(url_string)) {
       return Builtin::LoadLibrary(Builtin::kIOLibrary);
     } else if (DartUtils::IsDartJsonLibURL(url_string)) {
       return Builtin::LoadLibrary(Builtin::kJsonLibrary);
     } else if (DartUtils::IsDartUriLibURL(url_string)) {
       return Builtin::LoadLibrary(Builtin::kUriLibrary);
     } else if (DartUtils::IsDartUtfLibURL(url_string)) {
       return Builtin::LoadLibrary(Builtin::kUtfLibrary);
     } else {
       return Dart_Error("Do not know how to load '%s'", url_string);
     }
   } else {
     // Get the file path out of the url.
     Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
-    Dart_Handle file_path = FilePathFromUri(url, builtin_lib);
+    Dart_Handle dart_args[1];
+    dart_args[0] = url;
+    Dart_Handle file_path = Dart_Invoke(
+        builtin_lib, Dart_NewString("_filePathFromUri"), 1, dart_args);
     if (Dart_IsError(file_path)) {
       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);
+                                 url_string,
+                                 import_map);
   if (!Dart_IsError(result) && (tag == kImportTag)) {
     Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
   }
   return result;
 }
 
 
-static Dart_Handle ReadSource(Dart_Handle script_uri,
-                              Dart_Handle builtin_lib) {
-  Dart_Handle script_path = FilePathFromUri(script_uri, builtin_lib);
+static Dart_Handle LoadScript(Dart_Handle builtin_lib,
+                              CommandLineOptions* map) {
+  Dart_Handle dart_args[3];
+  dart_args[0] = Dart_NewString(original_working_directory);
+  dart_args[1] = Dart_NewString(original_script_name);
+#if !defined(TARGET_OS_WINDOWS)
+  dart_args[2] = Dart_False();
+#else  // !defined(TARGET_OS_WINDOWS)
+  dart_args[2] = Dart_True();
+#endif  // !defined(TARGET_OS_WINDOWS)
+  Dart_Handle script_url = Dart_Invoke(
+      builtin_lib, Dart_NewString("_resolveScriptUri"), 3, dart_args);
+  if (Dart_IsError(script_url)) {
+    fprintf(stderr, "%s", Dart_GetError(script_url));
+    return script_url;
+  }
+  if (original_script_url == NULL) {
+    const char* script_url_cstr;
+    Dart_StringToCString(script_url, &script_url_cstr);
+    original_script_url = strdup(script_url_cstr);
+  }
+  dart_args[0] = script_url;
+  Dart_Handle script_path = Dart_Invoke(
+      builtin_lib, Dart_NewString("_filePathFromUri"), 1, dart_args);
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   const char* script_path_cstr;
   Dart_StringToCString(script_path, &script_path_cstr);
   Dart_Handle source = DartUtils::ReadStringFromFile(script_path_cstr);
-  return source;
-}
-
-
-static Dart_Handle LoadScript(const char* script_uri,
-                              bool resolve_script,
-                              Dart_Handle builtin_lib) {
-  Dart_Handle resolved_script_uri;
-  if (resolve_script) {
-    resolved_script_uri = ResolveScriptUri(Dart_NewString(script_uri),
-                                           builtin_lib);
-    if (Dart_IsError(resolved_script_uri)) {
-      return resolved_script_uri;
-    }
-  } else {
-    resolved_script_uri = Dart_NewString(script_uri);
-  }
-  Dart_Handle source = ReadSource(resolved_script_uri, builtin_lib);
   if (Dart_IsError(source)) {
     return source;
   }
-  return Dart_LoadScript(resolved_script_uri, source);
-}
-
-
-static Dart_Handle CreateImportMap(CommandLineOptions* map) {
   intptr_t length =  (map == NULL) ? 0 : map->count();
   Dart_Handle import_map = Dart_NewList(length * 2);
   for (intptr_t i = 0; i < length; i++) {
     ASSERT(map->GetArgument(i) != NULL);
     char* name = strdup(map->GetArgument(i));
     ASSERT(name != NULL);
     char* map_name = strchr(name, ',');
     intptr_t index = i * 2;
     if (map_name != NULL) {
       *map_name = '\0';
       map_name += 1;
       Dart_ListSetAt(import_map, index, Dart_NewString(name));
       Dart_ListSetAt(import_map, (index + 1), Dart_NewString(map_name));
     } else {
       Dart_ListSetAt(import_map, index, Dart_NewString(name));
       Dart_ListSetAt(import_map, (index + 1), Dart_NewString(""));
     }
     free(name);
   }
-  return import_map;
+  return Dart_LoadScript(script_url, source, import_map);
 }
 
 
 // Returns true on success, false on failure.
-static bool CreateIsolateAndSetupHelper(const char* script_uri,
-                                        const char* main,
-                                        bool resolve_script,
-                                        void* data,
-                                        char** error) {
+static bool CreateIsolateAndSetup(const char* name_prefix,
+                                  void* data, char** error) {
   Dart_Isolate isolate =
-      Dart_CreateIsolate(script_uri, main, snapshot_buffer, data, error);
+      Dart_CreateIsolate(name_prefix, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return false;
   }
 
   Dart_EnterScope();
 
   if (snapshot_buffer != NULL) {
     // Setup the native resolver as the snapshot does not carry it.
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
   }
 
   // Set up the library tag handler for this isolate.
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   if (Dart_IsError(result)) {
     *error = strdup(Dart_GetError(result));
-    Dart_ExitScope();
-    Dart_ShutdownIsolate();
-    return false;
-  }
-
-  // Set up the import map for this isolate.
-  result = Dart_SetImportMap(CreateImportMap(import_map_options));
-  if (Dart_IsError(result)) {
-    *error = strdup(Dart_GetError(result));
-    Dart_ExitScope();
-    Dart_ShutdownIsolate();
     return false;
   }
 
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
   if (Dart_IsError(uri_lib)) {
     *error = strdup(Dart_GetError(uri_lib));
-    Dart_ExitScope();
-    Dart_ShutdownIsolate();
     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;
   }
 
   if (package_root != NULL) {
-    const int kNumArgs = 1;
-    Dart_Handle dart_args[kNumArgs];
+    Dart_Handle dart_args[1];
 
     Dart_Handle handle = Dart_NewString(package_root);
     if (Dart_IsError(handle)) {
       *error = strdup(Dart_GetError(handle));
-      Dart_ExitScope();
-      Dart_ShutdownIsolate();
       return false;
     }
     dart_args[0] = handle;
 
     Dart_Handle result = Dart_Invoke(builtin_lib,
-        Dart_NewString("_setPackageRoot"), kNumArgs, dart_args);
+        Dart_NewString("_setPackageRoot"), 1, dart_args);
     if (Dart_IsError(result)) {
       *error = strdup(Dart_GetError(result));
-      Dart_ExitScope();
-      Dart_ShutdownIsolate();
       return false;
     }
   }
 
   // Load the specified application script into the newly created isolate.
-  Dart_Handle library = LoadScript(script_uri, resolve_script, builtin_lib);
+  Dart_Handle library = LoadScript(builtin_lib, import_map_options);
   if (Dart_IsError(library)) {
     *error = strdup(Dart_GetError(library));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   if (!Dart_IsLibrary(library)) {
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
-             script_uri);
+             original_script_name);
     *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,
-                                     false,  // script_uri already canonical.
-                                     data,
-                                     error);
-}
-
-
 static void PrintUsage() {
   fprintf(stderr,
           "dart [<vm-flags>] <dart-script-file> [<dart-options>]\n");
 }
 
 
 static Dart_Handle SetBreakpoint(const char* breakpoint_at,
                                  Dart_Handle library) {
   Dart_Handle result;
   if (strchr(breakpoint_at, ':')) {
@@ skipping 49 matching lines @@
 
 
 static int ErrorExit(const char* format, ...) {
   va_list arguments;
   va_start(arguments, format);
   vfprintf(stderr, format, arguments);
   va_end(arguments);
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
+
+  free(const_cast<char*>(original_script_name));
   free(const_cast<char*>(original_working_directory));
+  free(const_cast<char*>(original_script_url));
 
   return kErrorExitCode;
 }
 
 
 int main(int argc, char** argv) {
   char* executable_name;
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
@@ skipping 14 matching lines @@
                      &dart_options) < 0) {
     PrintUsage();
     return kErrorExitCode;
   }
 
   Dart_SetVMFlags(vm_options.count(), vm_options.arguments());
 
   // Initialize the Dart VM.
   Dart_Initialize(CreateIsolateAndSetup, NULL);
 
+  original_script_name = strdup(script_name);
   original_working_directory = Directory::Current();
 
   // 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.
-                                   NULL,
-                                   &error)) {
+  char* isolate_name = BuildIsolateName(original_script_name, "main");
+  if (!CreateIsolateAndSetup(isolate_name, NULL, &error)) {
     fprintf(stderr, "%s\n", error);
+    free(const_cast<char*>(original_script_name));
     free(const_cast<char*>(original_working_directory));
     free(error);
     delete [] isolate_name;
     return 255;  // Indicates we encountered an error.
   }
   delete [] isolate_name;
 
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
   Dart_EnterScope();
 
   if (has_compile_all) {
     result = Dart_CompileAll();
     if (Dart_IsError(result)) {
       return ErrorExit("%s\n", Dart_GetError(result));
     }
   }
 
   // Create a dart options object that can be accessed from dart code.
   Dart_Handle options_result =
-      SetupRuntimeOptions(&dart_options, executable_name, script_name);
+      SetupRuntimeOptions(&dart_options, executable_name, original_script_name);
   if (Dart_IsError(options_result)) {
     return ErrorExit("%s\n", Dart_GetError(options_result));
   }
-  // Lookup the library of the root script.
-  Dart_Handle library = Dart_RootLibrary();
-  if (Dart_IsNull(library)) {
-    return ErrorExit("Unable to find root library for '%s'\n",
-                     script_name);
+  // Lookup the library of the main script.
+  Dart_Handle script_url = Dart_NewString(original_script_url);
+  Dart_Handle library = Dart_LookupLibrary(script_url);
+  if (Dart_IsError(library)) {
+    return ErrorExit("%s\n", Dart_GetError(library));
   }
   // Set debug breakpoint if specified on the command line.
   if (breakpoint_at != NULL) {
     result = SetBreakpoint(breakpoint_at, library);
     if (Dart_IsError(result)) {
       return ErrorExit("Error setting breakpoint at '%s': %s\n",
           breakpoint_at,
           Dart_GetError(result));
     }
   }
@@ skipping 16 matching lines @@
   }
 
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
+  free(const_cast<char*>(original_script_name));
   free(const_cast<char*>(original_working_directory));
+  free(const_cast<char*>(original_script_url));
 
   return 0;
 }