Changeset 41

Timestamp:

Mar 30, 2018, 6:12:15 PM (7 years ago)

Author:

Alex Taylor

Message:

Rewrote Sys2FormatNumber to support LONGLONG and use current locale info from ULS API

Location:

rxutilex/trunk

Files:

• Makefile (modified) (1 diff)
• rxutilex.c (modified) (10 diffs)
• rxutilex.def (modified) (1 diff)
• testlib.cmd (modified) (1 diff)

rxutilex/trunk/Makefile

@@ -10 +10 @@
 LFLAGS = /NOLOGO /MAP
 NAME   = rxutilex
-LIBS   = rexx.lib
+LIBS   = rexx.lib libuls.lib libconv.lib
 
 # Set environment variable DEBUG (=anything) to build with debugging symbols

rxutilex/trunk/rxutilex.c

@@ -40 +40 @@
 
 // Uncomment to use legacy C style locale data instead of the OS/2 ULS library
-#define LEGACY_C_LOCALE
+// #define LEGACY_C_LOCALE
 
 #define INCL_WINATOM
@@ -64 +64 @@
 #include <string.h>
 #include <time.h>
+#include <locale.h>
 
 #ifdef LEGACY_C_LOCALE
-    #include <locale.h>
     #include <nl_types.h>
     #include <langinfo.h>
 #else
     #include <unidef.h>
+    #include <uconv.h>
 #endif
 
@@ -109 +110 @@
 #define US_PIDSTR_MAXZ        ( CCHMAXPATH + 100 )                   // ...of a process information string
 #define US_TIMESTR_MAXZ         256                                  // ...of a formatted time string
-#define US_NUMSTR_MAXZ          64                                   // ...of a formatted number string
+#define US_NUMSTR_MAXZ          32                                   // ...of a formatted number string
 #define US_PIPESTATUS_MAXZ      128                                  // ...of a pipe status string
 #define US_DISKINFO_MAXZ        128                                  // ...of a disk information string
@@ -197 +198 @@
 ULONG GetProcess( PCSZ pszProgram, PSZ pszFullName, PULONG pulPID, PULONG pulPPID, PULONG pulType, PUSHORT pusPriority, PULONG pulCPU );        // 2016-02-20 SHL
 
+#ifndef LEGACY_C_LOCALE
+int GetLocaleString( PSZ *ppszItem, LocaleItem item );
+    void GroupNumber( PSZ buf, ULONGLONG val, PSZ sep );
+#endif
+
 #ifdef NO_SHARED_SOURCE
     BOOL  SaveResultString( PRXSTRING prsResult, PCSZ pchBytes, ULONG ulBytes );    // 2016-02-20 SHL
