Changes in libcfa/src/fstream.cfa [a87d40b:5cb2b8c]

File:

• libcfa/src/fstream.cfa (modified) (18 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 : Mon Jul 15 18:11:26 2019
-// Update Count     : 349
+// Last Modified On : Thu May 16 08:33:28 2019
+// Update Count     : 328
 //
 
@@ -24 +24 @@
 #include <assert.h>
 #include <errno.h>                                                                              // errno
-
-
-//*********************************** ofstream ***********************************
-
 
 #define IO_MSG "I/O error: "
@@ -41 +37 @@
         sepSetCur( os, sepGet( os ) );
         sepSetTuple( os, ", " );
-} // ?{}
+}
 
 // private
@@ -60 +56 @@
 void ?{}( ofstream & os, const char * name, const char * mode ) {
         open( os, name, mode );
-} // ?{}
-
+}
 void ?{}( ofstream & os, const char * name ) {
         open( os, name, "w" );
-} // ?{}
+}
 
 void sepOn( ofstream & os ) { os.sepOnOff = ! getNL( os ); }
@@ -100 +95 @@
 } // sepSet
 
-void ends( ofstream & os ) {
-        if ( getANL( os ) ) nl( os );
-        else setPrt( os, false );                                                       // turn off
-        if ( &os == &exit ) exit( EXIT_FAILURE );
-        if ( &os == &abort ) abort();
-} // ends
-
 int fail( ofstream & os ) {
         return os.file == 0 || ferror( (FILE *)(os.file) );
@@ -119 +107 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
+                abort( IO_MSG "open output file \"%s\", %s", name, strerror( errno ) );
         } // if
         #endif // __CFA_DEBUG__
@@ -133 +121 @@
 
         if ( fclose( (FILE *)(os.file) ) == EOF ) {
-                abort | IO_MSG "close output" | nl | strerror( errno );
+                abort( IO_MSG "close output %s", strerror( errno ) );
         } // if
 } // close
@@ -139 +127 @@
 ofstream & write( ofstream & os, const char * data, size_t size ) {
         if ( fail( os ) ) {
-                abort | IO_MSG "attempt write I/O on failed stream";
+                abort( "attempt write I/O on failed stream\n" );
         } // if
 
         if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
-                abort | IO_MSG "write" | nl | strerror( errno );
+                abort( IO_MSG "write %s", strerror( errno ) );
         } // if
         return os;
@@ -154 +142 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os.file) ) ) {
-                        abort | IO_MSG "invalid write";
+                        abort( "invalid write\n" );
                 } // if
         } // if
@@ -165 +153 @@
 
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream & sout = soutFile, & stdout = soutFile;
+ofstream & sout = soutFile;
 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream & serr = serrFile, & stderr = serrFile;
-
-static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream & exit = exitFile;
-static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream & abort = abortFile;
-
-
-//*********************************** ifstream ***********************************
-
+ofstream & serr = serrFile;
+
+// static ofstream sexitFile = { (FILE *)(&_IO_2_1_stdout_) };
+// ofstream & sexit = sexitFile;
+// static ofstream sabortFile = { (FILE *)(&_IO_2_1_stderr_) };
+// ofstream & sabort = sabortFile;
+
+void nl( ofstream & os ) {
+        if ( getANL( os ) ) (ofstream &)(nl( os ));                     // implementation only
+        else setPrt( os, false );                                                       // turn off
+}
+
+//---------------------------------------
 
 // private
@@ -182 +173 @@
         is.file = file;
         is.nlOnOff = false;
-} // ?{}
+}
 
 // public
@@ -189 +180 @@
 void ?{}( ifstream & is, const char * name, const char * mode ) {
         open( is, name, mode );
-} // ?{}
-
+}
 void ?{}( ifstream & is, const char * name ) {
         open( is, name, "r" );
-} // ?{}
+}
 
 void nlOn( ifstream & os ) { os.nlOnOff = true; }
@@ -211 +201 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
+                abort( IO_MSG "open input file \"%s\", %s\n", name, strerror( errno ) );
         } // if
         #endif // __CFA_DEBUG__
@@ -225 +215 @@
 
         if ( fclose( (FILE *)(is.file) ) == EOF ) {
-                abort | IO_MSG "close input" | nl | strerror( errno );
+                abort( IO_MSG "close input %s", strerror( errno ) );
         } // if
 } // close
@@ -231 +221 @@
 ifstream & read( ifstream & is, char * data, size_t size ) {
         if ( fail( is ) ) {
-                abort | IO_MSG "attempt read I/O on failed stream";
+                abort( "attempt read I/O on failed stream\n" );
         } // if
 
         if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
-                abort | IO_MSG "read" | nl | strerror( errno );
+                abort( IO_MSG "read %s", strerror( errno ) );
         } // if
         return is;
@@ -242 +232 @@
 ifstream &ungetc( ifstream & is, char c ) {
         if ( fail( is ) ) {
-                abort | IO_MSG "attempt ungetc I/O on failed stream";
+                abort( "attempt ungetc I/O on failed stream\n" );
         } // if
 
         if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
-                abort | IO_MSG "ungetc" | nl | strerror( errno );
+                abort( IO_MSG "ungetc %s", strerror( errno ) );
         } // if
         return is;
@@ -258 +248 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is.file) ) ) {
-                        abort | IO_MSG "invalid read";
+                        abort( "invalid read\n" );
                 } // if
         } // if
@@ -267 +257 @@
 
 static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
-ifstream & sin = sinFile, & stdin = sinFile;
+ifstream & sin = sinFile;
 
 // Local Variables: //