[Numpy-svn] r6209 - trunk/numpy/core/src

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-12-27 08:53:15 -0600 (Sat, 27 Dec 2008)
New Revision: 6209

Modified:
   trunk/numpy/core/src/scalartypes.inc.src
Log:
More work on formatting float.

Modified: trunk/numpy/core/src/scalartypes.inc.src
===================================================================
--- trunk/numpy/core/src/scalartypes.inc.src	2008-12-27 14:44:11 UTC (rev 6208)
+++ trunk/numpy/core/src/scalartypes.inc.src	2008-12-27 14:53:15 UTC (rev 6209)
@@ -619,17 +619,30 @@
 format_ at name@(char *buf, size_t buflen, @name@ val, unsigned int prec)
 {
     int cnt, i;
+    char format[32];
+    register char* cp;
 
-    cnt = PyOS_snprintf(buf, buflen, FMT, prec, val);
+    //cnt = PyOS_snprintf(buf, buflen, FMT, prec, val);
+    PyOS_snprintf(format, sizeof(format), "%%.%i" NPY_ at NAME@_FMT, prec);
+    PyOS_ascii_formatd(buf, buflen, format, val);
+    cp = buf;
+    if (*cp == '-') {
+        ++cp;
+    }
 
     /* If nothing but digits after sign, append ".0" */
-    for (i = (val < 0) ? 1 : 0; i < cnt; ++i) {
-        if (!isdigit(Py_CHARMASK(buf[i]))) {
+    for (; *cp != '\0';  ++cp) {
+        if (!isdigit(Py_CHARMASK(*cp))) {
             break;
         }
     }
-    if (i == cnt && buflen >= cnt + 3) {
-        strcpy(&buf[cnt],".0");
+
+    if (*cp == '\0') {
+	cp[0] = '.';
+	cp[1] = '0';
+	cp[2] = '\0';
+	cp += 3;
+	return ;
     }
 }