Changeset 19942 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

May 23, 2009 3:42:57 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47644

Message:

IPRT: Implemented thousand separators for the string formatting code and RTStrFormatNumber. (For instance %'u.)

Location:

trunk/src/VBox/Runtime/common/string

Files:

• strformat.cpp (modified) (4 diffs)
• strformatrt.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/string/strformat.cpp

@@ -170 +170 @@
 static int rtStrFormatNumber(char *psz, KSIZE64 ullValue, unsigned int uiBase, signed int cchWidth, signed int cchPrecision, unsigned int fFlags)
 {
-    const char *    pachDigits = "0123456789abcdef";
-    char *          pszStart = psz;
+    const char     *pachDigits = "0123456789abcdef";
+    char           *pszStart = psz;
     int             cchValue;
     unsigned long   ul;
-#if 0
-    unsigned long   ullow;
-#endif
     int             i;
     int             j;
 
-/** @todo Formatting of 64 bit numbers is broken, fix it! */
-
     /*
-     * Validate and addjust input...
+     * Validate and adjust input...
      */
-/** @todo r=bird: Dmitry, who is calling this code with uiBase == 0? */
-    if (uiBase == 0)
-        uiBase = 10;
-    kASSERT((uiBase >= 2 || uiBase <= 16));
+    Assert(uiBase >= 2 || uiBase <= 16);
     if (fFlags & RTSTR_F_CAPITAL)
         pachDigits = "0123456789ABCDEF";
     if (fFlags & RTSTR_F_LEFT)
         fFlags &= ~RTSTR_F_ZEROPAD;
+    if (    (fFlags & RTSTR_F_THOUSAND_SEP) 
+        &&  (   uiBase != 10 
+             || (fFlags & RTSTR_F_ZEROPAD))) /** @todo implement RTSTR_F_ZEROPAD + RTSTR_F_THOUSAND_SEP. */
+        fFlags &= ~RTSTR_F_THOUSAND_SEP;
 
     /*
@@ -218 +214 @@
         } while (ul);
     }
+    if (fFlags & RTSTR_F_THOUSAND_SEP)
+    {
+        if (cchValue <= 3)
+            fFlags &= ~RTSTR_F_THOUSAND_SEP;
+        else
+            cchValue += cchValue / 3 - (cchValue % 3 == 0);
+    }
 
     /*
@@ -281 +284 @@
     {
         uint64_t    u64 = *(uint64_t *)(void *)&ullValue;
-        do
-        {
-            psz[i--] = pachDigits[u64 % uiBase];
-            u64 /= uiBase;
-        } while (u64);
+        if (fFlags & RTSTR_F_THOUSAND_SEP)
+        {    
+            do
+            {
+                if ((-i - 1) % 4 == 3)
+                    psz[i--] = ' ';
+                psz[i--] = pachDigits[u64 % uiBase];
+                u64 /= uiBase;
+            } while (u64);
+        }
+        else
+        {    
+            do
+            {
+                psz[i--] = pachDigits[u64 % uiBase];
+                u64 /= uiBase;
+            } while (u64);
+        }
     }
     else
     {
         ul = (fFlags & RTSTR_F_VALSIGNED) && (ullValue.ulLo & 0x80000000) ? -(int32_t)ullValue.ulLo : ullValue.ulLo;
-        do
+        if (fFlags & RTSTR_F_THOUSAND_SEP)
         {
-            psz[i--] = pachDigits[ul % uiBase];
-            ul /= uiBase;
-        } while (ul);
+            do
+            {
+                if ((-i - 1) % 4 == 3)
+                    psz[i--] = ' ';
+                psz[i--] = pachDigits[ul % uiBase];
+                ul /= uiBase;
+            } while (ul);
+        }
+        else
+        {
+            do
+            {
+                psz[i--] = pachDigits[ul % uiBase];
+                ul /= uiBase;
+            } while (ul);
+        }
     }
-
 
     /*
@@ -358 +386 @@
                     switch (*pszFormat++)
                     {
-                        case '#':   fFlags |= RTSTR_F_SPECIAL;   continue;
-                        case '-':   fFlags |= RTSTR_F_LEFT;      continue;
-                        case '+':   fFlags |= RTSTR_F_PLUS;      continue;
-                        case ' ':   fFlags |= RTSTR_F_BLANK;     continue;
-                        case '0':   fFlags |= RTSTR_F_ZEROPAD;   continue;
+                        case '#':   fFlags |= RTSTR_F_SPECIAL;      continue;
+                        case '-':   fFlags |= RTSTR_F_LEFT;         continue;
+                        case '+':   fFlags |= RTSTR_F_PLUS;         continue;
+                        case ' ':   fFlags |= RTSTR_F_BLANK;        continue;
+                        case '0':   fFlags |= RTSTR_F_ZEROPAD;      continue;
+                        case '\'':  fFlags |= RTSTR_F_THOUSAND_SEP; continue;
                     }
                     pszFormat--;

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -414 +414 @@
                     case RTSF_FP16:
                     {
-                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION);
+                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION | RTSTR_F_THOUSAND_SEP);
                         cch = RTStrFormatNumber(&szBuf[0], u.fp16.sel, 16, 4, -1, fFlags | RTSTR_F_16BIT);
                         Assert(cch == 4);
@@ -425 +425 @@
                     case RTSF_FP32:
                     {
-                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION);
+                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION | RTSTR_F_THOUSAND_SEP);
                         cch = RTStrFormatNumber(&szBuf[0], u.fp32.sel, 16, 4, -1, fFlags | RTSTR_F_16BIT);
                         Assert(cch == 4);
@@ -436 +436 @@
                     case RTSF_FP64:
                     {
-                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION);
+                        fFlags &= ~(RTSTR_F_VALSIGNED | RTSTR_F_BIT_MASK | RTSTR_F_WIDTH | RTSTR_F_PRECISION | RTSTR_F_THOUSAND_SEP);
                         cch = RTStrFormatNumber(&szBuf[0], u.fp64.sel, 16, 4, -1, fFlags | RTSTR_F_16BIT);
                         Assert(cch == 4);