Changeset 42 for rxutilex/trunk/rxutilex.c

Timestamp:

Mar 30, 2018, 8:38:35 PM (8 years ago)

Author:

Alex Taylor

Message:

Make Sys2FormatNumber support negative values

File:

• rxutilex/trunk/rxutilex.c (modified) (7 diffs)

rxutilex/trunk/rxutilex.c

@@ -1067 +1067 @@
  * must not contain any separators already, and any decimal point which it   *
  * contains must be a period (rather than any localized decimal symbol).     *
+ * The maximum value is that of a signed 64-bit integer, or a long double.   *
  *                                                                           *
  * REXX ARGUMENTS:                                                           *
@@ -1081 +1082 @@
     PSZ   pszSep = NULL;                // Thousands separator string
     PSZ   pszDec = NULL;                // Decimal point string
+    PSZ   pszNeg = NULL;                // Negative sign string
 #ifdef LEGACY_C_LOCALE
     float fVal = 0;                     // Input value as floating point
     int   iVal;                         // Input value as integer
 #else
-    ULONGLONG   llVal  = 0;
+    LONGLONG    llVal  = 0;
     long double ldVal  = 0,
                 ldFrac = 0;
-    PSZ   p;
-    CHAR  achFrac[ 16 ];
-    int   rc     = 0;
+    PSZ         p,
+                a;
+    BOOL        bNeg   = FALSE;
+    CHAR        achFrac[ 16 ];
+    int         rc     = 0;
 #endif
 
@@ -1178 +1182 @@
     }
 
+    // Return the formatted number
+    SaveResultString( prsResult, achNumber, strlen(achNumber) );
+
 #else
 
@@ -1184 +1191 @@
         // GetLocaleString has already set the error indicator
         SaveResultString( prsResult, NULL, 0 );
-        return ( 0 );
+        goto finish;
     }
     rc = GetLocaleString( &pszDec, LOCI_sDecimal );
@@ -1190 +1197 @@
         // GetLocaleString has already set the error indicator
         SaveResultString( prsResult, NULL, 0 );
-        return ( 0 );
-    }
+        goto finish;
+    }
+    rc = GetLocaleString( &pszNeg, LOCI_sNegativeSign );
+    if ( rc ) {
+        // GetLocaleString has already set the error indicator
+        SaveResultString( prsResult, NULL, 0 );
+        goto finish;
+    }
+
+    // Check for negative value
+    //if ( argv[0].strptr == '-') bNeg = TRUE;
 
     // Check for a decimal place and treat as float or integer accordingly
@@ -1207 +1223 @@
         else
             sprintf( achFrac, "%.2Lf", ldFrac );
+
         // Format the integer part
-        GroupNumber( achNumber, llVal, pszSep );
+        a = achNumber;
+        if ( llVal < 0 ) {
+            sprintf( a, pszNeg );
+            a += strlen( pszNeg );
+        }
+        GroupNumber( a, llabs( llVal ), pszSep );
         // Append the fractional part
         if (( p = strchr( achFrac, '.')) != NULL ) {
@@ -1217 +1239 @@
     else {
         if (( sscanf( argv[0].strptr, "%lld", &llVal )) != 1 ) return ( 40 );
-        GroupNumber( achNumber, llVal, pszSep );
-    }
-
-    free( pszSep );
+        a = achNumber;
+        if ( llVal < 0 ) {
+            sprintf( a, pszNeg );
+            a += strlen( pszNeg );
+        }
+        GroupNumber( a, llabs( llVal ), pszSep );
+    }
+
+    // Return the formatted number
+    SaveResultString( prsResult, achNumber, strlen(achNumber) );
+
+finish:
+    if ( pszSep ) free( pszSep );
+    if ( pszDec ) free( pszDec );
+    if ( pszNeg ) free( pszNeg );
+
 #endif
-
-    // Return the formatted number
-    SaveResultString( prsResult, achNumber, strlen(achNumber) );        // 2016-02-20 SHL
 
     return ( 0 );