- Make the URI resolution methods used by the tag handler private.

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 246 matching lines @@
     // 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;
     }
     Dart_Handle dart_args[2];
     dart_args[0] = library_url;
     dart_args[1] = url;
     if (is_dart_extension_url) {
-      return Dart_InvokeStatic(builtin_lib,
-                               Dart_NewString(""),
-                               Dart_NewString("resolveExtensionUri"),
-                               2, dart_args);
+      return Dart_Invoke(
+          builtin_lib, Dart_NewString("_resolveExtensionUri"), 2, dart_args);
     } else {
-      return Dart_InvokeStatic(builtin_lib,
-                               Dart_NewString(""), Dart_NewString("resolveUri"),
-                               2, dart_args);
+      return Dart_Invoke(
+          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::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 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);
   } else {
     // Get the file path out of the url.
     Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
     Dart_Handle dart_args[1];
     dart_args[0] = url;
-    Dart_Handle file_path = Dart_InvokeStatic(builtin_lib,
-                                              Dart_NewString(""),
-                                              Dart_NewString("filePathFromUri"),
-                                              1, dart_args);
+    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);
   }
   result = DartUtils::LoadSource(NULL,
                                  library,
                                  url,
                                  tag,
                                  url_string,
                                  import_map);
   if (!Dart_IsError(result) && (tag == kImportTag)) {
     Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
   }
   return result;
 }
 
 
 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_InvokeStatic(builtin_lib,
-                                             Dart_NewString(""),
-                                             Dart_NewString("resolveScriptUri"),
-                                             3, dart_args);
+  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_InvokeStatic(builtin_lib,
-                                              Dart_NewString(""),
-                                              Dart_NewString("filePathFromUri"),
-                                              1, dart_args);
+  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);
   if (Dart_IsError(source)) {
     return source;
   }
   intptr_t length =  (map == NULL) ? 0 : map->count();
@@ skipping 233 matching lines @@
     if (Dart_IsError(result)) {
       return ErrorExit("Error setting breakpoint at '%s': %s\n",
           breakpoint_at,
           Dart_GetError(result));
     }
   }
   // Lookup and invoke the top level main function.
   result = Dart_InvokeStatic(library,
                              Dart_NewString(""),
                              Dart_NewString("main"),
-                             0,
-                             NULL);
+                             0, NULL);
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
   // Keep handling messages until the last active receive port is closed.
   result = Dart_RunLoop();
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
 
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate event handler.
   EventHandler::Terminate();
   // 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;
 }