Changeset b7b3e41 for libcfa/src/fstream.cfa

Timestamp:

Jun 19, 2023, 1:57:11 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

adc73a5

Parents:

fa5e1aa5 (diff), 33d4bc8 (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.cfa (modified) (13 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 : Sat Apr  9 14:55:54 2022
-// Update Count     : 515
+// Last Modified On : Sat Jun 17 08:51:12 2023
+// Update Count     : 528
 //
 
@@ -117 +117 @@
     } // for
         if ( file == 0p ) {
-                throw (Open_Failure){ os };
+                throw (open_failure){ os };
                 // abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
@@ -137 +137 @@
     } // for
         if ( ret == EOF ) {
-                throw (Close_Failure){ os };
+                throw (close_failure){ os };
                 // abort | IO_MSG "close output" | nl | strerror( errno );
         } // if
@@ -145 +145 @@
 ofstream & write( ofstream & os, const char data[], size_t size ) {
         if ( fail( os ) ) {
-                throw (Write_Failure){ os };
+                throw (write_failure){ os };
                 // abort | IO_MSG "attempt write I/O on failed stream";
         } // if
 
         if ( fwrite( data, 1, size, (FILE *)(os.file$) ) != size ) {
-                throw (Write_Failure){ os };
+                throw (write_failure){ os };
                 // abort | IO_MSG "write" | nl | strerror( errno );
         } // if
@@ -169 +169 @@
           if ( cnt == 9 ) abort( "ofstream fmt EINTR spinning exceeded" );
     } // for
-        if ( len == EOF ) {
-                if ( ferror( (FILE *)(os.file$) ) ) {
-                        abort | IO_MSG "invalid write";
-                } // if
+        if ( len == EOF ) {                                                                     // error writing ?
+                abort | IO_MSG "invalid write";
         } // if
         va_end( args );
@@ -240 +238 @@
     } // for
         if ( file == 0p ) {
-                throw (Open_Failure){ is };
+                throw (open_failure){ is };
                 // abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
@@ -260 +258 @@
     } // for
         if ( ret == EOF ) {
-                throw (Close_Failure){ is };
+                throw (close_failure){ is };
                 // abort | IO_MSG "close input" | nl | strerror( errno );
         } // if
@@ -268 +266 @@
 ifstream & read( ifstream & is, char data[], size_t size ) {
         if ( fail( is ) ) {
-                throw (Read_Failure){ is };
+                throw (read_failure){ is };
                 // abort | IO_MSG "attempt read I/O on failed stream";
         } // if
 
         if ( fread( data, size, 1, (FILE *)(is.file$) ) == 0 ) {
-                throw (Read_Failure){ is };
+                throw (read_failure){ is };
                 // abort | IO_MSG "read" | nl | strerror( errno );
         } // if
@@ -302 +300 @@
           if ( len != EOF || errno != EINTR ) break;            // timer interrupt ?
     } // for
-        if ( len == EOF ) {
-                if ( ferror( (FILE *)(is.file$) ) ) {
+        if ( len == EOF ) {                                                                     // EOF or matching failure ?
+                if ( ! feof( (FILE *)(is.file$) ) && ferror( (FILE *)(is.file$) ) ) {
                         abort | IO_MSG "invalid read";
                 } // if
@@ -318 +316 @@
 
 
-static vtable(Open_Failure) Open_Failure_vt;
+static vtable(open_failure) open_failure_vt;
 
 // exception I/O constructors
-void ?{}( Open_Failure & ex, ofstream & ostream ) with(ex) {
-        virtual_table = &Open_Failure_vt;
+void ?{}( open_failure & ex, ofstream & ostream ) with(ex) {
+        virtual_table = &open_failure_vt;
         ostream = &ostream;
         tag = 1;
 } // ?{}
 
-void ?{}( Open_Failure & ex, ifstream & istream ) with(ex) {
-        virtual_table = &Open_Failure_vt;
+void ?{}( open_failure & ex, ifstream & istream ) with(ex) {
+        virtual_table = &open_failure_vt;
         istream = &istream;
         tag = 0;
@@ -334 +332 @@
 
 
-static vtable(Close_Failure) Close_Failure_vt;
+static vtable(close_failure) close_failure_vt;
 
 // exception I/O constructors
-void ?{}( Close_Failure & ex, ofstream & ostream ) with(ex) {
-        virtual_table = &Close_Failure_vt;
+void ?{}( close_failure & ex, ofstream & ostream ) with(ex) {
+        virtual_table = &close_failure_vt;
         ostream = &ostream;
         tag = 1;
 } // ?{}
 
-void ?{}( Close_Failure & ex, ifstream & istream ) with(ex) {
-        virtual_table = &Close_Failure_vt;
+void ?{}( close_failure & ex, ifstream & istream ) with(ex) {
+        virtual_table = &close_failure_vt;
         istream = &istream;
         tag = 0;
@@ -350 +348 @@
 
 
-static vtable(Write_Failure) Write_Failure_vt;
+static vtable(write_failure) write_failure_vt;
 
 // exception I/O constructors
-void ?{}( Write_Failure & ex, ofstream & ostream ) with(ex) {
-        virtual_table = &Write_Failure_vt;
+void ?{}( write_failure & ex, ofstream & ostream ) with(ex) {
+        virtual_table = &write_failure_vt;
         ostream = &ostream;
         tag = 1;
 } // ?{}
 
-void ?{}( Write_Failure & ex, ifstream & istream ) with(ex) {
-        virtual_table = &Write_Failure_vt;
+void ?{}( write_failure & ex, ifstream & istream ) with(ex) {
+        virtual_table = &write_failure_vt;
         istream = &istream;
         tag = 0;
@@ -366 +364 @@
 
 
-static vtable(Read_Failure) Read_Failure_vt;
+static vtable(read_failure) read_failure_vt;
 
 // exception I/O constructors
-void ?{}( Read_Failure & ex, ofstream & ostream ) with(ex) {
-        virtual_table = &Read_Failure_vt;
+void ?{}( read_failure & ex, ofstream & ostream ) with(ex) {
+        virtual_table = &read_failure_vt;
         ostream = &ostream;
         tag = 1;
 } // ?{}
 
-void ?{}( Read_Failure & ex, ifstream & istream ) with(ex) {
-        virtual_table = &Read_Failure_vt;
+void ?{}( read_failure & ex, ifstream & istream ) with(ex) {
+        virtual_table = &read_failure_vt;
         istream = &istream;
         tag = 0;
 } // ?{}
 
-// void throwOpen_Failure( ofstream & ostream ) {
-//      Open_Failure exc = { ostream };
+// void throwopen_failure( ofstream & ostream ) {
+//      open_failure exc = { ostream };
 // }
 
-// void throwOpen_Failure( ifstream & istream ) {
-//      Open_Failure exc = { istream };
+// void throwopen_failure( ifstream & istream ) {
+//      open_failure exc = { istream };
 // }