Changeset 933f32f for libcfa/src/fstream.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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 cleanup-dtors

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