Changes in libcfa/src/iostream.cfa [3c5dee4:0efb269]

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 May 13 12:46:45 2019
-// Update Count     : 650
+// Last Modified On : Sat Apr 20 14:02:43 2019
+// Update Count     : 617
 //
 
@@ -23 +23 @@
 extern size_t strlen (const char *__s) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1)));
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
-#include <math.h>                                                                               // modff, modf, modlf
 #include <complex.h>                                                                    // creal, cimag
 }
@@ -157 +156 @@
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
                 fmt( os, "%g", f );
-                float tempi;
-                if ( isfinite( f ) && modff( f, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point
                 return os;
         } // ?|?
@@ -168 +165 @@
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
                 fmt( os, "%.*lg", DBL_DIG, d );
-                // fmt( os, "%lg", d );
-                double tempi;
-                if ( isfinite( d ) && modf( d, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point
                 return os;
         } // ?|?
@@ -180 +174 @@
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
                 fmt( os, "%.*Lg", LDBL_DIG, ld );
-                // fmt( os, "%Lg", ld );
-                long double tempi;
-                if ( isfinite( ld ) && modfl( ld, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point
                 return os;
         } // ?|?
@@ -191 +182 @@
         ostype & ?|?( ostype & os, float _Complex fc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                float temp = crealf( fc ), tempi;
-                fmt( os, "%g", temp );
-                if ( isfinite( temp ) && modff( temp, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point
-                temp = cimagf( fc );
-                fmt( os, "%+g", temp );
-                if ( isfinite( temp ) && modff( temp, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point
-                fmt( os, "i" );
+                fmt( os, "%g%+gi", crealf( fc ), cimagf( fc ) );
                 return os;
         } // ?|?
@@ -206 +191 @@
         ostype & ?|?( ostype & os, double _Complex dc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                double temp = creal( dc ), tempi;
-                fmt( os, "%.*lg", DBL_DIG, temp );
-                if ( isfinite( temp ) && modf( temp, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point
-                temp = cimag( dc );
-                fmt( os, "%+.*lg", DBL_DIG, temp );
-                if ( isfinite( temp ) && modf( temp, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point
-                fmt( os, "i" );
-                // fmt( os, "%lg%+lgi", creal( dc ), cimag( dc ) );
+                fmt( os, "%.*lg%+.*lgi", DBL_DIG, creal( dc ), DBL_DIG, cimag( dc ) );
                 return os;
         } // ?|?
@@ -222 +200 @@
         ostype & ?|?( ostype & os, long double _Complex ldc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                long double temp = creall( ldc ), tempi;
-                fmt( os, "%.*Lg", LDBL_DIG, temp );
-                if ( isfinite( temp ) && modfl( temp, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point
-                temp = cimagl( ldc );
-                fmt( os, "%+.*Lg", LDBL_DIG, cimagl( ldc ) );
-                if ( isfinite( temp ) && modfl( temp, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point
-                fmt( os, "i" );
-                // fmt( os, "%Lg%+Lgi", creall( ldc ), cimagl( ldc ) );
+                fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) );
                 return os;
         } // ?|?
@@ -523 +494 @@
         } // ?|?
 
+
         // manipulators
         istype & ?|?( istype & is, istype & (* manip)( istype & ) ) {
@@ -529 +501 @@
 
         istype & nl( istype & is ) {
-                fmt( is, "%*[^\n]" );                                                   // ignore characters to newline
+                fmt( is, "%*[ \t\f\n\r\v]" );                                   // ignore whitespace
                 return is;
         } // nl