Changeset 907c545

Timestamp:

May 21, 2019, 6:11:28 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

28c89f4, 746ae82

Parents:

b869ec5 (diff), a1b154d (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:

• 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 : Sun May 19 10:48:27 2019
-// Update Count     : 654
+// Last Modified On : Tue May 21 13:01:26 2019
+// Update Count     : 674
 //
 
@@ -154 +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
+        #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 */ \
+                }
 
         ostype & ?|?( ostype & os, float f ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                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
+                PrintWithDP( os, "%g", f );
                 return os;
         } // ?|?
@@ -175 +179 @@
         ostype & ?|?( ostype & os, double d ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                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
+                PrintWithDP( os, "%.*lg", d, DBL_DIG );
                 return os;
         } // ?|?
@@ -187 +188 @@
         ostype & ?|?( ostype & os, long double ld ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                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
+                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
                 return os;
         } // ?|?
@@ -201 +199 @@
 //              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
+                PrintWithDP( os, "%g", f );
                 f = cimagf( fc );
-                len = snprintf( buf, 48, "%+g", f );
-                fmt( os, "%s", buf );
-                if ( isfinite( f ) ) checkDecPt( os, buf, len ); // always print decimal point
+                PrintWithDP( os, "%+g", f );
                 fmt( os, "i" );
                 return os;
@@ -220 +213 @@
 //              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
+                PrintWithDP( os, "%.*lg", d, DBL_DIG );
                 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
+                PrintWithDP( os, "%+.*lg", d, DBL_DIG );
                 fmt( os, "i" );
                 return os;
@@ -239 +227 @@
 //              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
+                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
                 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
+                PrintWithDP( os, "%+.*Lg", ld, LDBL_DIG );
                 fmt( os, "i" );
                 return os;