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

File:

• libcfa/src/fstream.cfa (modified) (14 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 : Thu May 16 08:33:28 2019
-// Update Count     : 328
+// Last Modified On : Mon Dec 24 18:33:38 2018
+// Update Count     : 304
 //
 
@@ -23 +23 @@
 #include <complex.h>                                                                    // creal, cimag
 #include <assert.h>
-#include <errno.h>                                                                              // errno
 
 #define IO_MSG "I/O error: "
 
-void ?{}( ofstream & os, void * file ) {
+void ?{}( ofstream & os, void * file, bool sepDefault, bool sepOnOff, bool nlOnOff, bool prt, const char * separator, const char * tupleSeparator ) {
         os.file = file;
-        os.sepDefault = true;
-        os.sepOnOff = false;
-        os.nlOnOff = true;
-        os.prt = false;
-        os.sawNL = false;
-        sepSet( os, " " );
+        os.sepDefault = sepDefault;
+        os.sepOnOff = sepOnOff;
+        os.nlOnOff = nlOnOff;
+        os.prt = prt;
+        sepSet( os, separator );
         sepSetCur( os, sepGet( os ) );
-        sepSetTuple( os, ", " );
+        sepSetTuple( os, tupleSeparator );
 }
 
@@ -104 +102 @@
 
 void open( ofstream & os, const char * name, const char * mode ) {
-        FILE * file = fopen( name, mode );
+        FILE *file = fopen( name, mode );
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort( IO_MSG "open output file \"%s\", %s", name, strerror( errno ) );
+                fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
         } // if
         #endif // __CFA_DEBUG__
-        (os){ file };
+        (os){ file, true, false, true, false, " ", ", " };
 } // open
 
@@ -121 +121 @@
 
         if ( fclose( (FILE *)(os.file) ) == EOF ) {
-                abort( IO_MSG "close output %s", strerror( errno ) );
+                perror( IO_MSG "close output" );
         } // if
 } // close
@@ -127 +127 @@
 ofstream & write( ofstream & os, const char * data, size_t size ) {
         if ( fail( os ) ) {
-                abort( "attempt write I/O on failed stream\n" );
+                fprintf( stderr, "attempt write I/O on failed stream\n" );
+                exit( EXIT_FAILURE );
         } // if
 
         if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
-                abort( IO_MSG "write %s", strerror( errno ) );
+                perror( IO_MSG "write" );
+                exit( EXIT_FAILURE );
         } // if
         return os;
@@ -142 +144 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os.file) ) ) {
-                        abort( "invalid write\n" );
+                        fprintf( stderr, "invalid write\n" );
+                        exit( EXIT_FAILURE );
                 } // if
         } // if
@@ -152 +155 @@
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, true, false, " ", ", " };
 ofstream & sout = soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, true, false, " ", ", " };
 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
-}
 
 //---------------------------------------
@@ -172 +166 @@
 void ?{}( ifstream & is, void * file ) {
         is.file = file;
-        is.nlOnOff = false;
 }
 
@@ -184 +177 @@
         open( is, name, "r" );
 }
-
-void nlOn( ifstream & os ) { os.nlOnOff = true; }
-void nlOff( ifstream & os ) { os.nlOnOff = false; }
-bool getANL( ifstream & os ) { return os.nlOnOff; }
 
 int fail( ifstream & is ) {
@@ -198 +187 @@
 
 void open( ifstream & is, const char * name, const char * mode ) {
-        FILE * file = fopen( name, mode );
+        FILE *file = fopen( name, mode );
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort( IO_MSG "open input file \"%s\", %s\n", name, strerror( errno ) );
+                fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
         } // if
         #endif // __CFA_DEBUG__
@@ -215 +206 @@
 
         if ( fclose( (FILE *)(is.file) ) == EOF ) {
-                abort( IO_MSG "close input %s", strerror( errno ) );
+                perror( IO_MSG "close input" );
         } // if
 } // close
@@ -221 +212 @@
 ifstream & read( ifstream & is, char * data, size_t size ) {
         if ( fail( is ) ) {
-                abort( "attempt read I/O on failed stream\n" );
+                fprintf( stderr, "attempt read I/O on failed stream\n" );
+                exit( EXIT_FAILURE );
         } // if
 
         if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
-                abort( IO_MSG "read %s", strerror( errno ) );
+                perror( IO_MSG "read" );
+                exit( EXIT_FAILURE );
         } // if
         return is;
@@ -232 +225 @@
 ifstream &ungetc( ifstream & is, char c ) {
         if ( fail( is ) ) {
-                abort( "attempt ungetc I/O on failed stream\n" );
+                fprintf( stderr, "attempt ungetc I/O on failed stream\n" );
+                exit( EXIT_FAILURE );
         } // if
 
         if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
-                abort( IO_MSG "ungetc %s", strerror( errno ) );
+                perror( IO_MSG "ungetc" );
+                exit( EXIT_FAILURE );
         } // if
         return is;
@@ -248 +243 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is.file) ) ) {
-                        abort( "invalid read\n" );
+                        fprintf( stderr, "invalid read\n" );
+                        exit( EXIT_FAILURE );
                 } // if
         } // if