Changeset b5f17e1

Timestamp:

Jan 18, 2022, 8:49:34 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

038a0bd

Parents:

e57de69

Message:

support locale for digit separator in floating-point numbers

File:

• libcfa/src/iostream.cfa (modified) (10 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 17 16:38:32 2022
-// Update Count     : 1349
+// Last Modified On : Tue Jan 18 08:34:16 2022
+// Update Count     : 1350
 //
 
@@ -205 +205 @@
         ostype & ?|?( ostype & os, float f ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%g", f );
+                PrintWithDP( os, "%'g", f );
                 return os;
         } // ?|?
@@ -214 +214 @@
         ostype & ?|?( ostype & os, double d ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%.*lg", d, DBL_DIG );
+                PrintWithDP( os, "%'.*lg", d, DBL_DIG );
                 return os;
         } // ?|?
@@ -223 +223 @@
         ostype & ?|?( ostype & os, long double ld ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
+                PrintWithDP( os, "%'.*Lg", ld, LDBL_DIG );
                 return os;
         } // ?|?
@@ -233 +233 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | crealf( fc ) | nonl;
-                PrintWithDP( os, "%g", crealf( fc ) );
-                PrintWithDP( os, "%+g", cimagf( fc ) );
+                PrintWithDP( os, "%'g", crealf( fc ) );
+                PrintWithDP( os, "%'+g", cimagf( fc ) );
                 fmt( os, "i" );
                 return os;
@@ -245 +245 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creal( dc ) | nonl;
-                PrintWithDP( os, "%.*lg", creal( dc ), DBL_DIG );
-                PrintWithDP( os, "%+.*lg", cimag( dc ), DBL_DIG );
+                PrintWithDP( os, "%'.*lg", creal( dc ), DBL_DIG );
+                PrintWithDP( os, "%'+.*lg", cimag( dc ), DBL_DIG );
                 fmt( os, "i" );
                 return os;
@@ -257 +257 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creall( ldc ) || nonl;
-                PrintWithDP( os, "%.*Lg", creall( ldc ), LDBL_DIG );
-                PrintWithDP( os, "%+.*Lg", cimagl( ldc ), LDBL_DIG );
+                PrintWithDP( os, "%'.*Lg", creall( ldc ), LDBL_DIG );
+                PrintWithDP( os, "%'+.*Lg", cimagl( ldc ), LDBL_DIG );
                 fmt( os, "i" );
                 return os;
@@ -693 +693 @@
                 if ( ! f.flags.pc ) memcpy( &fmtstr, DFMTNP, sizeof(DFMTNP) ); \
                 else memcpy( &fmtstr, DFMTP, sizeof(DFMTP) ); \
-                int star = 4;                                                                   /* position before first '*' */ \
+                int star = 5;                                                                   /* position before first '*' */ \
 \
                 /* Insert flags into spaces before '*', from right to left. */ \
@@ -699 +699 @@
                 if ( f.flags.sign ) { fmtstr[star] = '+'; star -= 1; } \
                 if ( f.flags.pad0 ) { fmtstr[star] = '0'; star -= 1; } \
+                fmtstr[star] = '\''; star -= 1;                                 /* locale */ \
                 fmtstr[star] = '%'; \
 \
@@ -716 +717 @@
 } // distribution
 
-FloatingPointFMTImpl( double, "     * ", "     *.* " )
-FloatingPointFMTImpl( long double, "     *L ", "     *.*L " )
+FloatingPointFMTImpl( double,      "      * ",  "      *.* " )
+FloatingPointFMTImpl( long double, "      *L ", "      *.*L " )
 
 // *********************************** character ***********************************