Changeset 25cdca5 for libcfa/src/iostream.hfa

Timestamp:

Jan 8, 2019, 11:31:21 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

08222c7, 274da98

Parents:

84b4d607 (diff), d5b2ac8 (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:

• libcfa/src/iostream.hfa (modified) (8 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 : Tue Dec 11 22:01:31 2018
-// Update Count     : 213
+// Last Modified On : Mon Dec 24 18:33:40 2018
+// Update Count     : 220
 //
 
@@ -20 +20 @@
 trait ostream( dtype ostype ) {
         // private
-        bool sepPrt( ostype & );                                                        // return separator state (on/off)
+        bool sepPrt( ostype & );                                                        // get separator state (on/off)
         void sepReset( ostype & );                                                      // set separator state to default state
         void sepReset( ostype &, bool );                                        // set separator and default state
@@ -27 +27 @@
         bool getNL( ostype & );                                                         // check newline
         void setNL( ostype &, bool );                                           // saw newline
-        bool getANL( ostype & );                                                        // check auto newline
-        bool getNonl( ostype & );                                                       // check nonnl manipulator
-        void setNonl( ostype &, bool );                                         // set nonnl manipulator
+        bool getANL( ostype & );                                                        // get auto newline (on/off)
+        bool getPrt( ostype & );                                                        // get fmt called in output cascade
+        void setPrt( ostype &, bool );                                          // set fmt called in output cascade
         // public
         void sepOn( ostype & );                                                         // turn separator state on
@@ -48 +48 @@
         void close( ostype & os );
         ostype & write( ostype &, const char *, size_t );
-        int fmt( ostype &, const char fmt[], ... );
+        int fmt( ostype &, const char format[], ... );
 }; // ostream
 
@@ -63 +63 @@
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype &, bool );
-        void & ?|?( ostype &, bool );
+        void ?|?( ostype &, bool );
 
         ostype & ?|?( ostype &, char );
-        void & ?|?( ostype &, char );
+        void ?|?( ostype &, char );
         ostype & ?|?( ostype &, signed char );
-        void & ?|?( ostype &, signed char );
+        void ?|?( ostype &, signed char );
         ostype & ?|?( ostype &, unsigned char );
-        void & ?|?( ostype &, unsigned char );
+        void ?|?( ostype &, unsigned char );
 
         ostype & ?|?( ostype &, short int );
-        void & ?|?( ostype &, short int );
+        void ?|?( ostype &, short int );
         ostype & ?|?( ostype &, unsigned short int );
-        void & ?|?( ostype &, unsigned short int );
+        void ?|?( ostype &, unsigned short int );
         ostype & ?|?( ostype &, int );
-        void & ?|?( ostype &, int );
+        void ?|?( ostype &, int );
         ostype & ?|?( ostype &, unsigned int );
-        void & ?|?( ostype &, unsigned int );
+        void ?|?( ostype &, unsigned int );
         ostype & ?|?( ostype &, long int );
-        void & ?|?( ostype &, long int );
+        void ?|?( ostype &, long int );
         ostype & ?|?( ostype &, long long int );
-        void & ?|?( ostype &, long long int );
+        void ?|?( ostype &, long long int );
         ostype & ?|?( ostype &, unsigned long int );
-        void & ?|?( ostype &, unsigned long int );
+        void ?|?( ostype &, unsigned long int );
         ostype & ?|?( ostype &, unsigned long long int );
-        void & ?|?( ostype &, unsigned long long int );
+        void ?|?( ostype &, unsigned long long int );
 
         ostype & ?|?( ostype &, float ); // FIX ME: should not be required
-        void & ?|?( ostype &, float ); // FIX ME: should not be required
+        void ?|?( ostype &, float ); // FIX ME: should not be required
         ostype & ?|?( ostype &, double );
-        void & ?|?( ostype &, double );
+        void ?|?( ostype &, double );
         ostype & ?|?( ostype &, long double );
-        void & ?|?( ostype &, long double );
+        void ?|?( ostype &, long double );
 
         ostype & ?|?( ostype &, float _Complex );
-        void & ?|?( ostype &, float _Complex );
+        void ?|?( ostype &, float _Complex );
         ostype & ?|?( ostype &, double _Complex );
-        void & ?|?( ostype &, double _Complex );
+        void ?|?( ostype &, double _Complex );
         ostype & ?|?( ostype &, long double _Complex );
-        void & ?|?( ostype &, long double _Complex );
+        void ?|?( ostype &, long double _Complex );
 
         ostype & ?|?( ostype &, const char * );
-        void & ?|?( ostype &, const char * );
+        void ?|?( ostype &, const char * );
         // ostype & ?|?( ostype &, const char16_t * );
 #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
@@ -111 +111 @@
         // ostype & ?|?( ostype &, const wchar_t * );
         ostype & ?|?( ostype &, const void * );
-        void & ?|?( ostype &, const void * );
+        void ?|?( ostype &, const void * );
 
         // manipulators
@@ -117 +117 @@
         void ?|?( ostype &, ostype & (*)( ostype & ) );
         ostype & nl( ostype & );
+        void nl( ostype & );
         ostype & nonl( ostype & );
         ostype & sep( ostype & );
@@ -149 +150 @@
         istype & read( istype &, char *, size_t );
         istype & ungetc( istype &, char );
-        int fmt( istype &, const char fmt[], ... );
+        int fmt( istype &, const char format[], ... );
 }; // istream