Changeset 8e4aa05 for libcfa/src/fstream.hfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/fstream.hfa (modified) (6 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 : Mon Mar  1 22:45:08 2021
+// Update Count     : 217
 //
 
 #pragma once
 
+#include "bits/weakso_locks.hfa"                                                // mutex_lock
 #include "iostream.hfa"
 #include <exception.hfa>
@@ -34 +35 @@
         char $separator[sepSize];
         char $tupleSeparator[sepSize];
+        multiple_acquisition_lock $lock;
+        bool $acquired;
 }; // ofstream
 
@@ -69 +72 @@
 ofstream & write( ofstream &, const char data[], size_t size );
 int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
+void acquire( ofstream & os );
+void release( ofstream & os );
+
+struct osacquire {
+        ofstream & os;
+};
+void ?{}( osacquire & acq, ofstream & os );
+void ^?{}( osacquire & acq );
 
 void ?{}( ofstream & os );
@@ -85 +96 @@
         void * $file;
         bool $nlOnOff;
+        multiple_acquisition_lock $lock;
+        bool $acquired;
 }; // ifstream
 
@@ -91 +104 @@
 void nlOff( ifstream & );
 bool getANL( ifstream & );
+void ends( ifstream & );
 int fail( ifstream & is );
 int eof( ifstream & is );
@@ -99 +113 @@
 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 );