Change int.fromEnvironment in VM to use same code as int.parse.

runtime/lib/integers.cc

Index: runtime/lib/integers.cc
diff --git a/runtime/lib/integers.cc b/runtime/lib/integers.cc
index 1d93b40e1bf471e97c5b94ae720b74d1955820bb..1500754e3066a0e541828aab71f4426dd11474d4 100644
--- a/runtime/lib/integers.cc
+++ b/runtime/lib/integers.cc
@@ -191,8 +191,8 @@ DEFINE_NATIVE_ENTRY(Integer_equalToInteger, 2) {
 }
 
 
-DEFINE_NATIVE_ENTRY(Integer_parse, 1) {
-  GET_NON_NULL_NATIVE_ARGUMENT(String, value, arguments->NativeArgAt(0));
+static RawObject* ParseInteger(const String& value) {
+  // Used by both Integer_parse and Integer_fromEnvironment.
   if (value.IsOneByteString()) {
     // Quick conversion for unpadded integers in strings.
     const intptr_t len = value.Length();
@@ -229,53 +229,31 @@ DEFINE_NATIVE_ENTRY(Integer_parse, 1) {
 }
 
 
+DEFINE_NATIVE_ENTRY(Integer_parse, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(String, value, arguments->NativeArgAt(0));
+  return ParseInteger(value);
+}
+
+
 DEFINE_NATIVE_ENTRY(Integer_fromEnvironment, 3) {
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(1));
   GET_NATIVE_ARGUMENT(Integer, default_value, arguments->NativeArgAt(2));
   // Call the embedder to supply us with the environment.
   Dart_EnvironmentCallback callback = isolate->environment_callback();
   if (callback != NULL) {
-    Dart_Handle result = callback(Api::NewHandle(isolate, name.raw()));
-    if (Dart_IsError(result)) {
+    Dart_Handle response = callback(Api::NewHandle(isolate, name.raw()));
+    if (Dart_IsString(response)) {
+      const String& value = String::Cast(
+          Object::Handle(isolate, Api::UnwrapHandle(response)));
+      const Object& result = Object::Handle(ParseInteger(value));
+      if (result.IsInteger()) return result.raw();

[Søren Gjesse, 2013/10/31 13:17:49]

I think you need to go whrough return Integer::NewCanonical() here to ensure
non-smi values are canonicalized, e.g.

Integer::NewCanonical(String::Handle(String::New(result.ToCString())));

You can skip it is it's a smi.

[Lasse Reichstein Nielsen, 2013/10/31 13:25:49]

Will do. Florian, is there no simpler way?

+    } else if (Dart_IsError(response)) {

[Søren Gjesse, 2013/10/31 13:17:49]

Looks better with the sting case first and error/null after. Could you change
that for string and bool as well?

[Lasse Reichstein Nielsen, 2013/10/31 13:25:49]

Will do.

       const Object& error =
-          Object::Handle(isolate, Api::UnwrapHandle(result));
+          Object::Handle(isolate, Api::UnwrapHandle(response));
       Exceptions::ThrowArgumentError(
           String::Handle(
               String::New(Error::Cast(error).ToErrorCString())));
-    } else if (Dart_IsString(result)) {
-      uint8_t* digits;
-      intptr_t digits_len;
-      Dart_StringToUTF8(result, &digits, &digits_len);
-      if (digits_len > 0) {
-        // Check for valid integer literal before constructing integer object.
-        // Skip leading minus if present.
-        if (digits[0] == '-') {
-          digits++;
-          digits_len--;
-        }
-        // Check remaining string for decimal or hex-decimal literal.
-        bool is_number = true;
-        if (digits_len > 2 &&
-            digits[0] == '0' &&
-            (digits[1] == 'x' || digits[1] == 'X')) {
-          for (int i = 2; i < digits_len && is_number; i++) {
-            is_number = ('0' <= digits[i] && digits[i] <= '9') ||
-                        ('A' <= digits[i] && digits[i] <= 'F') ||
-                        ('a' <= digits[i] && digits[i] <= 'f');
-          }
-        } else {
-          for (int i = 0; i < digits_len && is_number; i++) {
-            is_number = '0' <= digits[i] && digits[i] <= '9';
-          }
-        }
-        if (digits_len > 0 && is_number) {
-          const Object& value =
-              Object::Handle(isolate, Api::UnwrapHandle(result));
-          ASSERT(value.IsString());
-          return Integer::NewCanonical(String::Cast(value));
-        }
-      }
-    } else if (!Dart_IsNull(result)) {
+    } else  if (!Dart_IsNull(response)) {
       Exceptions::ThrowArgumentError(
           String::Handle(String::New("Illegal environment value")));
     }