Changeset b826e6b for src/libcfa/iostream.c

Timestamp:

Jul 19, 2017, 11:49:33 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May  8 18:24:23 2017
-// Update Count     : 369
+// Last Modified On : Sun Jul 16 21:12:03 2017
+// Update Count     : 398
 //
 
@@ -18 +18 @@
 extern "C" {
 #include <stdio.h>
+#include <stdbool.h>                                                                    // true/false
 #include <string.h>                                                                             // strlen
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
@@ -24 +25 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, char c ) {
-        fmt( os, "%c", c );
+ostype * ?|?( ostype * os, char ch ) {
+        fmt( os, "%c", ch );
+        if ( ch == '\n' ) setNL( os, true );
         sepOff( os );
         return os;
@@ -123 +125 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, float _Complex fc ) {
-        os | crealf( fc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimagf( fc ) >= 0 ) os | '+';                                      // negative value prints '-'
-        os | cimagf( fc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%g%+gi", crealf( fc ), cimagf( fc ) );
         return os;
 } // ?|?
@@ -133 +132 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, double _Complex dc ) {
-        os | creal( dc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimag( dc ) >= 0 ) os | '+';                                       // negative value prints '-'
-        os | cimag( dc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%.*lg%+.*lgi", DBL_DIG, creal( dc ), DBL_DIG, cimag( dc ) );
         return os;
 } // ?|?
@@ -143 +139 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, long double _Complex ldc ) {
-        os | creall( ldc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimagl( ldc ) >= 0 ) os | '+';                                     // negative value prints '-'
-        os | cimagl( ldc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) );
         return os;
 } // ?|?
@@ -180 +173 @@
 
         // last character IS spacing or opening punctuation => turn off separator for next item
-        unsigned int len = strlen( cp ), posn = len - 1;
-        ch = cp[posn];                                                                          // must make unsigned
+        size_t len = strlen( cp );
+        ch = cp[len - 1];                                                                       // must make unsigned
         if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
                 sepOn( os );
@@ -187 +180 @@
                 sepOff( os );
         } // if
+        if ( ch == '\n' ) setNL( os, true );                            // check *AFTER* sepPrt call above as it resets NL flag
         return write( os, cp, len );
 } // ?|?
@@ -201 +195 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
+        os | arg;                                                                                       // print first argument
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        os | arg;                                                                                       // print first argument
         os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
@@ -216 +210 @@
 
 forall( dtype ostype | ostream( ostype ) )
+ostype * sep( ostype * os ) {
+        os | sepGet( os );
+        return os;
+} // sep
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * sepTuple( ostype * os ) {
+        os | sepGetTuple( os );
+        return os;
+} // sepTuple
+
+forall( dtype ostype | ostream( ostype ) )
 ostype * endl( ostype * os ) {
         os | '\n';
+        setNL( os, true );
         flush( os );
         sepOff( os );                                                                           // prepare for next line