Changeset 933f32f for libcfa/src/iostream.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• libcfa/src/iostream.cfa (modified) (11 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 Dec 24 18:33:40 2018
-// Update Count     : 589
+// Last Modified On : Sun May 19 10:48:27 2019
+// Update Count     : 654
 //
 
@@ -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>                                                                               // isfinite
 #include <complex.h>                                                                    // creal, cimag
 }
 
 forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, zero_t ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%d", 0n );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, zero_t z ) {
+                (ostype &)(os | z); nl( os );
+        } // ?|?
+
+        ostype & ?|?( ostype & os, one_t ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%d", 1n );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, one_t o ) {
+                (ostype &)(os | o); nl( os );
+        } // ?|?
+
         ostype & ?|?( ostype & os, bool b ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
@@ -135 +154 @@
         } // ?|?
 
+        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 ) );
-                fmt( 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;
         } // ?|?
@@ -146 +175 @@
         ostype & ?|?( ostype & os, double d ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                fmt( os, "%.*lg", DBL_DIG, d );
+                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;
         } // ?|?
@@ -155 +187 @@
         ostype & ?|?( ostype & os, long double ld ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                fmt( os, "%.*Lg", LDBL_DIG, ld );
+                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;
         } // ?|?
@@ -164 +199 @@
         ostype & ?|?( ostype & os, float _Complex fc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                fmt( os, "%g%+gi", crealf( fc ), cimagf( fc ) );
+//              os | crealf( fc ) | nonl;
+                float f = crealf( fc );
+                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 );
+                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;
         } // ?|?
@@ -173 +218 @@
         ostype & ?|?( ostype & os, double _Complex dc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                fmt( os, "%.*lg%+.*lgi", DBL_DIG, creal( dc ), DBL_DIG, cimag( dc ) );
+//              os | creal( dc ) | nonl;
+                double d = creal( dc );
+                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 );
+                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;
         } // ?|?
@@ -182 +237 @@
         ostype & ?|?( ostype & os, long double _Complex ldc ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) );
+//              os | creall( ldc ) || nonl;
+                long double ld = creall( ldc );
+                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 );
+                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;
         } // ?|?
@@ -378 +443 @@
 
         istype & ?|?( istype & is, char & c ) {
-                fmt( is, "%c", &c );                                                    // must pass pointer through varg to fmt
+                char temp;
+                for () {
+                        fmt( is, "%c", &temp );                                                 // must pass pointer through varg to fmt
+                        // do not overwrite parameter with newline unless appropriate
+                        if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
+                        if ( eof( is ) ) break;
+                } // for
                 return is;
         } // ?|?
@@ -470 +541 @@
         } // ?|?
 
-
         // manipulators
         istype & ?|?( istype & is, istype & (* manip)( istype & ) ) {
@@ -477 +547 @@
 
         istype & nl( istype & is ) {
-                fmt( is, "%*[ \t\f\n\r\v]" );                                   // ignore whitespace
+                fmt( is, "%*[^\n]" );                                                   // ignore characters to newline
                 return is;
         } // nl
+
+        istype & nlOn( istype & is ) {
+                nlOn( is );                                                                             // call void returning
+                return is;
+        } // nlOn
+
+        istype & nlOff( istype & is ) {
+                nlOff( is );                                                                    // call void returning
+                return is;
+        } // nlOff
 } // distribution