Changeset 66159 in webkit for trunk/JavaScriptCore/wtf/text/WTFString.cpp

Timestamp:

Aug 26, 2010, 5:38:54 PM (15 years ago)

Author:

[email protected]

Message:

Rubber Stamped by Oliver Hunt.

Partially revert r65959. The toString changes regressed the v8 tests,
but keep the toFixed/toExponential/toPrecision changes.

JavaScriptCore:

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/NumberPrototype.cpp:
• runtime/UString.cpp:

(JSC::UString::number):

• wtf/DecimalNumber.h:
• wtf/dtoa.cpp:

(WTF::append):
(WTF::doubleToStringInJavaScriptFormat):

• wtf/dtoa.h:
• wtf/text/WTFString.cpp:
• wtf/text/WTFString.h:

WebCore:

• html/HTMLTreeBuilder.cpp:

(WebCore::serializeForNumberType):

File:

• trunk/JavaScriptCore/wtf/text/WTFString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -26 +26 @@
 #include <stdarg.h>
 #include <wtf/ASCIICType.h>
-#include <wtf/DecimalNumber.h>
+#include <wtf/text/CString.h>
 #include <wtf/StringExtras.h>
 #include <wtf/Vector.h>
-#include <wtf/text/CString.h>
+#include <wtf/dtoa.h>
 #include <wtf/unicode/UTF8.h>
 #include <wtf/unicode/Unicode.h>
@@ -948 +948 @@
 }
 
-static unsigned copyToString(const char* string, unsigned length, NumberToStringBuffer& buffer)
-{
-    for (unsigned i = 0; i < length; ++i)
-        buffer[i] = string[i];
-    return length;
-}
-
-static NEVER_INLINE unsigned nanOrInfToString(double x, NumberToStringBuffer& buffer)
-{
-    ASSERT(isnan(x) || isinf(x));
-    if (isnan(x))
-        return copyToString("NaN", 3, buffer);
-    if (x < 0)
-        return copyToString("-Infinity", 9, buffer);
-    return copyToString("Infinity", 8, buffer);
-}
-
-// toString converts a number to a string without rounding. For values in the range
-// 1e-6 <= x < 1e+21 the result is formatted as a decimal, with values outside of
-// this range being formatted as an exponential.
-unsigned numberToString(double x, NumberToStringBuffer& buffer)
-{
-    // Handle NaN and Infinity.
-    if (UNLIKELY(isnan(x) || isinf(x)))
-        return nanOrInfToString(x, buffer);
-
-    // Convert to decimal, no rounding.
-    DecimalNumber number(x);
-
-    // Format as decimal or exponential, depending on the exponent.
-    return number.exponent() >= -6 && number.exponent() < 21
-        ? number.toStringDecimal(buffer)
-        : number.toStringExponential(buffer);
-}
-
 } // namespace WTF