Changes in libcfa/src/iostream.cfa [4f37255:dc5072f]

File:

• libcfa/src/iostream.cfa (modified) (40 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 : Sat Jul 13 08:07:59 2019
-// Update Count     : 821
+// Last Modified On : Thu Jun 13 17:21:10 2019
+// Update Count     : 812
 //
 
@@ -30 +30 @@
 
 
-//*********************************** ostream ***********************************
+//*********************************** Ostream ***********************************
 
 
@@ -40 +40 @@
         } // ?|?
         void ?|?( ostype & os, zero_t z ) {
-                (ostype &)(os | z); ends( os );
+                (ostype &)(os | z); nl( os );
         } // ?|?
 
@@ -49 +49 @@
         } // ?|?
         void ?|?( ostype & os, one_t o ) {
-                (ostype &)(os | o); ends( os );
+                (ostype &)(os | o); nl( os );
         } // ?|?
 
@@ -58 +58 @@
         } // ?|?
         void ?|?( ostype & os, bool b ) {
-                (ostype &)(os | b); ends( os );
+                (ostype &)(os | b); nl( os );
         } // ?|?
 
@@ -67 +67 @@
         } // ?|?
         void ?|?( ostype & os, char c ) {
-                (ostype &)(os | c); ends( os );
+                (ostype &)(os | c); nl( os );
         } // ?|?
 
@@ -76 +76 @@
         } // ?|?
         void ?|?( ostype & os, signed char sc ) {
-                (ostype &)(os | sc); ends( os );
+                (ostype &)(os | sc); nl( os );
         } // ?|?
 
@@ -85 +85 @@
         } // ?|?
         void ?|?( ostype & os, unsigned char usc ) {
-                (ostype &)(os | usc); ends( os );
+                (ostype &)(os | usc); nl( os );
         } // ?|?
 
@@ -94 +94 @@
         } // ?|?
         void & ?|?( ostype & os, short int si ) {
-                (ostype &)(os | si); ends( os );
+                (ostype &)(os | si); nl( os );
         } // ?|?
 
@@ -103 +103 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned short int usi ) {
-                (ostype &)(os | usi); ends( os );
+                (ostype &)(os | usi); nl( os );
         } // ?|?
 
@@ -112 +112 @@
         } // ?|?
         void & ?|?( ostype & os, int i ) {
-                (ostype &)(os | i); ends( os );
+                (ostype &)(os | i); nl( os );
         } // ?|?
 
@@ -121 +121 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned int ui ) {
-                (ostype &)(os | ui); ends( os );
+                (ostype &)(os | ui); nl( os );
         } // ?|?
 
@@ -130 +130 @@
         } // ?|?
         void & ?|?( ostype & os, long int li ) {
-                (ostype &)(os | li); ends( os );
+                (ostype &)(os | li); nl( os );
         } // ?|?
 
@@ -139 +139 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned long int uli ) {
-                (ostype &)(os | uli); ends( os );
+                (ostype &)(os | uli); nl( os );
         } // ?|?
 
@@ -148 +148 @@
         } // ?|?
         void & ?|?( ostype & os, long long int lli ) {
-                (ostype &)(os | lli); ends( os );
+                (ostype &)(os | lli); nl( os );
         } // ?|?
 
@@ -157 +157 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned long long int ulli ) {
-                (ostype &)(os | ulli); ends( os );
+                (ostype &)(os | ulli); nl( os );
         } // ?|?
 
@@ -180 +180 @@
         } // ?|?
         void & ?|?( ostype & os, float f ) {
-                (ostype &)(os | f); ends( os );
+                (ostype &)(os | f); nl( os );
         } // ?|?
 
@@ -189 +189 @@
         } // ?|?
         void & ?|?( ostype & os, double d ) {
-                (ostype &)(os | d); ends( os );
+                (ostype &)(os | d); nl( os );
         } // ?|?
 
@@ -198 +198 @@
         } // ?|?
         void & ?|?( ostype & os, long double ld ) {
-                (ostype &)(os | ld); ends( os );
+                (ostype &)(os | ld); nl( os );
         } // ?|?
 
@@ -210 +210 @@
         } // ?|?
         void & ?|?( ostype & os, float _Complex fc ) {
-                (ostype &)(os | fc); ends( os );
+                (ostype &)(os | fc); nl( os );
         } // ?|?
 
@@ -222 +222 @@
         } // ?|?
         void & ?|?( ostype & os, double _Complex dc ) {
-                (ostype &)(os | dc); ends( os );
+                (ostype &)(os | dc); nl( os );
         } // ?|?
 
@@ -234 +234 @@
         } // ?|?
         void & ?|?( ostype & os, long double _Complex ldc ) {
-                (ostype &)(os | ldc); ends( os );
+                (ostype &)(os | ldc); nl( os );
         } // ?|?
 
@@ -276 +276 @@
         } // ?|?
         void ?|?( ostype & os, const char * str ) {
-                (ostype &)(os | str); ends( os );
+                (ostype &)(os | str); nl( os );
         } // ?|?
 
@@ -305 +305 @@
         } // ?|?
         void ?|?( ostype & os, const void * p ) {
-                (ostype &)(os | p); ends( os );
+                (ostype &)(os | p); nl( os );
         } // ?|?
 
@@ -315 +315 @@
         void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
                 (ostype &)(manip( os ));
-                if ( getPrt( os ) ) ends( os );                                 // something printed ?
+                if ( getPrt( os ) ) nl( os );                                   // something printed ?
                 setPrt( os, false );                                                    // turn off
         } // ?|?
@@ -335 +335 @@
         } // nl
 
