Changeset 53a6c2a for src/libcfa/fstream.c

Timestamp:

Jul 7, 2017, 10:39:08 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

29038ef

Parents:

52a9004

Message:

change meaning of sepOn, and replace #if with #pragma once in include files

File:

• src/libcfa/fstream.c (modified) (6 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 : Sat Jul  1 16:37:54 2017
-// Update Count     : 242
+// Last Modified On : Thu Jul  6 18:38:25 2017
+// Update Count     : 251
 //
 
@@ -33 +33 @@
         this->sepDefault = sepDefault;
         this->sepOnOff = sepOnOff;
-        this->lastSepOn = false;
         sepSet( this, separator );
         sepSetCur( this, sepGet( this ) );
@@ -40 +39 @@
 
 // private
-_Bool lastSepOn( ofstream * os ) { return os->lastSepOn; }
-_Bool sepPrt( ofstream * os ) { os->lastSepOn = false; 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->lastSepOn = true; os->sepOnOff = true; }
-void sepOff( ofstream * os ) { os->lastSepOn = false; os->sepOnOff = 0; }
+void sepOn( ofstream * os ) { os->sepOnOff = ! getNL( os ); }
+void sepOff( ofstream * os ) { os->sepOnOff = false; }
 
 _Bool sepDisable( ofstream *os ) {
         _Bool temp = os->sepDefault;
         os->sepDefault = false;
-        os->lastSepOn = false;
         sepReset( os );
         return temp;
@@ -69 +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
 
@@ -76 +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
 
@@ -153 +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