Changeset 5cb2b8c

Timestamp:

May 16, 2019, 9:38:21 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3c5dee4

Parents:

e0d19f8

Message:

update ofstream constructor

Location:

libcfa/src

Files:

• fstream.cfa (modified) (5 diffs)
• fstream.hfa (modified) (2 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 : Sat Apr 20 12:03:43 2019
-// Update Count     : 311
+// Last Modified On : Thu May 16 08:33:28 2019
+// Update Count     : 328
 //
 
@@ -27 +27 @@
 #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;
+        os.sepDefault = true;
+        os.sepOnOff = false;
+        os.nlOnOff = true;
+        os.prt = false;
         os.sawNL = false;
-        sepSet( os, separator );
+        sepSet( os, " " );
         sepSetCur( os, sepGet( os ) );
-        sepSetTuple( os, tupleSeparator );
+        sepSetTuple( os, ", " );
 }
 
@@ -104 +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 ) {
@@ -110 +110 @@
         } // if
         #endif // __CFA_DEBUG__
-        (os){ file, true, false, true, false, " ", ", " };
+        (os){ file };
 } // open
 
@@ -152 +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
+}
 
 //---------------------------------------

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 20 12:03:58 2019
-// Update Count     : 151
+// Last Modified On : Thu May 16 08:34:10 2019
+// Update Count     : 157
 //
 
@@ -70 +70 @@
 extern ofstream & sout, & serr;
 
+// extern ofstream & sout, & serr, & sexit, & sabort;
+// void nl( ofstream & os );
+
 
 struct ifstream {