Changeset b826e6b for src/libcfa/fstream.c

Timestamp:

Jul 19, 2017, 11:49:33 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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:

• src/libcfa/fstream.c (modified) (7 diffs)

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 15 18:11:11 2017
-// Update Count     : 234
+// Last Modified On : Thu Jul  6 18:38:25 2017
+// Update Count     : 251
 //
 
@@ -39 +39 @@
 
 // private
-_Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
+_Bool sepPrt( ofstream * os ) { setNL( os, false ); return os->sepOnOff; }
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
 const char * sepGetCur( ofstream * os ) { return os->sepCur; }
 void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
+_Bool getNL( ofstream * os ) { return os->sawNL; }
+void setNL( ofstream * os, _Bool state ) { os->sawNL = state; }
 
 // public
-void sepOn( ofstream * os ) { os->sepOnOff = 1; }
-void sepOff( ofstream * os ) { os->sepOnOff = 0; }
+void sepOn( ofstream * os ) { os->sepOnOff = ! getNL( os ); }
+void sepOff( ofstream * os ) { os->sepOnOff = false; }
 
 _Bool sepDisable( ofstream *os ) {
@@ -66 +68 @@
 void sepSet( ofstream * os, const char * s ) {
         assert( s );
-        strncpy( os->separator, s, separateSize - 1 );
-        os->separator[separateSize - 1] = '\0';
+        strncpy( os->separator, s, sepSize - 1 );
+        os->separator[sepSize - 1] = '\0';
 } // sepSet
 
@@ -73 +75 @@
 void sepSetTuple( ofstream * os, const char * s ) {
         assert( s );
-        strncpy( os->tupleSeparator, s, separateSize - 1 );
-        os->tupleSeparator[separateSize - 1] = '\0';
+        strncpy( os->tupleSeparator, s, sepSize - 1 );
+        os->tupleSeparator[sepSize - 1] = '\0';
 } // sepSet
 
@@ -92 +94 @@
                 exit( EXIT_FAILURE );
         } // if
-        ?{}( os, file, 1, 0, " ", ", " );
+        ?{}( os, file, true, false, " ", ", " );
 } // open
 
@@ -132 +134 @@
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
 ofstream *sout = &soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
 ofstream *serr = &serrFile;
 
@@ -150 +152 @@
 
 void open( ifstream * is, const char * name, const char * mode ) {
-        FILE *t = fopen( name, mode );
-        if ( t == 0 ) {                                                                         // do not change unless successful
+        FILE *file = fopen( name, mode );
+        if ( file == 0 ) {                                                                      // do not change unless successful
                 fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
                 perror( 0 );
                 exit( EXIT_FAILURE );
         } // if
-        is->file = t;
+        is->file = file;
 } // open