Changeset b067d9b for libcfa/src/fstream.hfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/fstream.hfa (moved) (moved from src/libcfa/fstream ) (7 diffs)

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun  5 10:20:25 2018
-// Update Count     : 131
+// Last Modified On : Mon Jul 15 18:10:23 2019
+// Update Count     : 167
 //
 
 #pragma once
 
-#include "iostream"
+#include "iostream.hfa"
+
+
+//*********************************** ofstream ***********************************
+
 
 enum { sepSize = 16 };
 struct ofstream {
         void * file;
-        _Bool sepDefault;
-        _Bool sepOnOff;
-        _Bool sawNL;
+        bool sepDefault;
+        bool sepOnOff;
+        bool nlOnOff;
+        bool prt;                                                                                       // print text
+        bool sawNL;
         const char * sepCur;
         char separator[sepSize];
@@ -30 +36 @@
 
 // private
-_Bool sepPrt( ofstream & );
+bool sepPrt( ofstream & );
 void sepReset( ofstream & );
-void sepReset( ofstream &, _Bool );
+void sepReset( ofstream &, bool );
 const char * sepGetCur( ofstream & );
 void sepSetCur( ofstream &, const char * );
-_Bool getNL( ofstream & );
-void setNL( ofstream &, _Bool );
+bool getNL( ofstream & );
+void setNL( ofstream &, bool );
+bool getANL( ofstream & );
+bool getPrt( ofstream & );
+void setPrt( ofstream &, bool );
 
 // public
 void sepOn( ofstream & );
 void sepOff( ofstream & );
-_Bool sepDisable( ofstream & );
-_Bool sepEnable( ofstream & );
+bool sepDisable( ofstream & );
+bool sepEnable( ofstream & );
+void nlOn( ofstream & );
+void nlOff( ofstream & );
 
 const char * sepGet( ofstream & );
@@ -49 +60 @@
 void sepSetTuple( ofstream &, const char * );
 
+void ends( ofstream & os );
 int fail( ofstream & );
 int flush( ofstream & );
@@ -55 +67 @@
 void close( ofstream & );
 ofstream & write( ofstream &, const char * data, size_t size );
-int fmt( ofstream &, const char fmt[], ... );
+int fmt( ofstream &, const char format[], ... );
 
 void ?{}( ofstream & os );
@@ -61 +73 @@
 void ?{}( ofstream & os, const char * name );
 
-extern ofstream & sout, & serr;
+extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
+extern ofstream & exit, & abort;
+
+
+//*********************************** ifstream ***********************************
 
 
 struct ifstream {
         void * file;
+        bool nlOnOff;
 }; // ifstream
 
 // public
+void nlOn( ifstream & );
+void nlOff( ifstream & );
+bool getANL( ifstream & );
 int fail( ifstream & is );
 int eof( ifstream & is );
@@ -76 +96 @@
 ifstream & read( ifstream & is, char * data, size_t size );
 ifstream & ungetc( ifstream & is, char c );
-int fmt( ifstream &, const char fmt[], ... );
+int fmt( ifstream &, const char format[], ... );
 
 void ?{}( ifstream & is );
@@ -82 +102 @@
 void ?{}( ifstream & is, const char * name );
 
-extern ifstream & sin;
+extern ifstream & sin, & stdin;                                                 // aliases
 
 // Local Variables: //