Changeset 2a301ff for libcfa/src/strstream.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/strstream.cfa (modified) (5 diffs)

libcfa/src/strstream.cfa

@@ -10 +10 @@
 // Created On       : Thu Apr 22 22:24:35 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 10 16:13:20 2021
-// Update Count     : 101
+// Last Modified On : Fri Aug 18 10:42:49 2023
+// Update Count     : 112
 //
 
@@ -32 +32 @@
 
 // private
+inline bool getNL$( ostrstream & os ) { return os.sawNL$; }
+inline bool setNL$( ostrstream & os, bool state ) { bool temp = os.sawNL$; os.sawNL$ = state; return temp; }
+inline bool getANL$( ostrstream & os ) { return os.nlOnOff$; }
+inline bool setANL$( ostrstream & os, bool state ) { bool temp = os.nlOnOff$; os.nlOnOff$ = state; return temp; }
 inline bool sepPrt$( ostrstream & os ) { setNL$( os, false ); return os.sepOnOff$; }
 inline void sepReset$( ostrstream & os ) { os.sepOnOff$ = os.sepDefault$; }
@@ -37 +41 @@
 inline const char * sepGetCur$( ostrstream & os ) { return os.sepCur$; }
 inline void sepSetCur$( ostrstream & os, const char sepCur[] ) { os.sepCur$ = sepCur; }
-inline bool getNL$( ostrstream & os ) { return os.sawNL$; }
-inline void setNL$( ostrstream & os, bool state ) { os.sawNL$ = state; }
-inline bool getANL$( ostrstream & os ) { return os.nlOnOff$; }
 inline bool getPrt$( ostrstream & os ) { return os.prt$; }
-inline void setPrt$( ostrstream & os, bool state ) { os.prt$ = state; }
+inline bool setPrt$( ostrstream & os, bool state ) { bool temp = os.prt$; os.prt$ = state; return temp; }
 
 // public
+void nlOn( ostrstream & os ) { os.nlOnOff$ = true; }
+void nlOff( ostrstream & os ) { os.nlOnOff$ = false; }
+
 void ?{}( ostrstream & os, char buf[], size_t size ) {
         os.buf$ = buf;
@@ -58 +62 @@
 } // ?{}
 
-void sepOn( ostrstream & os ) { os.sepOnOff$ = ! getNL$( os ); }
-void sepOff( ostrstream & os ) { os.sepOnOff$ = false; }
+void sep( ostrstream & os ) { os.sepOnOff$ = ! getNL$( os ); }
+void nosep( ostrstream & os ) { os.sepOnOff$ = false; }
 
-bool sepDisable( ostrstream & os ) {
+bool sepOn( ostrstream & os ) {
+        bool temp = os.sepDefault$;
+        os.sepDefault$ = true;
+        if ( os.sepOnOff$ ) sepReset$( os );                            // start of line ?
+        return temp;
+} // sepOn
+
+bool sepOff( ostrstream & os ) {
         bool temp = os.sepDefault$;
         os.sepDefault$ = false;
         sepReset$( os );
         return temp;
-} // sepDisable
-
-bool sepEnable( ostrstream & os ) {
-        bool temp = os.sepDefault$;
-        os.sepDefault$ = true;
-        if ( os.sepOnOff$ ) sepReset$( os );                            // start of line ?
-        return temp;
-} // sepEnable
-
-void nlOn( ostrstream & os ) { os.nlOnOff$ = true; }
-void nlOff( ostrstream & os ) { os.nlOnOff$ = false; }
+} // sepOff
 
 const char * sepGet( ostrstream & os ) { return os.separator$; }
@@ -132 +133 @@
 // private
 bool getANL$( istrstream & is ) { return is.nlOnOff$; }
+bool setANL$( istrstream & is, bool state ) { bool temp = is.nlOnOff$; is.nlOnOff$ = state; return temp;  }
 
 // public