Changeset 3053 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 14, 2002, 7:33:10 PM (22 years ago)

Author:

mjs

Message:

Reviewed by Ken.

• further corrections to number printing.

• kjs/ustring.cpp: (UString::from): Make number printing match the ECMA standard algorithm.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• kjs/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-12-14  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Ken.
+
+        - further corrections to number printing.
+
+        * kjs/ustring.cpp:
+        (UString::from): Make number printing match the ECMA standard
+        algorithm.
+
 2002-12-14  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-12-14  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Ken.
+
+        - further corrections to number printing.
+
+        * kjs/ustring.cpp:
+        (UString::from): Make number printing match the ECMA standard
+        algorithm.
+
 2002-12-14  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -337 +337 @@
   int decimalPoint;
   int sign;
-
-  char *result = kjs_dtoa(d, 5, 16, &decimalPoint, &sign, NULL);
+  
+  char *result = kjs_dtoa(d, 0, 0, &decimalPoint, &sign, NULL);
   int length = strlen(result);
   
@@ -346 +346 @@
   }
   
-  if (decimalPoint <= 0) {
+  if (decimalPoint <= 0 && decimalPoint > -6) {
     buf[i++] = '0';
     buf[i++] = '.';
@@ -353 +353 @@
     }
     strcpy(buf + i, result);
-  } else if (decimalPoint >= length) {
+  } else if (decimalPoint <= 21 && decimalPoint > 0) {
+    if (length <= decimalPoint) {
+      strcpy(buf + i, result);
+      i += length;
+      for (int j = 0; j < decimalPoint - length; j++) {
+        buf[i++] = '0';
+      }
+      buf[i] = '\0';
+    } else {
+      strncpy(buf + i, result, decimalPoint);
+      i += decimalPoint;
+      buf[i++] = '.';
+      strcpy(buf + i, result + decimalPoint);
+    }
+  } else if (result[0] < '0' || result[0] > '9') {
     strcpy(buf + i, result);
   } else {
-    strncpy(buf + i, result, decimalPoint);
-    i += decimalPoint;
-    buf[i++] = '.';
-    strcpy(buf + i, result + decimalPoint);
-  }
+    buf[i++] = result[0];
+    if (length > 1) {
+      buf[i++] = '.';
+      strcpy(buf + i, result + 1);
+      i += length - 1;
+    }
+    
+    buf[i++] = 'e';
+    buf[i++] = (decimalPoint >= 0) ? '+' : '-';
+    // decimalPoint can't be more than 3 digits decimal given the
+    // nature of float representation
+    int exponential = decimalPoint - 1;
+    if (exponential < 0) {
+      exponential = exponential * -1;
+    }
+    if (exponential >= 100) {
+      buf[i++] = '0' + exponential / 100;
+    }
+    if (exponential >= 10) {
+      buf[i++] = '0' + (exponential % 100) / 10;
+    }
+    buf[i++] = '0' + exponential % 10;
+    buf[i++] = '\0';
+  }
+  
   kjs_freedtoa(result);