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

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 : Tue Apr 27 22:00:30 2021
-// Update Count     : 226
+// Last Modified On : Fri Jun 19 16:29:17 2020
+// Update Count     : 189
 //
 
 #pragma once
 
-#include "bits/weakso_locks.hfa"                                                // mutex_lock
+#include "bits/weakso_locks.hfa"
 #include "iostream.hfa"
 #include <exception.hfa>
@@ -24 +24 @@
 
 
-enum { ofstream_sepSize = 16 };
+enum { sepSize = 16 };
 struct ofstream {
-        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$;
+        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;
 }; // 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
@@ -66 +63 @@
 void sepSetTuple( ofstream &, const char [] );
 
-void ends( ofstream & );
-int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
-
-bool fail( ofstream & );
+void ends( ofstream & os );
+int fail( ofstream & );
 int flush( ofstream & );
-void open( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
+void open( ofstream &, const char name[], const char mode[] );
 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 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
+void ?{}( ofstream & os );
+void ?{}( ofstream & os, const char name[], const char mode[] );
+void ?{}( ofstream & os, const char name[] );
+void ^?{}( ofstream & os );
 
 extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
@@ -103 +85 @@
 
 struct ifstream {
-        void * file$;
-        bool nlOnOff$;
-        multiple_acquisition_lock lock$;
-        bool acquired$;
+        void * $file;
+        bool $nlOnOff;
 }; // ifstream
-
-// Satisfies istream
 
 // public
@@ -115 +93 @@
 void nlOff( ifstream & );
 bool getANL( ifstream & );
-void ends( ifstream & );
-int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
-
-bool fail( ifstream & is );
+int fail( ifstream & is );
 int eof( ifstream & is );
-void open( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
+void open( ifstream & is, const char name[], const char mode[] );
 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 );
-
-void acquire( ifstream & is );
-void release( ifstream & is );
-
-struct isacquire {
-        ifstream & is;
-};
-void ?{}( isacquire & acq, ifstream & is );
-void ^?{}( isacquire & acq );
+int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
 
 void ?{}( ifstream & is );
-void ?{}( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
+void ?{}( ifstream & is, const char name[], const char mode[] );
 void ?{}( ifstream & is, const char name[] );
 void ^?{}( ifstream & is );
@@ -146 +113 @@
 
 
-EHM_EXCEPTION(Open_Failure)(
+DATA_EXCEPTION(Open_Failure)(
         union {
                 ofstream * ostream;
@@ -155 +122 @@
 );
 
-void ?{}( Open_Failure & this, ofstream & );
-void ?{}( Open_Failure & this, ifstream & );
+void ?{}( Open_Failure & this, ofstream & ostream );
+void ?{}( Open_Failure & this, ifstream & istream );
 
 // Local Variables: //