Changeset fce4e31 for libcfa/src/fstream.cfa

Timestamp:

Jul 12, 2019, 1:50:44 PM (5 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:

8fd52e90

Parents:

ef5b828 (diff), 302d84c2 (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.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 : Thu May 16 08:33:28 2019
-// Update Count     : 328
+// Last Modified On : Fri Jul 12 12:03:53 2019
+// Update Count     : 344
 //
 
@@ -24 +24 @@
 #include <assert.h>
 #include <errno.h>                                                                              // errno
+
+
+//*********************************** ofstream ***********************************
+
 
 #define IO_MSG "I/O error: "
@@ -37 +41 @@
         sepSetCur( os, sepGet( os ) );
         sepSetTuple( os, ", " );
-}
+} // ?{}
 
 // private
@@ -56 +60 @@
 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 ); }
@@ -94 +99 @@
         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 ) {
@@ -157 +169 @@
 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
-}
-
-//---------------------------------------
+static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
+ofstream & exit = exitFile;
+static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
+ofstream & abort = abortFile;
+
+
+//*********************************** ifstream ***********************************
+
 
 // private
@@ -173 +182 @@
         is.file = file;
         is.nlOnOff = false;
-}
+} // ?{}
 
 // public
@@ -180 +189 @@
 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; }