Changes in libcfa/src/iostream.cfa [6c5d92f:85d8153]

File:

• libcfa/src/iostream.cfa (modified) (11 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 20 19:09:41 2021
-// Update Count     : 1325
+// Last Modified On : Sat Apr 24 10:03:54 2021
+// Update Count     : 1329
 //
 
@@ -36 +36 @@
 
 
-forall( ostype & | ostream( ostype ) ) {
+forall( ostype & | basic_ostream( ostype ) ) {
         ostype & ?|?( ostype & os, bool b ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
@@ -294 +294 @@
 
                 // last character IS spacing or opening punctuation => turn off separator for next item
-                size_t len = strlen( s );
+                int len = strlen( s );
                 ch = s[len - 1];                                                                // must make unsigned
+                fmt( os, "%s", s );                                                             // fmt resets seperator, but reset it again
                 if ( sepPrt$( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
                         sepOn( os );
@@ -302 +303 @@
                 } // if
                 if ( ch == '\n' ) setNL$( os, true );                   // check *AFTER* sepPrt$ call above as it resets NL flag
-                return write( os, s, len );
+                return os;
+//              return write( os, s, len );
         } // ?|?
         void ?|?( ostype & os, const char s[] ) {
@@ -397 +399 @@
                 return os;
         } // nlOff
-
+} // distribution
+
+forall( ostype & | ostream( ostype ) ) {
         ostype & acquire( ostype & os ) {
                 acquire( os );                                                                  // call void returning
@@ -445 +449 @@
 // Default prefix for non-decimal prints is 0b, 0, 0x.
 #define IntegralFMTImpl( T, IFMTNP, IFMTP ) \
-forall( ostype & | ostream( ostype ) ) { \
+forall( ostype & | basic_ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) ); \
@@ -539 +543 @@
 #if defined( __SIZEOF_INT128__ )
 // Default prefix for non-decimal prints is 0b, 0, 0x.
-forall( ostype & | ostream( ostype ) )
+forall( ostype & | basic_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
@@ -604 +608 @@
 
 #define IntegralFMTImpl128( T ) \
-forall( ostype & | ostream( ostype ) ) { \
+forall( ostype & | basic_ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
                 _Ostream_Manip(uint64_t) fmt; \
@@ -677 +681 @@
 
 #define FloatingPointFMTImpl( T, DFMTNP, DFMTP ) \
-forall( ostype & | ostream( ostype ) ) { \
+forall( ostype & | basic_ostream( ostype ) ) { \
         static void eng( T &value, int & pc, int & exp10 ) { \
                 exp10 = lrint( floor( log10( abs( value ) ) ) ); /* round to desired precision */ \
@@ -723 +727 @@
 // *********************************** character ***********************************
 
-forall( ostype & | ostream( ostype ) ) {
+forall( ostype & | basic_ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
                 if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
@@ -756 +760 @@
 // *********************************** C string ***********************************
 
-forall( ostype & | ostream( ostype ) ) {
+forall( ostype & | basic_ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f ) {
                 if ( ! f.val ) return os;                                               // null pointer ?