Changeset f5d9c37 for libcfa/src/fstream.cfa

Timestamp:

Jun 29, 2023, 12:07:50 PM (14 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/fstream.cfa (modified) (4 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 17 08:51:12 2023
-// Update Count     : 528
+// Last Modified On : Thu Jun 29 11:09:52 2023
+// Update Count     : 533
 //
 
@@ -43 +43 @@
 } // ?{}
 
+inline bool getNL$( ofstream & os ) { return os.sawNL$; }
+inline void setNL$( ofstream & os, bool state ) { os.sawNL$ = state; }
+inline bool getANL$( ofstream & os ) { return os.nlOnOff$; }
+
 inline bool sepPrt$( ofstream & os ) { setNL$( os, false ); return os.sepOnOff$; }
 inline void sepReset$( ofstream & os ) { os.sepOnOff$ = os.sepDefault$; }
@@ -48 +52 @@
 inline const char * sepGetCur$( ofstream & os ) { return os.sepCur$; }
 inline void sepSetCur$( ofstream & os, const char sepCur[] ) { os.sepCur$ = sepCur; }
-inline bool getNL$( ofstream & os ) { return os.sawNL$; }
-inline void setNL$( ofstream & os, bool state ) { os.sawNL$ = state; }
-inline bool getANL$( ofstream & os ) { return os.nlOnOff$; }
+
 inline bool getPrt$( ofstream & os ) { return os.prt$; }
 inline void setPrt$( ofstream & os, bool state ) { os.prt$ = state; }
@@ -63 +65 @@
 void ^?{}( ofstream & os ) { close( os ); }
 
-void sepOn( ofstream & os ) { os.sepOnOff$ = ! getNL$( os ); }
-void sepOff( ofstream & os ) { os.sepOnOff$ = false; }
-
-bool sepDisable( ofstream & os ) {
+void nlOn( ofstream & os ) { os.nlOnOff$ = true; }
+void nlOff( ofstream & os ) { os.nlOnOff$ = false; }
+
+void sep( ofstream & os ) { os.sepOnOff$ = ! getNL$( os ); }
+void nosep( ofstream & os ) { os.sepOnOff$ = false; }
+
+bool sepOn( ofstream & os ) {
+        bool temp = os.sepDefault$;
+        os.sepDefault$ = true;
+        if ( os.sepOnOff$ ) sepReset$( os );                            // start of line ?
+        return temp;
+} // sepOn
+
+bool sepOff( ofstream & os ) {
         bool temp = os.sepDefault$;
         os.sepDefault$ = false;
         sepReset$( os );
         return temp;
-} // sepDisable
-
-bool sepEnable( ofstream & os ) {
-        bool temp = os.sepDefault$;
-        os.sepDefault$ = true;
-        if ( os.sepOnOff$ ) sepReset$( os );                            // start of line ?
-        return temp;
-} // sepEnable
-
-void nlOn( ofstream & os ) { os.nlOnOff$ = true; }
-void nlOff( ofstream & os ) { os.nlOnOff$ = false; }
+} // sepOff
 
 const char * sepGet( ofstream & os ) { return os.separator$; }