Changeset a4da45e for libcfa/src/fstream.cfa

Timestamp:

Feb 26, 2024, 3:53:42 AM (20 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (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:

Resolve conflict

File:

• libcfa/src/fstream.cfa (modified) (9 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 : Sun Jan 28 09:56:08 2024
-// Update Count     : 554
+// Last Modified On : Sun Feb 11 20:55:45 2024
+// Update Count     : 580
 //
 
@@ -121 +121 @@
     } // for
         if ( file == 0p ) {
-                throw (open_failure){ os };
+                throwResume (open_failure){ os };
                 // abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
@@ -241 +241 @@
     } // for
         if ( file == 0p ) {
-                throw (open_failure){ is };
+                throwResume (open_failure){ is };
                 // abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
@@ -295 +295 @@
         va_start( args, format );
 
-        int nargs;
+        int nargs, tmperrno;
     for () {                                                                                    // no check for EINTR limit waiting for keyboard input
-                errno = 0;
                 disable_interrupts();
+                errno = 0;
                 nargs = vfscanf( (FILE *)(is.file$), format, args );
+                tmperrno = errno;
                 enable_interrupts();
           if ( nargs != EOF || errno != EINTR ) break;          // timer interrupt ?
@@ -308 +309 @@
                 } // if
         } // if
+        if ( tmperrno == ERANGE ) throwResume ExceptionInst( data_range );
         va_end( args );
         return nargs;
@@ -318 +320 @@
 // *********************************** exceptions ***********************************
 
-
-static vtable(open_failure) open_failure_vt;
 
 // exception I/O constructors
@@ -335 +335 @@
 
 
-static vtable(close_failure) close_failure_vt;
-
 // exception I/O constructors
 void ?{}( close_failure & ex, ofstream & ostream ) with( ex ) {
@@ -351 +349 @@
 
 
-static vtable(write_failure) write_failure_vt;
-
 // exception I/O constructors
 void ?{}( write_failure & ex, ofstream & ostream ) with( ex ) {
@@ -367 +363 @@
 
 
-static vtable(read_failure) read_failure_vt;
-
 // exception I/O constructors
 void ?{}( read_failure & ex, ofstream & ostream ) with( ex ) {