+        void nl( ostype & os ) {
+                if ( getANL( os ) ) (ostype &)(nl( os ));               // implementation only
+                else setPrt( os, false );                                               // turn off
+        } // nl
+
         ostype & nonl( ostype & os ) {
                 setPrt( os, false );                                                    // turn off
@@ -381 +386 @@
         } // ?|?
         void ?|?( ostype & os, T arg, Params rest ) {
-                // (ostype &)(?|?( os, arg, rest )); ends( os );
+                // (ostype &)(?|?( os, arg, rest )); nl( os );
                 (ostype &)(os | arg);                                                   // print first argument
                 sepSetCur( os, sepGetTuple( os ) );                             // switch to tuple separator
                 (ostype &)(os | rest);                                                  // print remaining arguments
                 sepSetCur( os, sepGet( os ) );                                  // switch to regular separator
-                ends( os );
+                nl( os );
         } // ?|?
 } // distribution
@@ -403 +408 @@
 } // distribution
 
-//*********************************** manipulators ***********************************
-
-//*********************************** integral ***********************************
+//*********************************** Manipulators ***********************************
+
+//*********************************** Integral ***********************************
 
 static const char * shortbin[] = { "0", "1", "10", "11", "100", "101", "110", "111", "1000", "1001", "1010", "1011", "1100", "1101", "1110", "1111" };
@@ -473 +478 @@
                 return os; \
         } /* ?|? */ \
-        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); ends( os ); } \
+        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); nl( os ); } \
 } // distribution
 
@@ -487 +492 @@
 IntegralFMTImpl( unsigned long long int, 'u', "%    *ll ", "%    *.*ll " )
 
-//*********************************** floating point ***********************************
+//*********************************** Floating Point ***********************************
 
 #define PrintWithDP2( os, format, val, ... ) \
@@ -499 +504 @@
                                 if ( ! f.flags.left ) { \
                                         buf[i] = '.'; buf[i + 1] = '\0'; \
-                                        if ( buf[0] == ' ' ) bufbeg = 1;        /* decimal point within width */ \
+                                        if ( buf[0] == ' ' ) bufbeg = 1; /* decimal point within width */ \
                                 } else { \
                                         for ( i = 0; i < len && buf[i] != ' '; i += 1 ); /* trailing blank ? */ \
@@ -536 +541 @@
                 return os; \
         } /* ?|? */ \
-        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); ends( os ); } \
+        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); nl( os ); } \
 } // distribution
 
@@ -542 +547 @@
 FloatingPointFMTImpl( long double, "%    *L ", "%    *.*L " )
 
-//*********************************** character ***********************************
+//*********************************** Character ***********************************
 
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
-                if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
+                if ( f.base != 'c' ) {                                                          // bespoke binary/octal/hex format
                         _Ostream_Manip(unsigned char) fmtuc @= { f.val, f.wd, f.pc, f.base, {'\0'} };
                         fmtuc.flags.pc = f.flags.pc;
@@ -558 +563 @@
 
                 #define CFMTNP "% * "
-                char fmtstr[sizeof(CFMTNP)];                                    // sizeof includes '\0'
+                char fmtstr[sizeof(CFMTNP)];                                            // sizeof includes '\0'
                 memcpy( &fmtstr, CFMTNP, sizeof(CFMTNP) );
-                int star = 1;                                                                   // position before first '*'
+                int star = 1;                                                                           // position before first '*'
 
                 // Insert flags into spaces before '*', from right to left.
@@ -566 +571 @@
                 fmtstr[star] = '%';
 
-                fmtstr[sizeof(CFMTNP)-2] = f.base;                              // sizeof includes '\0'
+                fmtstr[sizeof(CFMTNP)-2] = f.base;                                      // sizeof includes '\0'
                 // printf( "%d %s\n", f.wd, &fmtstr[star] );
                 fmt( os, &fmtstr[star], f.wd, f.val );
                 return os;
         } // ?|?
-        void ?|?( ostype & os, _Ostream_Manip(char) f ) { (ostype &)(os | f); ends( os ); }
+        void ?|?( ostype & os, _Ostream_Manip(char) f ) { (ostype &)(os | f); nl( os ); }
 } // distribution
 
-//*********************************** C string ***********************************
+//*********************************** C String ***********************************
 
 forall( dtype ostype | ostream( ostype ) ) {
@@ -616 +621 @@
                 return os;
         } // ?|?
-        void ?|?( ostype & os, _Ostream_Manip(const char *) f ) { (ostype &)(os | f); ends( os ); }
+        void ?|?( ostype & os, _Ostream_Manip(const char *) f ) { (ostype &)(os | f); nl( os ); }
 } // distribution
 
 
-//*********************************** istream ***********************************
+//*********************************** Istream ***********************************
 
 
@@ -631 +636 @@
                 else {
                         fprintf( stderr, "invalid Boolean constant\n" );
-                        abort();                                                                        // cannot use abort stream
+                        abort();
                 } // if
                 return is;
@@ -639 +644 @@
                 char temp;
                 for () {
-                        fmt( is, "%c", &temp );                                         // must pass pointer through varg to fmt
+                        fmt( is, "%c", &temp );                                                 // must pass pointer through varg to fmt
                         // do not overwrite parameter with newline unless appropriate
                         if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
@@ -766 +771 @@
 } // distribution
 
-//*********************************** manipulators ***********************************
+//*********************************** Manipulators ***********************************
 
 forall( dtype istype | istream( istype ) )
@@ -773 +778 @@
         if ( ! f.s ) {
                 // printf( "skip %s %d\n", f.scanset, f.wd );
-                if ( f.wd == -1 ) fmt( is, f.scanset, "" );             // no input arguments
+                if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
                 else for ( f.wd ) fmt( is, "%*c" );
                 return is;