Changeset 1667Tweet

Timestamp:

Jul 26, 2012, 8:22:36 AM (11 years ago)

Author:

sam

Message:

math: add an sprintf() method to real numbers, and ensure they are always
fully initialised.

Location:

trunk/src

Files:

• lol/math/real.h (modified) (1 diff)
• math/real.cpp (modified) (5 diffs)

trunk/src/lol/math/real.h

@@ -125 +125 @@
     void hexprint() const;
     void print(int ndigits = 150) const;
+    void sprintf(char *str, int ndigits = 150) const;
 
     /* Additional operators using base C++ types */

trunk/src/math/real.cpp

@@ -41 +41 @@
 {
     m_mantissa = new uint32_t[BIGITS];
+    memset(m_mantissa, 0, BIGITS * sizeof(uint32_t));
     m_signexp = 0;
 }
@@ -1298 +1299 @@
 template<> void real::hexprint() const
 {
-    printf("%08x", m_signexp);
+    std::printf("%08x", m_signexp);
     for (int i = 0; i < BIGITS; i++)
-        printf(" %08x", m_mantissa[i]);
-    printf("\n");
-}
+        std::printf(" %08x", m_mantissa[i]);
+    std::printf("\n");
+}
+
+template<> void real::sprintf(char *str, int ndigits) const;
 
 template<> void real::print(int ndigits) const
 {
+    char *buf = new char[ndigits + 32 + 10];
+    real::sprintf(buf, ndigits);
+    std::printf("%s\n", buf);
+    delete[] buf;
+}
+
+template<> void real::sprintf(char *str, int ndigits) const
+{
     real x = *this;
 
     if (x.m_signexp >> 31)
     {
-        printf("-");
+        *str++ = '-';
         x = -x;
     }
@@ -1316 +1327 @@
     if (!x)
     {
-        printf("0.0\n");
+        std::strcpy(str, "0.0\n");
         return;
     }
@@ -1335 +1346 @@
     {
         int digit = (int)floor(x);
-        printf("%i", digit);
+        *str++ = '0' + digit;
         if (i == 0)
-            printf(".");
+            *str++ = '.';
         x -= real(digit);
         x *= R_10;
@@ -1343 +1354 @@
 
     /* Print exponent information */
-    if (exponent < 0)
-        printf("e-%i", -exponent);
-    else if (exponent > 0)
-        printf("e+%i", exponent);
-
-    printf("\n");
+    if (exponent)
+        str += std::sprintf(str, "e%c%i", exponent > 0 ? '+' : '-', -exponent);
+
+    *str++ = '\0';
 }