Changeset 7245 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 12, 2004, 4:04:11 PM (21 years ago)

Author:

darin

Message:

Reviewed by Adele.

• fixed 3 problems with parse functions that I just wrote, fixing 3 more Mozilla JavaScript tests

• kjs/function.cpp: (KJS::parseDigit): Fix typo, 'Z' instead of 'z', that prevented lowercase hex digits from working. (KJS::parseInt): Add octal support. Specification says it's optional, but I guess not. (KJS::parseFloat): Fix check for "0x" in parseFloat to return 0 rather than NaN. Also add code to skip leading "+" or "-".

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -527 +527 @@
     } else if (c >= 'A' && c <= 'Z') {
         digit = c - 'A' + 10;
-    } else if (c >= 'a' && c <= 'Z') {
+    } else if (c >= 'a' && c <= 'z') {
         digit = c - 'a' + 10;
     }
@@ -555 +555 @@
     }
 
-    if (length - p >= 2 && s[p] == '0' && (s[p + 1] == 'x' || s[p + 1] == 'X')) {
-        if (radix == 0)
-            radix = 16;
-        if (radix == 16)
-            p += 2;
-    }
-    if (radix == 0)
-        radix = 10;
+    if ((radix == 0 || radix == 16) && length - p >= 2 && s[p] == '0' && (s[p + 1] == 'x' || s[p + 1] == 'X')) {
+        radix = 16;
+        p += 2;
+    } else if (radix == 0) {
+        if (p < length && s[p] == '0')
+            radix = 8;
+        else
+            radix = 10;
+    }
 
     if (radix < 2 || radix > 36)
@@ -587 +588 @@
 static double parseFloat(const UString &s)
 {
+    // Check for 0x prefix here, because toDouble allows it, but we must treat it as 0.
+    // Need to skip any whitespace and then one + or - sign.
     int length = s.size();
     int p = 0;
-
-    // Skip whitespace.
     while (p < length && isStrWhiteSpace(s[p].uc)) {
         ++p;
     }
-
-    // Check for 0x numbers here, because toDouble allows them, but we must not.
+    if (p < length && (s[p] == '+' || s[p] == '-')) {
+        ++p;
+    }
     if (length - p >= 2 && s[p] == '0' && (s[p + 1] == 'x' || s[p + 1] == 'X')) {
-        return NaN;
-    }
-
-    return s.substr(p).toDouble( true /*tolerant*/, false /* NaN for empty string */ );
+        return 0;
+    }
+
+    return s.toDouble( true /*tolerant*/, false /* NaN for empty string */ );
 }