Changeset 17954f0e

Timestamp:

Jul 17, 2017, 2:14:32 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

933dbbd

Parents:

dc2b4d6

Message:

simplify printing complex values

File:

• src/libcfa/iostream.c (modified) (4 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 : Thu Jul  6 18:14:17 2017
-// Update Count     : 396
+// Last Modified On : Sun Jul 16 21:12:03 2017
+// Update Count     : 398
 //
 
@@ -125 +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;
 } // ?|?
@@ -135 +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;
 } // ?|?
@@ -145 +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;
 } // ?|?