Changeset f451177

Timestamp:

Apr 27, 2021, 10:10:38 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

666483d

Parents:

ef3ac46

Message:

remember basic_ostream nl and then override it using the basic_ostream version

Location:

libcfa/src

Files:

• fstream.cfa (modified) (2 diffs)
• fstream.hfa (modified) (5 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 24 09:05:16 2021
-// Update Count     : 426
-//
-
-#include "fstream.hfa"
+// Last Modified On : Tue Apr 27 22:08:57 2021
+// Update Count     : 442
+//
+
+#include "fstream.hfa"                                                                  // also includes iostream.hfa
 
 #include <stdio.h>                                                                              // vfprintf, vfscanf
@@ -196 +196 @@
 ofstream & abort = abortFile;
 
+ofstream & nl( ofstream & os ) {
+        nl$( os );                                                                                      // call basic_ostream nl
+        flush( os );
+        return os;
+        // (ofstream &)(os | '\n');
+        // setPrt$( os, false );                                                        // turn off
+        // setNL$( os, true );
+        // flush( os );
+        // return sepOff( os );                                                 // prepare for next line
+} // nl
 
 // *********************************** ifstream ***********************************

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 24 09:04:03 2021
-// Update Count     : 219
+// Last Modified On : Tue Apr 27 22:00:30 2021
+// Update Count     : 226
 //
 
@@ -71 +71 @@
 bool fail( ofstream & );
 int flush( ofstream & );
-void open( ofstream &, const char name[], const char mode[] );
+void open( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
 void open( ofstream &, const char name[] );
 void close( ofstream & );
@@ -86 +86 @@
 
 void ?{}( ofstream & );
-void ?{}( ofstream &, const char name[], const char mode[] );
+void ?{}( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
 void ?{}( ofstream &, const char name[] );
 void ^?{}( ofstream & );
+
+// private
+static inline ofstream & nl$( ofstream & os ) { return nl( os ); } // remember basic_ostream nl
+// public
+ofstream & nl( ofstream & os );                                                 // override basic_ostream nl
 
 extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
@@ -111 +116 @@
 bool getANL( ifstream & );
 void ends( ifstream & );
+int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
+
 bool fail( ifstream & is );
 int eof( ifstream & is );
-void open( ifstream & is, const char name[], const char mode[] );
+void open( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
 void open( ifstream & is, const char name[] );
 void close( ifstream & is );
 ifstream & read( ifstream & is, char * data, size_t size );
 ifstream & ungetc( ifstream & is, char c );
-int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
+
 void acquire( ifstream & is );
 void release( ifstream & is );
@@ -129 +136 @@
 
 void ?{}( ifstream & is );
-void ?{}( ifstream & is, const char name[], const char mode[] );
+void ?{}( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
 void ?{}( ifstream & is, const char name[] );
 void ^?{}( ifstream & is );