Changeset 0583064b for src

Timestamp:

Mar 23, 2017, 10:39:30 AM (8 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:

6013bd7, 7895d46

Parents:

89e1b16

Message:

additions to printing tuples, iostream, nad user documentations

Location:

src/libcfa

Files:

• fstream.c (modified) (4 diffs)
• iostream.c (modified) (3 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 : Wed Mar 22 16:17:21 2017
-// Update Count     : 221
+// Last Modified On : Thu Mar 23 08:20:41 2017
+// Update Count     : 226
 //
 
@@ -29 +29 @@
 #define IO_MSG "I/O error: "
 
+void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+        this->file = file;
+        this->sepDefault = sepDefault;
+        this->sepOnOff = sepOnOff;
+        sepSet( this, separator );
+        sepSetCur( this, sepGet( this ) );
+        sepSetTuple( this, tupleSeparator );
+}
+
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
 void sepOn( ofstream * os ) { os->sepOnOff = 1; }
@@ -83 +92 @@
                 exit( EXIT_FAILURE );
         } // if
-        os->file = file;
-        sepOff( os );
-        sepSet( os, " " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 
@@ -125 +132 @@
 } // fmt
 
-void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
-        this->file = file;
-        this->sepDefault = sepDefault;
-        this->sepOnOff = sepOnOff;
-        sepSet( this, separator );
-        sepSetCur( this, sepGet( this ) );
-        sepSetTuple( this, tupleSeparator );
-}
-
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 17:46:06 2017
-// Update Count     : 359
+// Last Modified On : Thu Mar 23 08:20:40 2017
+// Update Count     : 367
 //
 
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
-        forall( ttype Params ) ostype * prtTuple( T arg, Params rest ) {
-                os | arg;                                                                               // print first argument
-                os | rest;                                                                              // print remaining arguments
-                return os;
-        } // prtTuple
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        prtTuple( arg, rest );                                                          // recursively print tuple
+        os | arg;                                                                                       // print first argument
+        os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
         return os;
@@ -223 +219 @@
         os | '\n';
         flush( os );
-        sepOff( os );
+        sepOff( os );                                                                           // prepare for next line
         return os;
 } // endl