Changeset 28771 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 16, 2007, 9:31:35 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=16162
Problems with float parsing on Linux (locale-dependent parsing was used).

• kjs/dtoa.cpp: Removed USE_LOCALE to reduce future confusion.
• kjs/lexer.cpp: (KJS::Lexer::lex): Parse with kjs_strtod, not the system one.

Location:

trunk/JavaScriptCore/kjs

Files:

• dtoa.cpp (modified) (4 diffs)
• lexer.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/dtoa.cpp

@@ -151 +151 @@
  *      is not strictly legal and can cause trouble with aggressively
  *      optimizing compilers (e.g., gcc 2.95.1 under -O2).
- * #define USE_LOCALE to use the current locale's decimal_point value.
  * #define SET_INEXACT if IEEE arithmetic is being used and extra
  *      computation should be done to set the inexact flag when the
@@ -202 +201 @@
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef USE_LOCALE
-#include <locale.h>
-#endif
 
 #ifdef MALLOC
@@ -1560 +1555 @@
         int rounding;
 #endif
-#ifdef USE_LOCALE
-        CONST_ char *s2;
-#endif
 
         sign = nz0 = nz = 0;
@@ -1601 +1593 @@
                         z = 10*z + c - '0';
         nd0 = nd;
-#ifdef USE_LOCALE
-        s1 = localeconv()->decimal_point;
-        if (c == *s1) {
-                c = '.';
-                if (*++s1) {
-                        s2 = s;
-                        for(;;) {
-                                if (*++s2 != *s1) {
-                                        c = 0;
-                                        break;
-                                        }
-                                if (!*++s1) {
-                                        s = s2;
-                                        break;
-                                        }
-                                }
-                        }
-                }
-#endif
         if (c == '.') {
                 c = *++s;

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -25 +25 @@
 #include "lexer.h"
 
+#include "dtoa.h"
 #include "function.h"
 #include "nodes.h"
@@ -460 +461 @@
   double dval = 0;
   if (state == Number) {
-    dval = strtod(m_buffer8.data(), 0L);
+    dval = kjs_strtod(m_buffer8.data(), 0L);
   } else if (state == Hex) { // scan hex numbers
     const char* p = m_buffer8.data() + 2;