Changeset dd7c6520

Timestamp:

Mar 5, 2020, 4:09:54 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

bc9384ac

Parents:

f9723e8

Message:

fixed printing int128 binary, and started fixing int128 decimal

File:

• libcfa/src/iostream.cfa (modified) (5 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 : Thu Feb 20 15:53:23 2020
-// Update Count     : 829
+// Last Modified On : Thu Mar  5 15:56:16 2020
+// Update Count     : 834
 //
 
@@ -536 +536 @@
 static void base10_128( ostype & os, _Ostream_Manip(T) fmt ) { \
         if ( fmt.val > UINT64_MAX ) { \
-                fmt.val /= P10_UINT64; \
-                base10_128( os, fmt ); /* recursive */ \
+                base10_128( os, fmt.val / P10_UINT64 ); /* recursive */ \
                 _Ostream_Manip(unsigned long long int) fmt2 @= { (uint64_t)(fmt.val % P10_UINT64), 0, 19, 'u', { .all : 0 } }; \
                 fmt2.flags.nobsdp = true; \
@@ -544 +543 @@
                 (ostype &)(os | fmt2); \
         } else { \
-                printf( "fmt %c %lld %d\n", fmt.base, fmt.val, fmt.all ); \
-                (ostype &)(os | fmt); \
+                printf( "fmt %c %lld %d\n", fmt.base, (unsigned long long int)fmt.val, fmt.all ); \
+                _Ostream_Manip(SIGNED long long int) x @= { (unsigned long long int)fmt.val, fmt.wd, fmt.pc, fmt.base, { .all : fmt.all } }; \
+                (ostype &)(os | x); \
         } /* if */ \
 } /* base10_128 */                                                 \
@@ -552 +552 @@
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
 \
-                if ( f.base == 'b' | f.base == 'o' | f.base == 'x' | f.base == 'X' ) { \
+                if ( f.base == 'b' | f.base == 'B' | f.base == 'o' | f.base == 'x' | f.base == 'X' ) { \
                         unsigned long long int msig = (unsigned long long int)(f.val >> 64); \
                         unsigned long long int lsig = (unsigned long long int)(f.val); \
@@ -562 +562 @@
                         } else { \
                                 fmt2.flags.pad0 = fmt2.flags.nobsdp = true;     \
-                                if ( f.base == 'b' ) { \
+                                if ( f.base == 'b' | f.base == 'B' ) { \
                                         if ( f.wd > 64 ) fmt.wd = f.wd - 64; \
                                         fmt2.wd = 64; \