Move getters from Options to Platform

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 384 matching lines @@
     }
   }
   Dart_Handle io_lib_url = DartUtils::NewString("dart:io");
   if (Dart_IsError(io_lib_url)) {
     return io_lib_url;
   }
   Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
   if (Dart_IsError(io_lib)) {
     return io_lib;
   }
-  Dart_Handle runtime_options_class_name =
-      DartUtils::NewString("_OptionsImpl");
-  if (Dart_IsError(runtime_options_class_name)) {
-    return runtime_options_class_name;
+  Dart_Handle platform_class_name = DartUtils::NewString("Platform");
+  if (Dart_IsError(platform_class_name)) {
+    return platform_class_name;
   }
-  Dart_Handle runtime_options_type = Dart_GetType(
-      io_lib, runtime_options_class_name, 0, NULL);
-  if (Dart_IsError(runtime_options_type)) {
-    return runtime_options_type;
+  Dart_Handle platform_type =
+      Dart_GetType(io_lib, platform_class_name, 0, NULL);
+  if (Dart_IsError(platform_type)) {
+    return platform_type;
   }
-  Dart_Handle executable_name_name =
-      DartUtils::NewString("_nativeExecutable");
+  Dart_Handle executable_name_name = DartUtils::NewString("_nativeExecutable");
   if (Dart_IsError(executable_name_name)) {
     return executable_name_name;
   }
   Dart_Handle set_executable_name =
-      Dart_SetField(runtime_options_type,
+      Dart_SetField(platform_type,
                     executable_name_name,
                     dart_executable);
   if (Dart_IsError(set_executable_name)) {
     return set_executable_name;
   }
   Dart_Handle script_name_name = DartUtils::NewString("_nativeScript");
   if (Dart_IsError(script_name_name)) {
     return script_name_name;
   }
   Dart_Handle set_script_name =
-      Dart_SetField(runtime_options_type, script_name_name, dart_script);
+      Dart_SetField(platform_type, script_name_name, dart_script);
   if (Dart_IsError(set_script_name)) {
     return set_script_name;
   }
+  Dart_Handle runtime_options_class_name = DartUtils::NewString("_OptionsImpl");
+  if (Dart_IsError(runtime_options_class_name)) {
+    return runtime_options_class_name;
+  }
+  Dart_Handle runtime_options_type = Dart_GetType(
+      io_lib, runtime_options_class_name, 0, NULL);
+  if (Dart_IsError(runtime_options_type)) {
+    return runtime_options_type;
+  }
   Dart_Handle native_name = DartUtils::NewString("_nativeArguments");
   if (Dart_IsError(native_name)) {
     return native_name;
   }
 
   return Dart_SetField(runtime_options_type, native_name, dart_arguments);
 }
 
 
 #define CHECK_RESULT(result)                                                   \
@@ skipping 427 matching lines @@
 
   return Process::GlobalExitCode();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }