Changeset 58fe85a for libcfa/src/fstream.cfa

Timestamp:

Jan 7, 2021, 3:27:00 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:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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' into park_unpark

File:

• libcfa/src/fstream.cfa (modified) (8 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 : Fri Feb  7 19:01:01 2020
-// Update Count     : 363
+// Last Modified On : Fri Jun 19 16:24:54 2020
+// Update Count     : 384
 //
 
@@ -26 +26 @@
 
 
-//*********************************** ofstream ***********************************
+// *********************************** ofstream ***********************************
 
 
@@ -123 +123 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0p ) {
-                abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
+                throw (Open_Failure){ os };
+                // abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
         #endif // __CFA_DEBUG__
@@ -134 +135 @@
 
 void close( ofstream & os ) {
-        if ( (FILE *)(os.$file) == stdout || (FILE *)(os.$file) == stderr ) return;
+  if ( (FILE *)(os.$file) == 0p ) return;
+  if ( (FILE *)(os.$file) == (FILE *)stdout || (FILE *)(os.$file) == (FILE *)stderr ) return;
 
         if ( fclose( (FILE *)(os.$file) ) == EOF ) {
                 abort | IO_MSG "close output" | nl | strerror( errno );
         } // if
+        os.$file = 0p;
 } // close
 
@@ -179 +182 @@
 
 
-//*********************************** ifstream ***********************************
+// *********************************** ifstream ***********************************
 
 
@@ -219 +222 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0p ) {
-                abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
+                throw (Open_Failure){ is };
+                // abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
         #endif // __CFA_DEBUG__
@@ -230 +234 @@
 
 void close( ifstream & is ) {
-        if ( (FILE *)(is.$file) == stdin ) return;
+  if ( (FILE *)(is.$file) == 0p ) return;
+  if ( (FILE *)(is.$file) == (FILE *)stdin ) return;
 
         if ( fclose( (FILE *)(is.$file) ) == EOF ) {
                 abort | IO_MSG "close input" | nl | strerror( errno );
         } // if
+        is.$file = 0p;
 } // close
 
@@ -276 +282 @@
 ifstream & sin = sinFile, & stdin = sinFile;
 
+
+// *********************************** exceptions ***********************************
+
+
+void ?{}( Open_Failure & this, ofstream & ostream ) {
+        VTABLE_INIT(this, Open_Failure);
+        this.ostream = &ostream;
+        this.tag = 1;
+}
+void ?{}( Open_Failure & this, ifstream & istream ) {
+        VTABLE_INIT(this, Open_Failure);
+        this.istream = &istream;
+        this.tag = 0;
+}
+const char * Open_Failure_msg(Open_Failure * this) {
+        return "Open_Failure";
+}
+VTABLE_INSTANCE(Open_Failure)(Open_Failure_msg);
+void throwOpen_Failure( ofstream & ostream ) {
+        Open_Failure exc = { ostream };
+}
+void throwOpen_Failure( ifstream & istream ) {
+        Open_Failure exc = { istream };
+}
+
 // Local Variables: //
 // tab-width: 4 //