Changeset 101151 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Nov 24, 2011, 10:47:48 PM (14 years ago)

Author:

[email protected]

Message:

JavaScript string to number conversion functions use characters()
​https://bugs.webkit.org/show_bug.cgi?id=72974

Change the various JS to number routines to process strings
using characters8() or characters16() as appropriate.
Implemented using static template methods.

Reviewed by Filip Pizlo.

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::isInfinity):
(JSC::jsHexIntegerLiteral):
(JSC::jsStrDecimalLiteral):
(JSC::toDouble):
(JSC::jsToNumber):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -278 +278 @@
 static const int SizeOfInfinity = 8;
 
-static bool isInfinity(const UChar* data, const UChar* end)
+template <typename CharType>
+static bool isInfinity(const CharType* data, const CharType* end)
 {
     return (end - data) >= SizeOfInfinity
@@ -292 +293 @@
 
 // See ecma-262 9.3.1
-static double jsHexIntegerLiteral(const UChar*& data, const UChar* end)
+template <typename CharType>
+static double jsHexIntegerLiteral(const CharType*& data, const CharType* end)
 {
     // Hex number.
     data += 2;
-    const UChar* firstDigitPosition = data;
+    const CharType* firstDigitPosition = data;
     double number = 0;
     while (true) {
@@ -313 +315 @@
 
 // See ecma-262 9.3.1
-static double jsStrDecimalLiteral(const UChar*& data, const UChar* end)
+template <typename CharType>
+static double jsStrDecimalLiteral(const CharType*& data, const CharType* end)
 {
     ASSERT(data < end);
@@ -319 +322 @@
     // Copy the sting into a null-terminated byte buffer, and call strtod.
     Vector<char, 32> byteBuffer;
-    for (const UChar* characters = data; characters < end; ++characters) {
-        UChar character = *characters;
-        byteBuffer.append(isASCII(character) ? character : 0);
+    for (const CharType* characters = data; characters < end; ++characters) {
+        CharType character = *characters;
+        byteBuffer.append(isASCII(character) ? static_cast<char>(character) : 0);
     }
     byteBuffer.append(0);
@@ -360 +363 @@
     // Not a number.
     return std::numeric_limits<double>::quiet_NaN();
+}
+
+template <typename CharType>
+static double toDouble(const CharType* characters, unsigned size)
+{
+    const CharType* endCharacters = characters + size;
+
+    // Skip leading white space.
+    for (; characters < endCharacters; ++characters) {
+        if (!isStrWhiteSpace(*characters))
+            break;
+    }
+    
+    // Empty string.
+    if (characters == endCharacters)
+        return 0.0;
+    
+    double number;
+    if (characters[0] == '0' && characters + 2 < endCharacters && (characters[1] | 0x20) == 'x' && isASCIIHexDigit(characters[2]))
+        number = jsHexIntegerLiteral(characters, endCharacters);
+    else
+        number = jsStrDecimalLiteral(characters, endCharacters);
+    
+    // Allow trailing white space.
+    for (; characters < endCharacters; ++characters) {
+        if (!isStrWhiteSpace(*characters))
+            break;
+    }
+    if (characters != endCharacters)
+        return std::numeric_limits<double>::quiet_NaN();
+    
+    return number;
 }
 
@@ -376 +411 @@
     }
 
-    const UChar* data = s.characters();
-    const UChar* end = data + size;
-
-    // Skip leading white space.
-    for (; data < end; ++data) {
-        if (!isStrWhiteSpace(*data))
-            break;
-    }
-
-    // Empty string.
-    if (data == end)
-        return 0.0;
-
-    double number;
-    if (data[0] == '0' && data + 2 < end && (data[1] | 0x20) == 'x' && isASCIIHexDigit(data[2]))
-        number = jsHexIntegerLiteral(data, end);
-    else
-        number = jsStrDecimalLiteral(data, end);
-
-    // Allow trailing white space.
-    for (; data < end; ++data) {
-        if (!isStrWhiteSpace(*data))
-            break;
-    }
-    if (data != end)
-        return std::numeric_limits<double>::quiet_NaN();
-
-    return number;
+    if (s.is8Bit())
+        return toDouble(s.characters8(), size);
+    return toDouble(s.characters16(), size);
 }