Add fields to platform library, implement them on runtime dart.

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 "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 11 matching lines @@
 
 const char* DartUtils::original_working_directory = NULL;
 const char* DartUtils::kDartScheme = "dart:";
 const char* DartUtils::kDartExtensionScheme = "dart-ext:";
 const char* DartUtils::kAsyncLibURL = "dart:async";
 const char* DartUtils::kBuiltinLibURL = "dart:builtin";
 const char* DartUtils::kCoreLibURL = "dart:core";
 const char* DartUtils::kIOLibURL = "dart:io";
 const char* DartUtils::kIOLibPatchURL = "dart:io-patch";
 const char* DartUtils::kUriLibURL = "dart:uri";
+const char* DartUtils::kPlatformLibURL = "dart:platform";
 const char* DartUtils::kHttpScheme = "http:";
 
 const char* DartUtils::kIdFieldName = "_id";
 
 uint8_t DartUtils::magic_number[] = { 0xf5, 0xf5, 0xdc, 0xdc };
 
 static bool IsWindowsHost() {
 #if defined(TARGET_OS_WINDOWS)
   return true;
 #else  // defined(TARGET_OS_WINDOWS)
@@ skipping 662 matching lines @@
   }
 
   // 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,
+    Dart_Handle package_root_string = NewString(package_root);

[Anders Johnsen, 2013/10/24 17:21:01]

Why not reuse result here?

[Bill Hesse, 2013/10/25 11:06:34]

It's just a matter of style.  In the rest of the function, named locals are used
for values, and result is mainly the result of an
action, testing for error, but without a value in the non-error case.

+    if (Dart_IsError(package_root_string)) {
+      return package_root_string;
+    }
+    const int kNumArgs = 1;
+    Dart_Handle dart_args[kNumArgs];
+    dart_args[0] = package_root_string;
+    result = Dart_Invoke(builtin_lib,
                          NewString("_setPackageRoot"),
                          kNumArgs,
                          dart_args);
+    if (Dart_IsError(result)) {
+      return result;
     }
   }
+
+  // Setup the platform library's _platformHook object.
+  internal_lib = Dart_LookupLibrary(NewString(kPlatformLibURL));
+  DART_CHECK_VALID(internal_lib);
+  Dart_Handle platform =
+      Dart_Invoke(builtin_lib, NewString("_getPlatform"), 0, NULL);
+  result = Dart_SetField(internal_lib, NewString("_platformHook"), platform);
+  DART_CHECK_VALID(result);
   return result;
 }
 
 
 const char* DartUtils::GetCanonicalPath(const char* reference_dir,
                                         const char* filename) {
   if (File::IsAbsolutePath(filename)) {
     return strdup(filename);
   }
 
@@ skipping 307 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