Changeset c08c3cf for libcfa/src/iostream.cfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

481cf3a

Parents:

467c8b7 (diff), 9db2c92 (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:

fix conflict

File:

• libcfa/src/iostream.cfa (modified) (18 diffs)

libcfa/src/iostream.cfa

@@ -36 +36 @@
 
 
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, bool b ) {
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
@@ -407 +407 @@
 
 // tuples
-forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
+forall( ostype &, T, Params... | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
         ostype & ?|?( ostype & os, T arg, Params rest ) {
                 (ostype &)(os | arg);                                                   // print first argument
@@ -426 +426 @@
 
 // writes the range [begin, end) to the given stream
-forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) ) {
+forall( ostype &, elt_type | writeable( elt_type, ostype ), iterator_type | iterator( iterator_type, elt_type ) ) {
         void write( iterator_type begin, iterator_type end, ostype & os ) {
                 void print( elt_type i ) { os | i; }
@@ -447 +447 @@
 // Default prefix for non-decimal prints is 0b, 0, 0x.
 #define IntegralFMTImpl( T, IFMTNP, IFMTP ) \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
@@ -540 +540 @@
 // Default prefix for non-decimal prints is 0b, 0, 0x.
 #define IntegralFMTImpl128( T, SIGNED, CODE, IFMTNP, IFMTP ) \
-forall( dtype ostype | ostream( ostype ) ) \
+forall( ostype & | ostream( ostype ) ) \
 static void base10_128( ostype & os, _Ostream_Manip(T) f ) { \
         if ( f.val > UINT64_MAX ) { \
@@ -557 +557 @@
         } /* if */ \
 } /* base10_128 */ \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
@@ -659 +659 @@
 #if defined( __SIZEOF_INT128__ )
 // Default prefix for non-decimal prints is 0b, 0, 0x.
-forall( dtype ostype | ostream( ostype ) )
+forall( ostype & | ostream( ostype ) )
 static inline void base_128( ostype & os, unsigned int128 val, unsigned int128 power, _Ostream_Manip(uint64_t) & f, unsigned int maxdig, unsigned int bits, unsigned int cnt = 0 ) {
         int wd = 1;                                                                                     // f.wd is never 0 because 0 implies left-pad
@@ -724 +724 @@
 
 #define IntegralFMTImpl128( T ) \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 _Ostream_Manip(uint64_t) fmt; \
@@ -772 +772 @@
 
 #define FloatingPointFMTImpl( T, DFMTNP, DFMTP ) \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
@@ -806 +806 @@
 // *********************************** character ***********************************
 
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
                 if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
@@ -839 +839 @@
 // *********************************** C string ***********************************
 
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f ) {
                 if ( ! f.val ) return os;                                               // null pointer ?
@@ -887 +887 @@
 
 
-forall( dtype istype | istream( istype ) ) {
+forall( istype & | istream( istype ) ) {
         istype & ?|?( istype & is, bool & b ) {
                 char val[6];
@@ -1053 +1053 @@
 // *********************************** manipulators ***********************************
 
-forall( dtype istype | istream( istype ) )
+forall( istype & | istream( istype ) )
 istype & ?|?( istype & is, _Istream_Cstr f ) {
         // skip xxx
@@ -1088 +1088 @@
 } // ?|?
 
-forall( dtype istype | istream( istype ) )
+forall( istype & | istream( istype ) )
 istype & ?|?( istype & is, _Istream_Char f ) {
         fmt( is, "%*c" );                                                                       // argument variable unused
@@ -1095 +1095 @@
 
 #define InputFMTImpl( T, CODE ) \
-forall( dtype istype | istream( istype ) ) \
+forall( istype & | istream( istype ) ) \
 istype & ?|?( istype & is, _Istream_Manip(T) f ) { \
         enum { size = 16 }; \
@@ -1124 +1124 @@
 InputFMTImpl( long double, "Lf" )
 
-forall( dtype istype | istream( istype ) )
+forall( istype & | istream( istype ) )
 istype & ?|?( istype & is, _Istream_Manip(float _Complex) fc ) {
         float re, im;
@@ -1135 +1135 @@
 } // ?|?
 
-forall( dtype istype | istream( istype ) )
+forall( istype & | istream( istype ) )
 istype & ?|?( istype & is, _Istream_Manip(double _Complex) dc ) {
         double re, im;
@@ -1146 +1146 @@
 } // ?|?
 
-forall( dtype istype | istream( istype ) )
+forall( istype & | istream( istype ) )
 istype & ?|?( istype & is, _Istream_Manip(long double _Complex) ldc ) {
         long double re, im;