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

File:

• libcfa/src/fstream.cfa (modified) (8 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 : Fri Jul 12 12:03:53 2019
-// Update Count     : 344
+// 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 ); }
@@ -99 +94 @@
         os.tupleSeparator[sepSize - 1] = '\0';
 } // 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 ) {
@@ -169 +157 @@
 ofstream & serr = serrFile;
 
-static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream & exit = exitFile;
-static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream & abort = abortFile;
-
-
-//*********************************** ifstream ***********************************
-
+// 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; }