Changeset 8d66610 for libcfa/src/iostream.cfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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) (3 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 : Tue Apr 27 18:01:03 2021
-// Update Count     : 1330
+// Last Modified On : Sat May 15 09:39:21 2021
+// Update Count     : 1342
 //
 
@@ -659 +659 @@
                         int exp10, len2; \
                         eng( f.val, f.pc, exp10 );                                      /* changes arguments */ \
+                        /* printf( "%g %d %d %d %s\n", f.val, f.wd, f.pc, exp10, format ); */ \
                         if ( ! f.flags.left && f.wd > 1 ) { \
-                                /* Exponent size (number of digits, 'e', optional minus sign) */ \
-                                f.wd -= lrint( floor( log10( abs( exp10 ) ) ) ) + 1 + 1 + (exp10 < 0 ? 1 : 0); \
+                                /* Exponent size: 'e', optional minus sign, number of digits: log10(0) => undefined */ \
+                                f.wd -= 1 + (exp10 < 0 ? 1 : 0) + lrint( floor( exp10 == 0 ? 0 : log10( abs( exp10 ) ) ) ) + 1; \
                                 if ( f.wd < 1 ) f.wd = 1; \
                         } /* if */ \
@@ -708 +709 @@
                 if ( ! f.flags.pc ) {                                                   /* no precision */ \
                         fmtstr[sizeof(DFMTNP)-2] = f.base;                      /* sizeof includes '\0' */ \
-                        /* printf( "%g %d %s\n", f.val, f.wd, &fmtstr[star]); */ \
+                        /* printf( "%g %d %s\n", f.val, f.wd, &fmtstr[star] ); */ \
                         PrintWithDP2( os, &fmtstr[star], f.wd, f.val ) \
                 } else {                                                                                /* precision */ \