Changes in libcfa/src/fstream.hfa [d0502a3:f451177]

File:

• libcfa/src/fstream.hfa (modified) (7 diffs)

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 19 16:29:17 2020
-// Update Count     : 189
+// Last Modified On : Tue Apr 27 22:00:30 2021
+// Update Count     : 226
 //
 
 #pragma once
 
-#include "bits/weakso_locks.hfa"
+#include "bits/weakso_locks.hfa"                                                // mutex_lock
 #include "iostream.hfa"
 #include <exception.hfa>
@@ -24 +24 @@
 
 
-enum { sepSize = 16 };
+enum { ofstream_sepSize = 16 };
 struct ofstream {
-        void * $file;
-        bool $sepDefault;
-        bool $sepOnOff;
-        bool $nlOnOff;
-        bool $prt;                                                                                      // print text
-        bool $sawNL;
-        const char * $sepCur;
-        char $separator[sepSize];
-        char $tupleSeparator[sepSize];
-//      multiple_acquisition_lock lock;
+        void * file$;
+        bool sepDefault$;
+        bool sepOnOff$;
+        bool nlOnOff$;
+        bool prt$;                                                                                      // print text
+        bool sawNL$;
+        const char * sepCur$;
+        char separator$[ofstream_sepSize];
+        char tupleSeparator$[ofstream_sepSize];
+        multiple_acquisition_lock lock$;
+        bool acquired$;
 }; // ofstream
 
+// Satisfies ostream
+
 // private
-bool $sepPrt( ofstream & );
-void $sepReset( ofstream & );
-void $sepReset( ofstream &, bool );
-const char * $sepGetCur( ofstream & );
-void $sepSetCur( ofstream &, const char [] );
-bool $getNL( ofstream & );
-void $setNL( ofstream &, bool );
-bool $getANL( ofstream & );
-bool $getPrt( ofstream & );
-void $setPrt( ofstream &, bool );
+bool sepPrt$( ofstream & );
+void sepReset$( ofstream & );
+void sepReset$( ofstream &, bool );
+const char * sepGetCur$( ofstream & );
+void sepSetCur$( ofstream &, const char [] );
+bool getNL$( ofstream & );
+void setNL$( ofstream &, bool );
+bool getANL$( ofstream & );
+bool getPrt$( ofstream & );
+void setPrt$( ofstream &, bool );
 
 // public
@@ -63 +66 @@
 void sepSetTuple( ofstream &, const char [] );
 
-void ends( ofstream & os );
-int fail( ofstream & );
+void ends( ofstream & );
+int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
+
+bool fail( ofstream & );
 int flush( ofstream & );
-void open( ofstream &, const char name[], const char mode[] );
+void open( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
 void open( ofstream &, const char name[] );
 void close( ofstream & );
 ofstream & write( ofstream &, const char data[], size_t size );
-int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
 
-void ?{}( ofstream & os );
-void ?{}( ofstream & os, const char name[], const char mode[] );
-void ?{}( ofstream & os, const char name[] );
-void ^?{}( ofstream & os );
+void acquire( ofstream & );
+void release( ofstream & );
+
+struct osacquire {
+        ofstream & os;
+};
+void ?{}( osacquire & acq, ofstream & );
+void ^?{}( osacquire & acq );
+
+void ?{}( ofstream & );
+void ?{}( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
+void ?{}( ofstream &, const char name[] );
+void ^?{}( ofstream & );
+
+// private
+static inline ofstream & nl$( ofstream & os ) { return nl( os ); } // remember basic_ostream nl
+// public
+ofstream & nl( ofstream & os );                                                 // override basic_ostream nl
 
 extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
@@ -85 +103 @@
 
 struct ifstream {
-        void * $file;
-        bool $nlOnOff;
+        void * file$;
+        bool nlOnOff$;
+        multiple_acquisition_lock lock$;
+        bool acquired$;
 }; // ifstream
+
+// Satisfies istream
 
 // public
@@ -93 +115 @@
 void nlOff( ifstream & );
 bool getANL( ifstream & );
-int fail( ifstream & is );
+void ends( ifstream & );
+int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
+
+bool fail( ifstream & is );
 int eof( ifstream & is );
-void open( ifstream & is, const char name[], const char mode[] );
+void open( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
 void open( ifstream & is, const char name[] );
 void close( ifstream & is );
 ifstream & read( ifstream & is, char * data, size_t size );
 ifstream & ungetc( ifstream & is, char c );
-int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
+
+void acquire( ifstream & is );
+void release( ifstream & is );
+
+struct isacquire {
+        ifstream & is;
+};
+void ?{}( isacquire & acq, ifstream & is );
+void ^?{}( isacquire & acq );
 
 void ?{}( ifstream & is );
-void ?{}( ifstream & is, const char name[], const char mode[] );
+void ?{}( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
 void ?{}( ifstream & is, const char name[] );
 void ^?{}( ifstream & is );
@@ -113 +146 @@
 
 
-DATA_EXCEPTION(Open_Failure)(
+EHM_EXCEPTION(Open_Failure)(
         union {
                 ofstream * ostream;
@@ -122 +155 @@
 );
 
-void ?{}( Open_Failure & this, ofstream & ostream );
-void ?{}( Open_Failure & this, ifstream & istream );
+void ?{}( Open_Failure & this, ofstream & );
+void ?{}( Open_Failure & this, ifstream & );
 
 // Local Variables: //