Changeset 2912 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Dec 3, 2002, 2:51:39 PM (22 years ago)

Author:

mjs

Message:

• fixed 3114790 - Gamespot reviews pages badly mis-rendering because floating point numbers format wide

Reviewed by: David Hyatt

• kjs/dtoa.cpp: Imported float <--> string conversion routines from David M. Gay. I changed this to fix warnings and avoid colliding with names of standard library functions.
• kjs/dtoa.h: Added a header I made up for dtoa.cpp
• kjs/ustring.cpp: (UString::from): Use new double to string routine (kjs_strtod). (UString::toDouble): Use new string to double routine (kjs_dtoa).
• JavaScriptCore.pbproj/project.pbxproj: Added new files

File:

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

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -39 +39 @@
 #include "identifier.h"
 #include <math.h>
+#include "dtoa.h"
 
 namespace KJS {
@@ -333 +334 @@
 UString UString::from(double d)
 {
-  char buf[40];
-
-  if (d == -0)
-    strcpy(buf,"0");
-  else if (KJS::isNaN(d))
-    strcpy(buf,"NaN");
-  else if (KJS::isPosInf(d))
-    strcpy(buf,"Infinity");
-  else if (KJS::isNegInf(d))
-    strcpy(buf,"-Infinity");
-  else
-    sprintf(buf, "%.16g", d);   // does the right thing
-
-  // ECMA 3rd ed. 9.8.1 9 e: "with no leading zeros"
-  int buflen = strlen(buf);
-  if (buflen >= 4 && buf[buflen-4] == 'e' && buf[buflen-2] == '0') {
-    buf[buflen-2] = buf[buflen-1];
-    buf[buflen-1] = 0;
-  }
-
+  char buf[80];
+  int decimalPoint;
+  int sign;
+
+  char *result = kjs_dtoa(d, 5, 16, &decimalPoint, &sign, NULL);
+  int length = strlen(result);
+  
+  int i = 0;
+  if (sign) {
+    buf[i++] = '-';
+  }
+  
+  if (decimalPoint <= 0) {
+    buf[i++] = 0;
+    buf[i++] = '.';
+    strcpy(buf + i, result);
+  } else if (decimalPoint >= length) {
+    strcpy(buf + i, result);
+  } else {
+    strncpy(buf + i, result, decimalPoint);
+    i += decimalPoint;
+    buf[i++] = '.';
+    strcpy(buf + i, result + decimalPoint);
+  }
+  kjs_freedtoa(result);
+  
   return UString(buf);
 }
@@ -507 +514 @@
     // regular number ?
     char *end;
-    d = strtod(c, &end);
+    d = kjs_strtod(c, &end);
     if ((d != 0.0 || end != c) && d != HUGE_VAL && d != -HUGE_VAL) {
       c = end;