oops - printString was wrong when exponent was involved
authorClaus Gittinger <cg@exept.de>
Wed, 22 Mar 2000 14:34:37 +0100
changeset 5317 6004c4c2a916
parent 5316 da1a85984423
child 5318 cfd3e3faa511
oops - printString was wrong when exponent was involved (printed 1E5 as 1E5.0)
Float.st
LongFloat.st
ShortFloat.st
--- a/Float.st	Tue Mar 21 22:32:37 2000 +0100
+++ b/Float.st	Wed Mar 22 14:34:37 2000 +0100
@@ -1309,12 +1309,12 @@
     char fmtBuffer[20];
 
     if (__isString(@global(DefaultPrintFormat))) {
-	fmt = (char *) __stringVal(@global(DefaultPrintFormat));
+        fmt = (char *) __stringVal(@global(DefaultPrintFormat));
     } else {
-	/*
-	 * in case we get called before #initialize ...
-	 */
-	fmt = ".6";
+        /*
+         * in case we get called before #initialize ...
+         */
+        fmt = ".6";
     }
 
     /*
@@ -1335,17 +1335,17 @@
      * (i.e. look if string contains '.' or 'e' and append '.0' if not)
      */
     for (cp = buffer; *cp; cp++) {
-	if ((*cp == '.') || (*cp == 'e')) break;
+        if ((*cp == '.') || (*cp == 'E') || (*cp == 'e')) break;
     }
     if (! *cp) {
-	*cp++ = '.';
-	*cp++ = '0';
-	*cp = '\0';
+        *cp++ = '.';
+        *cp++ = '0';
+        *cp = '\0';
     }
 
     s = __MKSTRING(buffer COMMA_SND);
     if (s != nil) {
-	RETURN (s);
+        RETURN (s);
     }
 %}.
     "
@@ -1358,13 +1358,13 @@
     ^ ObjectMemory allocationFailureSignal raise.
 
     "
-	1.0 printString
-	1.234 printString
-	1e10 printString
-	1.2e3 printString
-	1.2e30 printString
-	(1.0 uncheckedDivide:0) printString
-	(0.0 uncheckedDivide:0) printString
+        1.0 printString
+        1.234 printString
+        1e10 printString
+        1.2e3 printString
+        1.2e30 printString
+        (1.0 uncheckedDivide:0) printString
+        (0.0 uncheckedDivide:0) printString
     "
 
 !
@@ -2030,6 +2030,6 @@
 !Float class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.106 2000-02-07 11:29:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.107 2000-03-22 13:34:37 cg Exp $'
 ! !
 Float initialize!
--- a/LongFloat.st	Tue Mar 21 22:32:37 2000 +0100
+++ b/LongFloat.st	Wed Mar 22 14:34:37 2000 +0100
@@ -691,17 +691,17 @@
      * (i.e. look if string contains '.' or 'e' and append '.0' if not)
      */
     for (cp = buffer; *cp; cp++) {
-	if ((*cp == '.') || (*cp == 'e')) break;
+        if ((*cp == '.') || (*cp == 'e') || (*cp == 'E')) break;
     }
     if (! *cp) {
-	*cp++ = '.';
-	*cp++ = '0';
-	*cp = '\0';
+        *cp++ = '.';
+        *cp++ = '0';
+        *cp = '\0';
     }
 
     s = __MKSTRING(buffer COMMA_SND);
     if (s != nil) {
-	RETURN (s);
+        RETURN (s);
     }
 %}.
     "
@@ -973,5 +973,5 @@
 !LongFloat class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/LongFloat.st,v 1.9 2000-02-12 15:35:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/LongFloat.st,v 1.10 2000-03-22 13:34:24 cg Exp $'
 ! !
--- a/ShortFloat.st	Tue Mar 21 22:32:37 2000 +0100
+++ b/ShortFloat.st	Wed Mar 22 14:34:37 2000 +0100
@@ -703,17 +703,17 @@
      * (i.e. look if string contains '.' or 'e' and append '.0' if not)
      */
     for (cp = buffer; *cp; cp++) {
-	if ((*cp == '.') || (*cp == 'e')) break;
+        if ((*cp == '.') || (*cp == 'e') || (*cp == 'E')) break;
     }
     if (! *cp) {
-	*cp++ = '.';
-	*cp++ = '0';
-	*cp = '\0';
+        *cp++ = '.';
+        *cp++ = '0';
+        *cp = '\0';
     }
 
     s = __MKSTRING(buffer COMMA_SND);
     if (s != nil) {
-	RETURN (s);
+        RETURN (s);
     }
 %}.
     "
@@ -994,5 +994,5 @@
 !ShortFloat class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ShortFloat.st,v 1.56 2000-02-12 15:34:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ShortFloat.st,v 1.57 2000-03-22 13:34:30 cg Exp $'
 ! !