Rewrite double.parse.

runtime/lib/double.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 <math.h>
 
 #include "vm/bootstrap_natives.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/code_generator.h"  // DartModulo.
@@ skipping 182 matching lines @@
 #endif
 
 DEFINE_NATIVE_ENTRY(Double_toInt, 1) {
   const Double& arg = Double::CheckedHandle(arguments->NativeArgAt(0));
   return DoubleToInteger(arg.value(), "Infinity or NaN toInt");
 }
 
 
 DEFINE_NATIVE_ENTRY(Double_parse, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(String, value, arguments->NativeArgAt(0));
-  if (value.IsOneByteString()) {
-    // Quick conversion for unpadded doubles in strings.
-    const intptr_t len = value.Length();
-    if (len > 0) {
-      const char* cstr = value.ToCString();
-      ASSERT(cstr != NULL);
-      // Dart differences from strtod:
-      // a) '5.' is not a valid double (no digit after period).
-      // b) '+5.0' is not a valid double (leading plus).
-      if (cstr[0] != '+') {
-        bool dot_ok = true;
-        const char* tmp = cstr;
-        while (*tmp != '\0') {
-          const char ch = *tmp++;
-          if (ch == '.') {
-            const char nextCh = *tmp;
-            dot_ok = ('0' <= nextCh) && (nextCh <= '9');
-            break;
-          }
-        }
-        if (dot_ok) {
-          double double_value;
-          if (CStringToDouble(cstr, len, &double_value)) {
-            return Double::New(double_value);
-          }
-        }
-      }
-    }
-  }
-  Scanner scanner(value, Symbols::Empty());
-  const Scanner::GrowableTokenStream& tokens = scanner.GetStream();
-  String* number_string;
-  bool is_positive;
-  if (Scanner::IsValidLiteral(tokens,
-                              Token::kDOUBLE,
-                              &is_positive,
-                              &number_string)) {
-    // Even if original string was two byte string the scanner should produce
-    // literal value that is represented as a one byte string because all
-    // characters in the double literal are Latin-1.
-    ASSERT(number_string->IsOneByteString());
-    const char* cstr = number_string->ToCString();
 
-    double double_value;
-    bool ok = CStringToDouble(cstr, number_string->Length(), &double_value);
-    ASSERT(ok);
+  const intptr_t len = value.Length();
 
-    if (!is_positive) {
-      double_value = -double_value;
-    }
-    return Double::New(double_value);
+  if (!value.IsOneByteString() || len == 0) {

[Ivan Posva, 2013/05/18 00:45:43]

What about an external one byte string? Or an external two byte string that only
contains Latin1 values, which is a legal situation to be in.

[floitsch, 2013/05/20 13:15:29]

They would have been converted to OneByteStrings in the Dart part.

[Ivan Posva, 2013/05/20 16:00:23]

A comment to that effect would be great.

On a separate note: I do think it would be beneficial to allow external one byte
strings as well, no?

[floitsch, 2013/05/21 14:39:31]

Done.

+    return Object::null();
   }
 
-  if (Scanner::IsValidLiteral(tokens,
-                              Token::kINTEGER,
-                              &is_positive,
-                              &number_string)) {
-    Integer& res = Integer::Handle(Integer::New(*number_string));
-    if (is_positive) {
-      return Double::New(res.AsDoubleValue());
-    }
-    return Double::New(-res.AsDoubleValue());
+  double double_value;
+  const char* cstr = value.ToCString();
+  ASSERT(cstr != NULL);
+  if (CStringToDouble(cstr, len, &double_value)) {
+    return Double::New(double_value);
+  } else {
+    return Object::null();
   }
-
-  // Infinity and nan.
-  if (Scanner::IsValidLiteral(tokens,
-                              Token::kIDENT,
-                              &is_positive,
-                              &number_string)) {
-    if (number_string->Equals("NaN")) {
-      return Double::New(NAN);
-    }
-    if (number_string->Equals("Infinity")) {
-      if (is_positive) {
-        return Double::New(INFINITY);
-      }
-      return Double::New(-INFINITY);
-    }
-  }
-
-  const Array& args = Array::Handle(Array::New(1));
-  args.SetAt(0, value);
-  Exceptions::ThrowByType(Exceptions::kFormat, args);
-  return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Double_toStringAsFixed, 2) {
   // The boundaries are exclusive.
   static const double kLowerBoundary = -1e21;
   static const double kUpperBoundary = 1e21;
 
   const Double& arg = Double::CheckedHandle(arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, fraction_digits, arguments->NativeArgAt(1));
@@ skipping 61 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Double_getIsNegative, 1) {
   const Double& arg = Double::CheckedHandle(arguments->NativeArgAt(0));
   // Include negative zero, infinity.
   return Bool::Get(signbit(arg.value()) && !isnan(arg.value()));
 }
 
 // Add here only functions using/referring to old-style casts.
 
 }  // namespace dart