Changes in libcfa/src/fstream.cfa [58b6d1b:9d362a0]

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 : Tue Jun  5 17:02:56 2018
-// Update Count     : 281
+// Last Modified On : Mon Dec 24 18:33:38 2018
+// Update Count     : 304
 //
 
@@ -20 +20 @@
 #include <stdarg.h>                                                                             // varargs
 #include <string.h>                                                                             // strlen
-#include <stdbool.h>                                                                    // true/false
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
@@ -27 +26 @@
 #define IO_MSG "I/O error: "
 
-void ?{}( ofstream & os, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+void ?{}( ofstream & os, void * file, bool sepDefault, bool sepOnOff, bool nlOnOff, bool prt, const char * separator, const char * tupleSeparator ) {
         os.file = file;
         os.sepDefault = sepDefault;
         os.sepOnOff = sepOnOff;
+        os.nlOnOff = nlOnOff;
+        os.prt = prt;
         sepSet( os, separator );
         sepSetCur( os, sepGet( os ) );
@@ -37 +38 @@
 
 // private
-_Bool sepPrt( ofstream & os ) { setNL( os, false ); return os.sepOnOff; }
+bool sepPrt( ofstream & os ) { setNL( os, false ); return os.sepOnOff; }
 void sepReset( ofstream & os ) { os.sepOnOff = os.sepDefault; }
-void sepReset( ofstream & os, _Bool reset ) { os.sepDefault = reset; os.sepOnOff = os.sepDefault; }
+void sepReset( ofstream & os, bool reset ) { os.sepDefault = reset; os.sepOnOff = os.sepDefault; }
 const char * sepGetCur( ofstream & os ) { return os.sepCur; }
 void sepSetCur( ofstream & os, const char * sepCur ) { os.sepCur = sepCur; }
-_Bool getNL( ofstream & os ) { return os.sawNL; }
-void setNL( ofstream & os, _Bool state ) { os.sawNL = state; }
+bool getNL( ofstream & os ) { return os.sawNL; }
+void setNL( ofstream & os, bool state ) { os.sawNL = state; }
+bool getANL( ofstream & os ) { return os.nlOnOff; }
+bool getPrt( ofstream & os ) { return os.prt; }
+void setPrt( ofstream & os, bool state ) { os.prt = state; }
 
 // public
@@ -58 +62 @@
 void sepOff( ofstream & os ) { os.sepOnOff = false; }
 
-_Bool sepDisable( ofstream & os ) {
-        _Bool temp = os.sepDefault;
+bool sepDisable( ofstream & os ) {
+        bool temp = os.sepDefault;
         os.sepDefault = false;
         sepReset( os );
@@ -65 +69 @@
 } // sepDisable
 
-_Bool sepEnable( ofstream & os ) {
-        _Bool temp = os.sepDefault;
+bool sepEnable( ofstream & os ) {
+        bool temp = os.sepDefault;
         os.sepDefault = true;
         if ( os.sepOnOff ) sepReset( os );                                      // start of line ?
         return temp;
 } // sepEnable
+
+void nlOn( ofstream & os ) { os.nlOnOff = true; }
+void nlOff( ofstream & os ) { os.nlOnOff = false; }
 
 const char * sepGet( ofstream & os ) { return os.separator; }
@@ -96 +103 @@
 void open( ofstream & os, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
-        // if ( file == 0 ) {                                                                   // do not change unless successful
-        //      fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
-        //      perror( 0 );
-        //      exit( EXIT_FAILURE );
-        // } // if
-        (os){ file, true, false, " ", ", " };
+        #ifdef __CFA_DEBUG__
+        if ( file == 0 ) {
+                fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
+        } // if
+        #endif // __CFA_DEBUG__
+        (os){ file, true, false, true, false, " ", ", " };
 } // open
 
@@ -141 +150 @@
         va_end( args );
 
+        setPrt( os, true );                                                                     // called in output cascade
         sepReset( os );                                                                         // reset separator
         return len;
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, true, false, " ", ", " };
 ofstream & sout = soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, true, false, " ", ", " };
 ofstream & serr = serrFile;
 
@@ -178 +188 @@
 void open( ifstream & is, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
-        // if ( file == 0 ) {                                                                   // do not change unless successful
-        //      fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
-        //      perror( 0 );
-        //      exit( EXIT_FAILURE );
-        // } // if
+        #ifdef __CFA_DEBUG__
+        if ( file == 0 ) {
+                fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
+        } // if
+        #endif // __CFA_DEBUG__
         is.file = file;
 } // open