@@ -1072 +1078 @@
 {
     CHAR  achNumber[ US_NUMSTR_MAXZ ];  // Formatted output string
-    float fVal;                         // Input value as floating point
+    int   iPrec;                        // Requested decimal precision
+    PSZ   pszSep = NULL;                // Thousands separator string
+    PSZ   pszDec = NULL;                // Decimal point string
+#ifdef LEGACY_C_LOCALE
+    float fVal = 0;                     // Input value as floating point
     int   iVal;                         // Input value as integer
-    int   iPrec;                        // Requested decimal precision
-    PSZ   pszSep = NULL;                // Separator string
-#ifndef LEGACY_C_LOCALE
-    CHAR  achTemp[ US_NUMSTR_MAXZ ];    // Temporary buffer
-    LocaleObject     locale = NULL;     // ULS locale object
-    struct UniLconv *punilc = NULL;     // ULS locale conventions structure
-    CHAR            *p      = NULL;     // Moving pointers within buffers
-    CHAR            *q      = NULL;     // ...
-    int              rc     = 0;
+#else
+    ULONGLONG   llVal  = 0;
+    long double ldVal  = 0,
+                ldFrac = 0;
+    PSZ   p;
+    CHAR  achFrac[ 16 ];
+    int   rc     = 0;
 #endif
 
@@ -1109 +1117 @@
             else if ( !strnicmp( p, "it", 2 )) setlocale( LC_NUMERIC, "IT_IT");
             else if ( !strnicmp( p, "ja", 2 )) setlocale( LC_NUMERIC, "JA_JP");
-/*
+/* -- it seems the VAC runtime doesn't recognize most of these...
             else if ( !strnicmp( p, "ar", 2 )) setlocale( LC_NUMERIC, "ar_AA");
             else if ( !strnicmp( p, "be", 2 )) setlocale( LC_NUMERIC, "be_BY");
@@ -1145 +1153 @@
             else if ( !strnicmp( p, "uk", 2 )) setlocale( LC_NUMERIC, "uk_UA");
             else if ( !strnicmp( p, "zh", 2 )) setlocale( LC_NUMERIC, "zh_TW");
-*/
+-- */
             else setlocale( LC_NUMERIC, "EN_US");
             free(p);
@@ -1171 +1179 @@
 
 #else
-    rc = UniCreateLocaleObject( UNI_MBS_STRING_POINTER, "", &locale );
-    if ( rc != ULS_SUCCESS ) {
-        WriteErrorCode( rc, "UniCreateLocaleObject");
-        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
+
+    rc = GetLocaleString( &pszSep, LOCI_sThousand );
+    if ( rc ) {
+        // GetLocaleString has already set the error indicator
+        SaveResultString( prsResult, NULL, 0 );
         return ( 0 );
     }
-    rc = UniQueryLocaleInfo(locale_object, &puni_lconv);
-    if ( rc != ULS_SUCCESS ) {
-        WriteErrorCode( rc, "UniQueryLocaleInfo");
-        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
+    rc = GetLocaleString( &pszDec, LOCI_sDecimal );
+    if ( rc ) {
+        // GetLocaleString has already set the error indicator
+        SaveResultString( prsResult, NULL, 0 );
         return ( 0 );
-     }
+    }
 
     // Check for a decimal place and treat as float or integer accordingly
     if ( strchr( argv[0].strptr, '.') != NULL ) {
-        if (( sscanf( argv[0].strptr, "%f", &fVal )) != 1 ) return ( 40 );
+        if (( sscanf( argv[0].strptr, "%Lf", &ldVal )) != 1 ) return ( 40 );
+
+        llVal  = ldVal;
+        ldFrac = ldVal - llVal;
         if ( argc >= 2  && ( RXVALIDSTRING(argv[1]) ) &&
              (( sscanf( argv[1].strptr, "%d", &iPrec )) == 1 ))
         {
             // Use user-specified precision
-            sprintf( achNumber, "%.*f", iPrec, fVal );
+            sprintf( achFrac, "%.*Lf", iPrec, ldFrac );
         }
         else
-            sprintf( achNumber, "%.2f", fVal );
+            sprintf( achFrac, "%.2Lf", ldFrac );
+        // Format the integer part
+        GroupNumber( achNumber, llVal, pszSep );
+        // Append the fractional part
+        if (( p = strchr( achFrac, '.')) != NULL ) {
+            strncat( achNumber, pszDec, US_NUMSTR_MAXZ - 1 );
+            strncat( achNumber, p+1,    US_NUMSTR_MAXZ - 1 );
+        }
     }
     else {
-        if (( sscanf( argv[0].strptr, "%d", &iVal )) != 1 ) return ( 40 );
-        sprintf( achNumber, "%d", iVal );
-    }
-
+        if (( sscanf( argv[0].strptr, "%lld", &llVal )) != 1 ) return ( 40 );
+        GroupNumber( achNumber, llVal, pszSep );
+    }
+
+    free( pszSep );
 #endif
 
@@ -2862 +2882 @@
 
 
+#ifndef LEGACY_C_LOCALE
+
+/* ------------------------------------------------------------------------- *
+ * GetLocaleString                                                           *
+ *                                                                           *
+ * Get the requested representation string for the current locale.           *
+ * The argument is a pointer to a string which will be allocated by this     *
+ * function.  It is the caller's responsibility to free() it.                *
+ *                                                                           *
+ * ARGUMENTS:                                                                *
+ *   PSZ   *ppszItem: Pointer to string to be allocated.                 (O) *
+ *   LocaleItem item: Locale item to query.                              (I) *
+ *                                                                           *
+ * RETURNS: int                                                              *
+ *   The ULS function return code.                                           *
+ * ------------------------------------------------------------------------- */
+int GetLocaleString( PSZ *ppszItem, LocaleItem item )
+{
+    UconvObject  uconv = NULL;
+    LocaleObject locale = NULL;
+    UniChar     *puzSep;
+    int          rc = 0;
+    int          buf_size;
+    PSZ          pszBuffer;
+
+    rc = UniCreateLocaleObject( UNI_MBS_STRING_POINTER, "", &locale );
+    if ( rc != ULS_SUCCESS ) {
+        WriteErrorCode( rc, "UniCreateLocaleObject");
+        return ( rc );
+    }
+    rc = UniQueryLocaleItem( locale, item, &puzSep );
+    if ( rc == ULS_SUCCESS ) {
+        buf_size = UniStrlen( puzSep ) * 3;
+        pszBuffer = (PSZ) calloc( 1, buf_size + 1 );
+        if ( pszBuffer ) {
+            if ( UniCreateUconvObject(L"", &uconv ) == ULS_SUCCESS ) {
+                if ( UniStrFromUcs( uconv, pszBuffer, puzSep, buf_size ))
+                    sprintf( pszBuffer, "%ls", puzSep );
+                UniFreeUconvObject( uconv );
+            }
+            else
+                sprintf( pszBuffer, "%ls", puzSep );
+            *ppszItem = pszBuffer;
+        }
+        else {
+            rc = ERROR_NOT_ENOUGH_MEMORY;
+            WriteErrorCode( rc, "calloc");
+        }
+        UniFreeMem( puzSep );
+    }
+    else WriteErrorCode( rc, "UniQueryLocaleItem");
+
+    UniFreeLocaleObject( locale );
+    return ( rc );
+}
+
+
+/* ------------------------------------------------------------------------- *
+ * GroupNumber                                                               *
+ *                                                                           *
+ * Format an unsigned number into three-digit (thousands) groups, separated  *
+ * by the designated separator string. The output buffer must be allocated,  *
+ * and must be large enough to hold a 64-bit integer with the added          *
+ * separators, i.e. 20 + (separator length * 6 ).  This function does not    *
+ * perform any bounds checking, so the caller must ensure this.              *
+ *                                                                           *
+ * ARGUMENTS:                                                                *
+ *   PSZ       buf: The output string buffer.                           (IO) *
+ *   ULONGLONG val: The number value to format.                          (I) *
+ *   PSZ       sep: The group-separator string.                          (I) *
+ *                                                                           *
+ * RETURNS: N/A                                                              *
+ * ------------------------------------------------------------------------- */
+void GroupNumber( PSZ buf, ULONGLONG val, PSZ sep )
+{
+    if ( val < 1000 ) {
+        sprintf( buf, "%u", val );
+        return;
+    }
+    GroupNumber( buf, val / 1000, sep );
+    sprintf( buf+strlen(buf), "%s%03u", sep, val % 1000 );
+}
+
+#endif      // #ifndef LEGACY_C_LOCALE
 
 
@@ -2997 +3101 @@
 }
 
-#endif // NO_SHARED_SOURCE
-
+#endif      // #ifdef NO_SHARED_SOURCE
+

rxutilex/trunk/rxutilex.def

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

rxutilex/trunk/testlib.cmd

@@ -50 +50 @@
 
 say 'Current screen resolution:' Sys2QuerySysValue('CXSCREEN') Sys2QuerySysValue('CYSCREEN')
+say
+
+say Sys2FormatNumber('9375739912303')
+say Sys2FormatNumber('64583.449286', 5)
+
 
 call Sys2DropFuncs