Make implicit things explicit when loading scripts.

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 365 matching lines @@
   intptr_t len;
   const uint8_t* text_buffer = ReadFileFully(filename, &len, &error_msg);
   if (text_buffer == NULL) {
     return Dart_Error(error_msg);
   }
   Dart_Handle str = Dart_NewStringFromUTF8(text_buffer, len);
   return str;
 }
 
 
+Dart_Handle DartUtils::SetWorkingDirectory(Dart_Handle builtin_lib) {
+  Dart_Handle directory = NewString(original_working_directory);
+  return SingleArgDart_Invoke(directory, builtin_lib, "_setWorkingDirectory");
+}
+
+
 Dart_Handle DartUtils::ResolveScriptUri(Dart_Handle script_uri,
                                         Dart_Handle builtin_lib) {
-  const int kNumArgs = 3;
+  const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = NewString(original_working_directory);
-  dart_args[1] = script_uri;
-  dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
+  dart_args[0] = script_uri;
   return Dart_Invoke(builtin_lib,
                      NewString("_resolveScriptUri"),
                      kNumArgs,
                      dart_args);

[siva, 2013/06/06 01:13:17]

I suppose this can also be:

return SingleArgDart_Invoke(script_uri, builtin_lib, "_resolveScriptUri");

[Cutch, 2013/06/12 19:34:26]

Done.

 }
 
 
 Dart_Handle DartUtils::FilePathFromUri(Dart_Handle script_uri,
                                        Dart_Handle builtin_lib) {
-  const int kNumArgs = 2;
+  const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
-  dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
   return Dart_Invoke(builtin_lib,
                      NewString("_filePathFromUri"),
                      kNumArgs,
                      dart_args);

[siva, 2013/06/06 01:13:17]

I suppose this can also be:

return SingleArgDart_Invoke(script_uri, builtin_lib, "_filePathfromUri");

[Cutch, 2013/06/12 19:34:26]

Done.

 }
 
 
 Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
                                   Dart_Handle url,
                                   Dart_Handle builtin_lib) {
   const int kNumArgs = 2;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = library_url;
   dart_args[1] = url;
@@ skipping 136 matching lines @@
     if (Dart_IsError(source)) {
       return source;
     }
     return Dart_LoadScript(uri, source, 0, 0);
   }
 }
 
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
-  // Always call ResolveScriptUri because as a side effect it sets
-  // the script entry path which is used when automatically resolving
-  // package root.
   Dart_Handle resolved_script_uri =
       ResolveScriptUri(NewString(script_uri), builtin_lib);
   if (Dart_IsError(resolved_script_uri)) {
     return resolved_script_uri;
   }
   // Handle http: requests separately.
   if (DartUtils::IsHttpSchemeURL(script_uri)) {
     return LoadScriptHttp(resolved_script_uri, builtin_lib);
   }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
@@ skipping 79 matching lines @@
   Dart_Handle async_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(async_lib);
   Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
   Dart_Handle timer_closure =
       Dart_Invoke(io_lib, NewString("_getTimerFactoryClosure"), 0, NULL);
   Dart_Handle args[1];
   args[0] = timer_closure;
   DART_CHECK_VALID(Dart_Invoke(
       async_lib, NewString("_setTimerFactoryClosure"), 1, args));
 
+
+  // Set running on Windows flag.
+  result = Dart_SetField(builtin_lib, NewString("_isWindows"),
+                         (IsWindowsHost() ? Dart_True() : Dart_False()));
+  if (Dart_IsError(result)) {
+    return result;
+  }
+  // Set current working directory.
+  result = SetWorkingDirectory(builtin_lib);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+
   // Set up package root if specified.
   if (package_root != NULL) {
     result = NewString(package_root);
     if (!Dart_IsError(result)) {
       const int kNumArgs = 1;
       Dart_Handle dart_args[kNumArgs];
       dart_args[0] = result;
       return Dart_Invoke(builtin_lib,
                          NewString("_setPackageRoot"),
                          kNumArgs,
@@ skipping 279 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart