Changeset 42

Timestamp:

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

Author:

Alex Taylor

Message:

Make Sys2FormatNumber support negative values

Location:

rxutilex/trunk

Files:

• rxutilex.c (modified) (7 diffs)
• rxutilex.def (modified) (1 diff)
• rxutilex.txt (modified) (3 diffs)
• testlib.cmd (modified) (1 diff)

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 );

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.6#@##1## 30 Mar 2018 12:07:43     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.6#@##1## 30 Mar 2018 14:26:03     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs

rxutilex/trunk/rxutilex.txt

@@ -169 +169 @@
 Sys2FormatNumber
 
-Formats a number to use thousands-grouping characters.  The system values
-for the current locale are used for the thousands-grouping character and
-the decimal place, if any.  Note that the IBM C runtime's locale
-definitions are used; these may not correspond precisely to the system
-locales as defined in the OS/2 Locale object.
+Formats a number with locale-specific thousands-grouping characters,
+decimal point, and/or negative sign, as applicable.  The current locale
+conventions will be used (as defined by the environment values %LC_ALL%,
+%LC_NUMERIC%, or %LANG%, in that order of precedence).
 
 The input number may be a positive or negative integer or floating point
@@ -180 +179 @@
 point which it contains must be a period (rather than any localized
 decimal symbol).
+
+The range limits for the specified number are those of a 64-bit signed
+integer (ñ9,223,372,036,854,775,807), or an 80-bit floating point value.
 
 REXX ARGUMENTS:
@@ -496 +498 @@
 
 -------------------------------------------------------------------------
+Sys2QuerySysValue
+
+Query the given system value.
+
+REXX ARGUMENTS:
+  1. The system value identifier  (REQUIRED)
+     Valid identifiers are (see the Presentation Manager Programming
+     Reference description of WinQuerySysValue for descriptions):
+       ALARM
+       ALTMNEMONIC
+       ANIMATIONSPEED
+       ANIMATION
+       BEGINDRAG
+       BEGINDRAGKB
+       BEGINSELECT
+       BEGINSELECTKB
+       CHORDTIME
+       CICONTEXTLINES
+       CMOUSEBUTTONS
+       CONTEXTHELPKB
+       CONTEXTHELP
+       CONTEXTMENU
+       CONTEXTMENUKB
+       CPOINTERBUTTONS
+       CTIMERS
+       CURSORLEVEL
+       CURSORRATE
+       CXALIGN
+       CXBORDER
+       CXBYTEALIGN
+       CXCHORD
+       CXDBLCLK
+       CXDLGFRAME
+       CXFULLSCREEN
+       CXHSCROLLARROW
+       CXHSLIDER
+       CXICONTEXTWIDTH
+       CXICON
+       CXMINMAXBUTTON
+       CXMOTIONSTART
+       CXPOINTER
+       CXSCREEN
+       CXSIZEBORDER
+       CXVSCROLL
+       CYALIGN
+       CYBORDER
+       CYBYTEALIGN
+       CYCHORD
+       CYDBLCLK
+       CYDLGFRAME
+       CYFULLSCREEN
+       CYHSCROLL
+       CYICON
+       CYMENU
+       CYMINMAXBUTTON
+       CYMOTIONSTART
+       CYPOINTER
+       CYSCREEN
+       CYSIZEBORDER
+       CYTITLEBAR
+       CYVSCROLLARROW
+       CYVSLIDER
+       DBLCLKTIME
+       DEBUG
+       ENDDRAG
+       ENDDRAGKB
+       ENDSELECTKB
+       ENDSELECT
+       ERRORDURATION
+       ERRORFREQ
+       FIRSTSCROLLRATE
+       INSERTMODE
+       KBDALTERED
+       LOCKSTARTINPUT
+       MENUROLLDOWNDELAY
+       MENUROLLUPDELAY
+       MONOICONS
+       MOUSEPRESENT
+       NOTEDURATION
+       NOTEFREQ
+       NUMBEREDLISTS
+       OPEN
+       OPENKB
+       POINTERLEVEL
+       PRINTSCREEN
+       SCROLLRATE
+       SELECTKB
+       SETLIGHTS
+       SINGLESELECT
+       SWAPBUTTON
+       TASKLISTMOUSEACCESS
+       TEXTEDIT
+       TEXTEDITKB
+       TRACKRECTLEVEL
+       WARNINGDURATION
+       WARNINGFREQ
+
+REXX RETURN VALUE:
+  String containing the requested system value, or "" in case of error.
+
+
+-------------------------------------------------------------------------
 Sys2Read
 

rxutilex/trunk/testlib.cmd

@@ -53 +53 @@
 
 say Sys2FormatNumber('9375739912303')
-say Sys2FormatNumber('64583.449286', 5)
+say Sys2FormatNumber('-64583.449286', 5)