Changeset f5d9c37 for libcfa/src/iostream.cfa

Timestamp:

Jun 29, 2023, 12:07:50 PM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7d25f44

Parents:

70e47fec

Message:

harmonize separator manipulators names with newline names: change from sep, sepTuple, sepEnable, sepDisable, sepOn, sepOff to sepVal, sepTupleVal, sepOn, sepOff, sep, nosep; fix bug printing null string with WD so no separator

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 : Mon Jan  9 09:27:58 2023
-// Update Count     : 1361
+// Last Modified On : Thu Jun 29 10:12:39 2023
+// Update Count     : 1380
 //
 
@@ -50 +50 @@
                 fmt( os, "%c", c );
                 if ( c == '\n' ) setNL$( os, true );
-                return sepOff( os );
+                return nosep( os );
         } // ?|?
         void ?|?( ostype & os, char c ) {
@@ -284 +284 @@
 
           if ( s == 0p ) { fmt( os, "%s", "0p" ); return os; } // null pointer
-          if ( s[0] == '\0' ) { sepOff( os ); return os; } // null string => no separator
+          if ( s[0] == '\0' ) { nosep( os ); return os; }       // null string => no leading/trailing separator
 
                 // first character IS NOT spacing or closing punctuation => add left separator
@@ -300 +300 @@
                 fmt( os, "%s", s );                                                             // fmt resets seperator, but reset it again
                 if ( sepPrt$( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
-                        sepOn( os );
+                        sep( os );
                 } else {
-                        sepOff( os );
+                        nosep( os );
                 } // if
                 if ( ch == '\n' ) setNL$( os, true );                   // check *AFTER* sepPrt$ call above as it resets NL flag
@@ -351 +351 @@
         } // ?|?
 
-        ostype & sep( ostype & os ) {
-                return (ostype &)(os | sepGet( os ));
-        } // sep
-
-        ostype & sepTuple( ostype & os ) {
-                return os | sepGetTuple( os );
-        } // sepTuple
-
         ostype & nl( ostype & os ) {
                 (ostype &)(os | '\n');
                 setPrt$( os, false );                                                   // turn off
                 setNL$( os, true );
-                return sepOff( os );                                                    // prepare for next line
+                return nosep( os );                                                             // prepare for next line
         } // nl
 
@@ -371 +363 @@
         } // nonl
 
+        ostype & nlOn( ostype & os ) {
+                nlOn( os );                                                                             // call void returning
+                return os;
+        } // nlOn
+
+        ostype & nlOff( ostype & os ) {
+                nlOff( os );                                                                    // call void returning
+                return os;
+        } // nlOff
+
+        ostype & sepVal( ostype & os ) {
+                return (ostype &)(os | sepGet( os ));
+        } // sepVal
+
+        ostype & sepTupleVal( ostype & os ) {
+                return os | sepGetTuple( os );
+        } // sepTupleVal
+
+        ostype & sep( ostype & os ) {
+                sep( os );                                                                              // call void returning
+                return os;
+        } // sep
+
+        ostype & nosep( ostype & os ) {
+                nosep( os );                                                                    // call void returning
+                return os;
+        } // nosep
+
         ostype & sepOn( ostype & os ) {
                 sepOn( os );                                                                    // call void returning
@@ -380 +400 @@
                 return os;
         } // sepOff
-
-        ostype & sepEnable( ostype & os ) {
-                sepEnable( os );                                                                // call void returning
-                return os;
-        } // sepEnable
-
-        ostype & sepDisable( ostype & os ) {
-                sepDisable( os );                                                               // call void returning
-                return os;
-        } // sepDisable
-
-        ostype & nlOn( ostype & os ) {
-                nlOn( os );                                                                             // call void returning
-                return os;
-        } // nlOn
-
-        ostype & nlOff( ostype & os ) {
-                nlOff( os );                                                                    // call void returning
-                return os;
-        } // nlOff
 } // distribution
 
@@ -550 +550 @@
                 if ( cnt == 1 ) {
                         if ( f.flags.left ) { wd -= maxdig; f.wd = wd < 0 ? 1 : wd; } // update and restore f.wd for printing end chunk
-                        sepOff( os );                                                           // no seperator between chunks
+                        nosep( os );                                                            // no seperator between chunks
                 } // if
         } else {                                                                                        // print start chunk
@@ -595 +595 @@
                 else { f.pc = maxdig; f.flags.pc = true; }              // left pad with precision
 
-                if ( cnt != 0 ) sepOff( os );                                   // no seperator between chunks
+                if ( cnt != 0 ) nosep( os );                                    // no seperator between chunks
                 f.wd = wd;                                                                              // reset f.wd for next chunk
                 f.flags.sign = false;                                                   // no leading +/- sign
@@ -773 +773 @@
                 } // if
 
-                if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
+                if ( f.val[0] != '\0' &&                                                // null string => no leading separator
+                         sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 
                 #define SFMTNP "% * "
@@ -795 +796 @@
                         fmt( os, &fmtstr[star], f.wd, f.pc, f.val );
                 } // if
+                if ( f.val[0] == '\0' ) { nosep( os ); }                // null string => no trailing separator
                 return os;
         } // ?|?