Changeset e99e43f for libcfa/src/fstream.cfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• libcfa/src/fstream.cfa (modified) (7 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 Aug 10 18:19:40 2018
-// Update Count     : 284
+// 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 ) );
@@ -44 +45 @@
 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
@@ -72 +76 @@
 } // sepEnable
 
+void nlOn( ofstream & os ) { os.nlOnOff = true; }
+void nlOff( ofstream & os ) { os.nlOnOff = false; }
+
 const char * sepGet( ofstream & os ) { return os.separator; }
 void sepSet( ofstream & os, const char * s ) {
@@ -103 +110 @@
         } // if
         #endif // __CFA_DEBUG__
-        (os){ file, true, false, " ", ", " };
+        (os){ file, true, false, true, false, " ", ", " };
 } // open
 
@@ -143 +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;