Changeset c58f4ab for src/libcfa/fstream

Timestamp:

Mar 23, 2017, 11:30:42 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

578b637

Parents:

9fcdfa3 (diff), 27cc24e (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 (modified) (6 diffs)

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 14:48:08 2017
-// Update Count     : 91
+// Last Modified On : Tue Mar 21 15:57:24 2017
+// Update Count     : 102
 //
 
@@ -21 +21 @@
 enum { separateSize = 16 };
 struct ofstream {
-        void *file;
+        void * file;
         _Bool sepDefault;
         _Bool sepOnOff;
+        const char * sepCur;
         char separator[separateSize];
+        char tupleSeparator[separateSize];
 }; // ofstream
 
@@ -32 +34 @@
 void sepReset( ofstream * );
 void sepReset( ofstream *, _Bool );
+const char * sepGetCur( ofstream * );
+void sepSetCur( ofstream *, const char * );
 const char * sepGet( ofstream * );
 void sepSet( ofstream *, const char * );
+const char * sepGetTuple( ofstream * );
+void sepSetTuple( ofstream *, const char * );
 _Bool sepDisable( ofstream * );
 _Bool sepEnable( ofstream * );
@@ -42 +48 @@
 void close( ofstream * );
 ofstream * write( ofstream *, const char * data, unsigned long int size );
-int prtfmt( ofstream *, const char fmt[], ... );
+int fmt( ofstream *, const char fmt[], ... );
+
+void ?{}( ofstream * );
 
 extern ofstream * sout, * serr;
@@ -48 +56 @@
 // implement context istream
 struct ifstream {
-        void *file;
+        void * file;
 }; // ifstream
 
@@ -57 +65 @@
 ifstream * read( ifstream * is, char * data, unsigned long int size );
 ifstream * ungetc( ifstream * is, char c );
-int scanfmt( ifstream *, const char fmt[], ... );
+int fmt( ifstream *, const char fmt[], ... );
 
-extern ifstream *sin;
+extern ifstream * sin;
 
 #endif // __FSTREAM_H__