Implement fromEnvironment on bool, int and String

runtime/lib/string.cc

 // Copyright (c) 2011, 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 "vm/bootstrap_natives.h"
 
+#include "include/dart_api.h"
 #include "vm/exceptions.h"
+#include "vm/dart_api_impl.h"
+#include "vm/isolate.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
 
 namespace dart {
 
+DEFINE_NATIVE_ENTRY(String_fromEnvironment, 3) {
+  GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(1));
+  GET_NATIVE_ARGUMENT(String, default_value, arguments->NativeArgAt(2));
+  // Call the embedder to supply us with the environment.
+  Dart_ConfigCallback callback = isolate->config_callback();
+  if (callback != NULL) {
+    Dart_Handle result = callback(kStringConfig,

[Ivan Posva, 2013/10/29 21:42:59]

Here and the other callbacks: You are ignoring all errors being returned from
the callback. If an error was returned, then we should probably have that error
surface as the argument error.

[Søren Gjesse, 2013/10/30 11:44:02]

Done.

If the embedder returns an error object I now throw an argument error like this:

  Exceptions::ThrowArgumentError(
      String::Handle(
          String::New(Error::Cast(error).ToErrorCString())));

I would have liked to throw an internal error instead, like this:

  const Array& exception_arguments = Array::Handle(Array::New(1));
  exception_arguments.SetAt(
      0, Object::Handle(String::New(Error::Cast(error).ToErrorCString())));
  Exceptions::ThrowByType(Exceptions::kInternalError, exception_arguments);

However that hit an assert in the VM:

  runtime/vm/dart_entry.cc:306: error: expected: !cls.IsNull()
  Aborted (core dumped)

Another option will be to just abort like this:

  Exceptions::PropagateError(Error::Cast(error));

I think ArgumentError is OK.

+                                  Api::NewHandle(isolate, name.raw()));
+    if (Dart_IsString(result)) {
+      int len;
+      Dart_StringLength(result, &len);
+      if (len > 0) {

[Ivan Posva, 2013/10/29 21:42:59]

The empty string should be a valid value from the environment.

[Søren Gjesse, 2013/10/30 11:44:02]

Absolutely. Removed the check.

+        const Object& value =
+            Object::Handle(isolate, Api::UnwrapHandle(result));
+        if (value.IsString()) {
+          return Symbols::New(String::Cast(value));
+        }
+      }
+    }
+  }
+  if (default_value.IsNull()) {
+    Exceptions::ThrowArgumentError(
+        String::Handle(String::New("Environment value does not have a value")));
+  }
+  return default_value.raw();
+}
+
+
 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, list, arguments->NativeArgAt(0));
   if (!list.IsGrowableObjectArray() && !list.IsArray()) {
     Exceptions::ThrowArgumentError(list);
   }
 
   Array& a = Array::Handle();
   intptr_t array_len;
   if (list.IsGrowableObjectArray()) {
     const GrowableObjectArray& growableArray = GrowableObjectArray::Cast(list);
@@ skipping 236 matching lines @@
       ? String::Handle(OneByteString::New(length_value, Heap::kNew))
       : String::Handle(TwoByteString::New(length_value, Heap::kNew));
   NoGCScope no_gc;
 
   uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0));
   String::Copy(result, 0, data_position, length_value);
   return result.raw();
 }
 
 }  // namespace dart