Changeset 933f32f for libcfa/src/iostream.hfa

Timestamp:

May 24, 2019, 10:19:41 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

• libcfa/src/iostream.hfa (modified) (7 diffs)

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 24 18:33:40 2018
-// Update Count     : 220
+// Last Modified On : Sat May 11 10:31:27 2019
+// Update Count     : 232
 //
 
@@ -48 +48 @@
         void close( ostype & os );
         ostype & write( ostype &, const char *, size_t );
-        int fmt( ostype &, const char format[], ... );
+        int fmt( ostype &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
 }; // ostream
 
@@ -62 +62 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype &, zero_t );
+        void ?|?( ostype &, zero_t );
+        ostype & ?|?( ostype &, one_t );
+        void ?|?( ostype &, one_t );
+
         ostype & ?|?( ostype &, bool );
         void ?|?( ostype &, bool );
@@ -144 +149 @@
 
 trait istream( dtype istype ) {
+        void nlOn( istype & );                                                          // read newline
+        void nlOff( istype & );                                                         // scan newline
+        bool getANL( istype & );                                                        // get scan newline (on/off)
         int fail( istype & );
         int eof( istype & );
@@ -150 +158 @@
         istype & read( istype &, char *, size_t );
         istype & ungetc( istype &, char );
-        int fmt( istype &, const char format[], ... );
+        int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
 }; // istream
 
@@ -184 +192 @@
         istype & ?|?( istype &, istype & (*)( istype & ) );
         istype & nl( istype & is );
+        istype & nlOn( istype & );
+        istype & nlOff( istype & );
 } // distribution
 
@@ -205 +215 @@
 
 // Local Variables: //
-// mode: c //
 // tab-width: 4 //
 // End: //