Changes in libcfa/src/iostream.cfa [e63326b:b2ac656]

File:

• libcfa/src/iostream.cfa (modified) (7 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 : Tue May 21 13:01:26 2019
-// Update Count     : 674
+// Last Modified On : Sun May 19 10:48:27 2019
+// Update Count     : 654
 //
 
@@ -154 +154 @@
         } // ?|?
 
-        #define PrintWithDP( os, format, val, ... ) \
-                { \
-                        enum { size = 48 }; \
-                        char buf[size]; \
-                        int len = snprintf( buf, size, format, ##__VA_ARGS__, val ); \
-                        fmt( os, "%s", buf ); \
-                        if ( isfinite( val ) ) {                                        /* if number, always print decimal point */ \
-                                for ( int i = 0;; i += 1 ) { \
-                                        if ( i == len ) { fmt( os, "." ); break; } \
-                                        if ( buf[i] == '.' ) break; \
-                                } /* for */ \
-                        } /* if */ \
-                }
+        static void checkDecPt( ostype & os, const char * buf, int len ) {
+                for ( int i = 0;; i += 1 ) {
+                        if ( i == len ) { fmt( os, "." ); break; }
+                        if ( buf[i] == '.' ) break;
+                } // for
+        } // checkDecPt
 
         ostype & ?|?( ostype & os, float f ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                PrintWithDP( os, "%g", f );
+                char buf[48];
+                int len = snprintf( buf, 48, "%g", f );
+                fmt( os, "%s", buf );
+                if ( isfinite( f ) ) checkDecPt( os, buf, len ); // always print decimal point
                 return os;
         } // ?|?
@@ -179 +175 @@
         ostype & ?|?( ostype & os, double d ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                PrintWithDP( os, "%.*lg", d, DBL_DIG );
+                char buf[48];
+                int len = snprintf( buf, 48, "%.*lg", DBL_DIG, d );
+                fmt( os, "%s", buf );
+                if ( isfinite( d ) ) checkDecPt( os, buf, len ); // always print decimal point
                 return os;
         } // ?|?
@@ -188 +187 @@
         ostype & ?|?( ostype & os, long double ld ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
+                char buf[48];
+                int len = snprintf( buf, 48, "%.*Lg", LDBL_DIG, ld );
+                fmt( os, "%s", buf );
+                if ( isfinite( ld ) ) checkDecPt( os, buf, len ); // always print decimal point
                 return os;
         } // ?|?
@@ -199 +201 @@
 //              os | crealf( fc ) | nonl;
                 float f = crealf( fc );
-                PrintWithDP( os, "%g", f );
+                char buf[48];
+                int len = snprintf( buf, 48, "%g", f );
+                fmt( os, "%s", buf );
+                if ( isfinite( f ) ) checkDecPt( os, buf, len ); // always print decimal point
                 f = cimagf( fc );
-                PrintWithDP( os, "%+g", f );
+                len = snprintf( buf, 48, "%+g", f );
+                fmt( os, "%s", buf );
+                if ( isfinite( f ) ) checkDecPt( os, buf, len ); // always print decimal point
                 fmt( os, "i" );
                 return os;
@@ -213 +220 @@
 //              os | creal( dc ) | nonl;
                 double d = creal( dc );
-                PrintWithDP( os, "%.*lg", d, DBL_DIG );
+                char buf[48];
+                int len = snprintf( buf, 48, "%.*lg", DBL_DIG, d );
+                fmt( os, "%s", buf );
+                if ( isfinite( d ) ) checkDecPt( os, buf, len ); // always print decimal point
                 d = cimag( dc );
-                PrintWithDP( os, "%+.*lg", d, DBL_DIG );
+                len = snprintf( buf, 48, "%+.*lg", DBL_DIG, d );
+                fmt( os, "%s", buf );
+                if ( isfinite( d ) ) checkDecPt( os, buf, len ); // always print decimal point
                 fmt( os, "i" );
                 return os;
@@ -227 +239 @@
 //              os | creall( ldc ) || nonl;
                 long double ld = creall( ldc );
-                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
+                char buf[48];
+                int len = snprintf( buf, 48, "%.*Lg", LDBL_DIG, ld );
+                fmt( os, "%s", buf );
+                if ( isfinite( ld ) ) checkDecPt( os, buf, len ); // always print decimal point
                 ld = cimagl( ldc );
-                PrintWithDP( os, "%+.*Lg", ld, LDBL_DIG );
+                len = snprintf( buf, 48, "%+.*Lg", LDBL_DIG, ld );
+                fmt( os, "%s", buf );
+                if ( isfinite( ld ) ) checkDecPt( os, buf, len ); // always print decimal point
                 fmt( os, "i" );
                 return os;